diff --git a/ChangeLog b/ChangeLog index efa1612..5854156 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-11-13 Jari Aalto + + * doc/sed.x: Order commands alphabetically. + 2010-11-10 Paolo Bonzini * doc/sed-in.texi: Fix double negation in comment, escape diff --git a/THANKS b/THANKS index 159bfce..dc31732 100644 --- a/THANKS +++ b/THANKS @@ -24,6 +24,7 @@ Greg Ubben Isamu Hasegawa J.T. Conklin Jakub Jelinek +Jari Aalto Jason Molenda Jim Meyering Laurent Vogel diff --git a/doc/sed.1 b/doc/sed.1 index 102f8d2..0637260 100644 --- a/doc/sed.1 +++ b/doc/sed.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.28. -.TH SED "1" "August 2010" "sed (super-sed) 3.63" "User Commands" +.TH SED "1" "December 2010" "sed (super-sed) 3.63" "User Commands" .SH NAME sed \- stream editor for filtering and transforming text .SH SYNOPSIS @@ -153,25 +153,6 @@ if .I label is omitted, branch to end of script. .TP -.RI t\ label -If a s/// has done a successful substitution since the -last input line was read and since the last t or T -command, then branch to -.IR label ; -if -.I label -is omitted, branch to end of script. -.TP -.RI T\ label -If no s/// has done a successful substitution since the -last input line was read and since the last t or T -command, then branch to -.IR label ; -if -.I label -is omitted, branch to end of script. This is a GNU -extension. -.TP c \e .TP .I text @@ -195,9 +176,6 @@ Copy/append pattern space to hold space. g G Copy/append hold space to pattern space. .TP -x -Exchange the contents of the hold and pattern spaces. -.TP l List out the current line in a ``visually unambiguous'' form. .TP @@ -232,6 +210,25 @@ and the special escapes \e1 through \e9 to refer to the corresponding matching sub-expressions in the .IR regexp . .TP +.RI t\ label +If a s/// has done a successful substitution since the +last input line was read and since the last t or T +command, then branch to +.IR label ; +if +.I label +is omitted, branch to end of script. +.TP +.RI T\ label +If no s/// has done a successful substitution since the +last input line was read and since the last t or T +command, then branch to +.IR label ; +if +.I label +is omitted, branch to end of script. This is a GNU +extension. +.TP .RI w\ filename Write the current pattern space to .IR filename . @@ -241,6 +238,9 @@ Write the first line of the current pattern space to .IR filename . This is a GNU extension. .TP +x +Exchange the contents of the hold and pattern spaces. +.TP .RI y/ source / dest / Transliterate the characters in the pattern space which appear in .I source diff --git a/doc/sed.texi b/doc/sed.texi index 4a3b526..ff7a6ac 100644 --- a/doc/sed.texi +++ b/doc/sed.texi @@ -1912,10 +1912,15 @@ G @group # check if converted file name is equal to original file name, -# if it is, do not print nothing +# if it is, do not print anything /^.*\/\(.*\)\n\1/b @end group +@group +# escape special characters for the shell +s/["$`\\]/\\&/g +@end group + @group # now, transform path/fromfile\n, into # mv path/fromfile path/tofile and print it diff --git a/doc/sed.x b/doc/sed.x index aabb2c9..ef06b01 100644 --- a/doc/sed.x +++ b/doc/sed.x @@ -99,25 +99,6 @@ if .I label is omitted, branch to end of script. .TP -.RI t\ label -If a s/// has done a successful substitution since the -last input line was read and since the last t or T -command, then branch to -.IR label ; -if -.I label -is omitted, branch to end of script. -.TP -.RI T\ label -If no s/// has done a successful substitution since the -last input line was read and since the last t or T -command, then branch to -.IR label ; -if -.I label -is omitted, branch to end of script. This is a GNU -extension. -.TP c \e .TP .I text @@ -141,9 +122,6 @@ Copy/append pattern space to hold space. g G Copy/append hold space to pattern space. .TP -x -Exchange the contents of the hold and pattern spaces. -.TP l List out the current line in a ``visually unambiguous'' form. .TP @@ -178,6 +156,25 @@ and the special escapes \e1 through \e9 to refer to the corresponding matching sub-expressions in the .IR regexp . .TP +.RI t\ label +If a s/// has done a successful substitution since the +last input line was read and since the last t or T +command, then branch to +.IR label ; +if +.I label +is omitted, branch to end of script. +.TP +.RI T\ label +If no s/// has done a successful substitution since the +last input line was read and since the last t or T +command, then branch to +.IR label ; +if +.I label +is omitted, branch to end of script. This is a GNU +extension. +.TP .RI w\ filename Write the current pattern space to .IR filename . @@ -187,6 +184,9 @@ Write the first line of the current pattern space to .IR filename . This is a GNU extension. .TP +x +Exchange the contents of the hold and pattern spaces. +.TP .RI y/ source / dest / Transliterate the characters in the pattern space which appear in .I source