summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2012-12-22 15:10:39 +0100
committerPaolo Bonzini <bonzini@gnu.org>2012-12-22 15:12:27 +0100
commitced39febc8011f3335d731a7b4481d4369bd3cfc (patch)
tree1eb0c015e99c8c531e3e1603b7e3381717c942aa
parentfc99910ed5ecc1e0d753a56d1be576e91af00fb6 (diff)
downloadsed-ced39febc8011f3335d731a7b4481d4369bd3cfc.tar.gz
Regenerate files
2012-12-21 Paolo Bonzini <bonzini@gnu.org> * doc/sed.texi: Regenerate. * doc/sed.1: Regenerate. * po/sed.pot: Regenerate.
-rw-r--r--ChangeLog6
-rw-r--r--doc/sed.12
-rw-r--r--doc/sed.texi10
-rw-r--r--po/sed.pot230
4 files changed, 130 insertions, 118 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e48c7a..3c27e3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-21 Paolo Bonzini <bonzini@gnu.org>
+
+ * doc/sed.texi: Regenerate.
+ * doc/sed.1: Regenerate.
+ * po/sed.pot: Regenerate.
+
2012-07-25 Paolo Bonzini <bonzini@gnu.org>
* doc/sed-in.texi: Document difference between "e" and "r"
diff --git a/doc/sed.1 b/doc/sed.1
index 521c530..27e71a8 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" "March 2012" "sed 4.2.1" "User Commands"
+.TH SED "1" "December 2012" "sed 4.2.1" "User Commands"
.SH NAME
sed \- stream editor for filtering and transforming text
.SH SYNOPSIS
diff --git a/doc/sed.texi b/doc/sed.texi
index d599e74..6efc48c 100644
--- a/doc/sed.texi
+++ b/doc/sed.texi
@@ -1442,13 +1442,17 @@ replaces the pattern space with the output; a trailing newline
is suppressed.
If a parameter is specified, instead, the @code{e} command
-interprets it as a command and sends its output to the output stream
-(like @code{r} does). The command can run across multiple
-lines, all but the last ending with a back-slash.
+interprets it as a command and sends its output to the output stream.
+The command can run across multiple lines, all but the last ending with
+a back-slash.
In both cases, the results are undefined if the command to be
executed contains a @sc{nul} character.
+Note that, unlike the @code{r} command, the output of the command will
+be printed immediately; the @code{r} command instead delays the output
+to the end of the current cycle.
+
@item F
@findex F (File name) command
@cindex Printing file name
diff --git a/po/sed.pot b/po/sed.pot
index 79fd92d..3524c6c 100644
--- a/po/sed.pot
+++ b/po/sed.pot
@@ -6,234 +6,255 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: GNU sed 4.2.1\n"
+"Project-Id-Version: GNU sed 4.2.2\n"
"Report-Msgid-Bugs-To: bug-gnu-utils@gnu.org\n"
-"POT-Creation-Date: 2009-10-14 11:16+0200\n"
+"POT-Creation-Date: 2012-12-22 14:36+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: sed/compile.c:161
+#: sed/compile.c:144
msgid "multiple `!'s"
msgstr ""
-#: sed/compile.c:162
+#: sed/compile.c:145
msgid "unexpected `,'"
msgstr ""
-#: sed/compile.c:163
+#: sed/compile.c:146
msgid "invalid usage of +N or ~N as first address"
msgstr ""
-#: sed/compile.c:164
+#: sed/compile.c:147
msgid "unmatched `{'"
msgstr ""
-#: sed/compile.c:165
+#: sed/compile.c:148
msgid "unexpected `}'"
msgstr ""
-#: sed/compile.c:166
+#: sed/compile.c:149
msgid "extra characters after command"
msgstr ""
-#: sed/compile.c:167
+#: sed/compile.c:150
msgid "expected \\ after `a', `c' or `i'"
msgstr ""
-#: sed/compile.c:168
+#: sed/compile.c:151
msgid "`}' doesn't want any addresses"
msgstr ""
-#: sed/compile.c:169
+#: sed/compile.c:152
msgid ": doesn't want any addresses"
msgstr ""
-#: sed/compile.c:170
+#: sed/compile.c:153
msgid "comments don't accept any addresses"
msgstr ""
-#: sed/compile.c:171
+#: sed/compile.c:154
msgid "missing command"
msgstr ""
-#: sed/compile.c:172
+#: sed/compile.c:155
msgid "command only uses one address"
msgstr ""
-#: sed/compile.c:173
+#: sed/compile.c:156
msgid "unterminated address regex"
msgstr ""
-#: sed/compile.c:174
+#: sed/compile.c:157
msgid "unterminated `s' command"
msgstr ""
-#: sed/compile.c:175
+#: sed/compile.c:158
msgid "unterminated `y' command"
msgstr ""
-#: sed/compile.c:176
+#: sed/compile.c:159
msgid "unknown option to `s'"
msgstr ""
-#: sed/compile.c:177
+#: sed/compile.c:160
msgid "multiple `p' options to `s' command"
msgstr ""
-#: sed/compile.c:178
+#: sed/compile.c:161
msgid "multiple `g' options to `s' command"
msgstr ""
-#: sed/compile.c:179
+#: sed/compile.c:162
msgid "multiple number options to `s' command"
msgstr ""
-#: sed/compile.c:180
+#: sed/compile.c:163
msgid "number option to `s' command may not be zero"
msgstr ""
-#: sed/compile.c:181
+#: sed/compile.c:164
msgid "strings for `y' command are different lengths"
msgstr ""
-#: sed/compile.c:182
+#: sed/compile.c:165
msgid "delimiter character is not a single-byte character"
msgstr ""
-#: sed/compile.c:183
+#: sed/compile.c:166
msgid "expected newer version of sed"
msgstr ""
-#: sed/compile.c:184
+#: sed/compile.c:167
msgid "invalid usage of line address 0"
msgstr ""
-#: sed/compile.c:185
+#: sed/compile.c:168
#, c-format
msgid "unknown command: `%c'"
msgstr ""
-#: sed/compile.c:208
+#: sed/compile.c:169
+msgid "incomplete command"
+msgstr ""
+
+#: sed/compile.c:192
#, c-format
msgid "%s: file %s line %lu: %s\n"
msgstr ""
-#: sed/compile.c:211
+#: sed/compile.c:195
#, c-format
msgid "%s: -e expression #%lu, char %lu: %s\n"
msgstr ""
-#: sed/compile.c:1665
+#: sed/compile.c:1657
#, c-format
msgid "can't find label for jump to `%s'"
msgstr ""
-#: sed/execute.c:709
+#: sed/execute.c:595
#, c-format
msgid "%s: can't read %s: %s\n"
msgstr ""
-#: sed/execute.c:740
+#: sed/execute.c:624
#, c-format
msgid "couldn't edit %s: is a terminal"
msgstr ""
-#: sed/execute.c:745
+#: sed/execute.c:629
#, c-format
msgid "couldn't edit %s: not a regular file"
msgstr ""
-#: sed/execute.c:757
+#: sed/execute.c:640
#, c-format
msgid "%s: warning: failed to set default file creation context to %s: %s"
msgstr ""
-#: sed/execute.c:764
+#: sed/execute.c:647
#, c-format
msgid "%s: warning: failed to get security context of %s: %s"
msgstr ""
-#: sed/execute.c:783 sed/utils.c:219
+#: sed/execute.c:664 sed/utils.c:211
#, c-format
msgid "couldn't open temporary file %s: %s"
msgstr ""
-#: sed/execute.c:1321 sed/execute.c:1501
+#: sed/execute.c:1193 sed/execute.c:1373
msgid "error in subprocess"
msgstr ""
-#: sed/execute.c:1323
+#: sed/execute.c:1195
msgid "option `e' not supported"
msgstr ""
-#: sed/execute.c:1503
+#: sed/execute.c:1375
msgid "`e' command not supported"
msgstr ""
-#: sed/execute.c:1847
+#: sed/execute.c:1725
msgid "no input files"
msgstr ""
-#: sed/regexp.c:41
+#: sed/regexp.c:39
msgid "no previous regular expression"
msgstr ""
-#: sed/regexp.c:42
+#: sed/regexp.c:40
msgid "cannot specify modifiers on empty regexp"
msgstr ""
-#: sed/regexp.c:131
+#: sed/regexp.c:129
#, c-format
msgid "invalid reference \\%d on `s' command's RHS"
msgstr ""
-#: sed/sed.c:97
+#: sed/sed.c:32
+msgid "Jay Fenlason"
+msgstr ""
+
+#: sed/sed.c:33
+msgid "Tom Lord"
+msgstr ""
+
+#: sed/sed.c:34
+msgid "Ken Pizzini"
+msgstr ""
+
+#: sed/sed.c:35
+msgid "Paolo Bonzini"
+msgstr ""
+
+#: sed/sed.c:79
#, c-format
msgid ""
"GNU sed home page: <http://www.gnu.org/software/sed/>.\n"
"General help using GNU software: <http://www.gnu.org/gethelp/>.\n"
msgstr ""
-#: sed/sed.c:104
+#: sed/sed.c:86
#, c-format
msgid ""
"E-mail bug reports to: <%s>.\n"
"Be sure to include the word ``%s'' somewhere in the ``Subject:'' field.\n"
msgstr ""
-#: sed/sed.c:117
+#: sed/sed.c:99
msgid ""
" -R, --regexp-perl\n"
" use Perl 5's regular expressions syntax in the script.\n"
msgstr ""
-#: sed/sed.c:122
+#: sed/sed.c:104
#, c-format
msgid ""
"Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n"
"\n"
msgstr ""
-#: sed/sed.c:126
+#: sed/sed.c:108
#, c-format
msgid ""
" -n, --quiet, --silent\n"
" suppress automatic printing of pattern space\n"
msgstr ""
-#: sed/sed.c:128
+#: sed/sed.c:110
#, c-format
msgid ""
" -e script, --expression=script\n"
" add the script to the commands to be executed\n"
msgstr ""
-#: sed/sed.c:130
+#: sed/sed.c:112
#, c-format
msgid ""
" -f script-file, --file=script-file\n"
@@ -241,21 +262,21 @@ msgid ""
"executed\n"
msgstr ""
-#: sed/sed.c:133
+#: sed/sed.c:115
#, c-format
msgid ""
" --follow-symlinks\n"
" follow symlinks when processing in place\n"
msgstr ""
-#: sed/sed.c:136
+#: sed/sed.c:118
#, c-format
msgid ""
" -i[SUFFIX], --in-place[=SUFFIX]\n"
-" edit files in place (makes backup if extension supplied)\n"
+" edit files in place (makes backup if SUFFIX supplied)\n"
msgstr ""
-#: sed/sed.c:139
+#: sed/sed.c:121
#, c-format
msgid ""
" -b, --binary\n"
@@ -263,28 +284,28 @@ msgid ""
"specially)\n"
msgstr ""
-#: sed/sed.c:142
+#: sed/sed.c:124
#, c-format
msgid ""
" -l N, --line-length=N\n"
" specify the desired line-wrap length for the `l' command\n"
msgstr ""
-#: sed/sed.c:144
+#: sed/sed.c:126
#, c-format
msgid ""
" --posix\n"
" disable all GNU extensions.\n"
msgstr ""
-#: sed/sed.c:146
+#: sed/sed.c:128
#, c-format
msgid ""
" -r, --regexp-extended\n"
" use extended regular expressions in the script.\n"
msgstr ""
-#: sed/sed.c:151
+#: sed/sed.c:133
#, c-format
msgid ""
" -s, --separate\n"
@@ -293,7 +314,7 @@ msgid ""
" long stream.\n"
msgstr ""
-#: sed/sed.c:154
+#: sed/sed.c:136
#, c-format
msgid ""
" -u, --unbuffered\n"
@@ -302,17 +323,24 @@ msgid ""
" the output buffers more often\n"
msgstr ""
-#: sed/sed.c:157
+#: sed/sed.c:139
+#, c-format
+msgid ""
+" -z, --null-data\n"
+" separate lines by NUL characters\n"
+msgstr ""
+
+#: sed/sed.c:141
#, c-format
msgid " --help display this help and exit\n"
msgstr ""
-#: sed/sed.c:158
+#: sed/sed.c:142
#, c-format
msgid " --version output version information and exit\n"
msgstr ""
-#: sed/sed.c:159
+#: sed/sed.c:143
#, c-format
msgid ""
"\n"
@@ -323,142 +351,116 @@ msgid ""
"\n"
msgstr ""
-#: sed/sed.c:315
-#, c-format
-msgid "super-sed version %s\n"
-msgstr ""
-
-#: sed/sed.c:316
-#, c-format
-msgid ""
-"based on GNU sed version %s\n"
-"\n"
-msgstr ""
-
-#: sed/sed.c:318
-#, c-format
-msgid "GNU sed version %s\n"
-msgstr ""
-
-#: sed/sed.c:320
-#, c-format
-msgid ""
-"Copyright (C) %d Free Software Foundation, Inc.\n"
-"This is free software; see the source for copying conditions. There is NO\n"
-"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,\n"
-"to the extent permitted by law.\n"
-msgstr ""
-
-#: sed/utils.c:85 sed/utils.c:430
+#: sed/utils.c:74 sed/utils.c:432
#, c-format
msgid "cannot remove %s: %s"
msgstr ""
-#: sed/utils.c:155
+#: sed/utils.c:144
#, c-format
msgid "couldn't open file %s: %s"
msgstr ""
-#: sed/utils.c:178
+#: sed/utils.c:167
#, c-format
msgid "couldn't attach to %s: %s"
msgstr ""
-#: sed/utils.c:237
+#: sed/utils.c:229
#, c-format
msgid "couldn't write %d item to %s: %s"
msgid_plural "couldn't write %d items to %s: %s"
msgstr[0] ""
msgstr[1] ""
-#: sed/utils.c:252 sed/utils.c:268
+#: sed/utils.c:244 sed/utils.c:267
#, c-format
msgid "read error on %s: %s"
msgstr ""
-#: sed/utils.c:370
+#: sed/utils.c:372
#, c-format
msgid "couldn't follow symlink %s: %s"
msgstr ""
-#: sed/utils.c:404
+#: sed/utils.c:406
#, c-format
msgid "cannot stat %s: %s"
msgstr ""
-#: sed/utils.c:435
+#: sed/utils.c:437
#, c-format
msgid "cannot rename %s: %s"
msgstr ""
-#: lib/regcomp.c:134
+#: lib/regcomp.c:132
msgid "Success"
msgstr ""
-#: lib/regcomp.c:137
+#: lib/regcomp.c:135
msgid "No match"
msgstr ""
-#: lib/regcomp.c:140
+#: lib/regcomp.c:138
msgid "Invalid regular expression"
msgstr ""
-#: lib/regcomp.c:143
+#: lib/regcomp.c:141
msgid "Invalid collation character"
msgstr ""
-#: lib/regcomp.c:146
+#: lib/regcomp.c:144
msgid "Invalid character class name"
msgstr ""
-#: lib/regcomp.c:149
+#: lib/regcomp.c:147
msgid "Trailing backslash"
msgstr ""
-#: lib/regcomp.c:152
+#: lib/regcomp.c:150
msgid "Invalid back reference"
msgstr ""
-#: lib/regcomp.c:155
+#: lib/regcomp.c:153
msgid "Unmatched [ or [^"
msgstr ""
-#: lib/regcomp.c:158
+#: lib/regcomp.c:156
msgid "Unmatched ( or \\("
msgstr ""
-#: lib/regcomp.c:161
+#: lib/regcomp.c:159
msgid "Unmatched \\{"
msgstr ""
-#: lib/regcomp.c:164
+#: lib/regcomp.c:162
msgid "Invalid content of \\{\\}"
msgstr ""
-#: lib/regcomp.c:167
+#: lib/regcomp.c:165
msgid "Invalid range end"
msgstr ""
-#: lib/regcomp.c:170
+#: lib/regcomp.c:168
msgid "Memory exhausted"
msgstr ""
-#: lib/regcomp.c:173
+#: lib/regcomp.c:171
msgid "Invalid preceding regular expression"
msgstr ""
-#: lib/regcomp.c:176
+#: lib/regcomp.c:174
msgid "Premature end of regular expression"
msgstr ""
-#: lib/regcomp.c:179
+#: lib/regcomp.c:177
msgid "Regular expression too big"
msgstr ""
-#: lib/regcomp.c:182
+#: lib/regcomp.c:180
msgid "Unmatched ) or \\)"
msgstr ""
-#: lib/regcomp.c:703
+#: lib/regcomp.c:705
msgid "No previous regular expression"
msgstr ""