diff --git a/debian/changelog b/debian/changelog index de49212..92e475f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,8 @@ multistrap (2.1.8) experimental; urgency=low [ Wookey ] * Add support for 'flat' apt-ftparchive-style URLs - * Include chroot.sh preventing services being started during chroot creation + * Include chroot.sh preventing services being started during + chroot creation (Closes: #599056) [ Neil Williams ] * Improve the omitdebsrc handling for detection of 'true'. @@ -16,8 +17,9 @@ multistrap (2.1.8) experimental; urgency=low * Expand the --simulate option output further. * Document the reinstall and additional fields. Add advice in manpage on what to check before filing bugs. + * Add a note about redirecting output in manpage. (Closes: #593326) - -- Neil Williams Sat, 16 Oct 2010 12:37:25 +0100 + -- Neil Williams Sat, 16 Oct 2010 15:29:31 +0100 multistrap (2.1.7) unstable; urgency=low diff --git a/doc/po/de.po b/doc/po/de.po index 1d362e5..41631f0 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: multistrap 2.1.6\n" "Report-Msgid-Bugs-To: codehelp@debian.org\n" -"POT-Creation-Date: 2010-10-16 12:34+0200\n" +"POT-Creation-Date: 2010-10-16 15:30+0200\n" "PO-Revision-Date: 2010-09-07 21:30+0100\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" @@ -1380,12 +1380,26 @@ msgid "" msgstr "" #. type: =head1 +#: pod/multistrap:513 +msgid "Output" +msgstr "" + +#. type: textblock #: pod/multistrap:515 +msgid "" +"C can produce a lot of output - informational messages appear on " +"STDOUT, errors and warnings on STDERR. Calls to C and C respect " +"the same pattern, so it is simple to trim the combined C output " +"to just the errors, if desired." +msgstr "" + +#. type: =head1 +#: pod/multistrap:520 msgid "Bugs" msgstr "" #. type: textblock -#: pod/multistrap:517 +#: pod/multistrap:522 msgid "" "As C gets more complex, bugs will creep into the package. When " "reporting bugs against multistrap, B attach all configuration files. " @@ -1396,14 +1410,14 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:524 +#: pod/multistrap:529 msgid "" "The C<--simulate> option output is regularly expanded to help users debug " "problems in the configuration files." msgstr "" #. type: textblock -#: pod/multistrap:527 +#: pod/multistrap:532 msgid "" "Please also check (and update) the Multistrap wiki at http://wiki.debian.org/" "Multistrap and the Multistrap webpage content at http://www.emdebian.org/" diff --git a/doc/po/fr.po b/doc/po/fr.po index 594d928..72293d8 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: multistrap 2.1.4\n" -"POT-Creation-Date: 2010-10-16 12:34+0200\n" +"POT-Creation-Date: 2010-10-16 15:30+0200\n" "PO-Revision-Date: 2010-09-11 13:13+0100\n" "Last-Translator: Julien Patriarca \n" "Language-Team: French \n" @@ -1378,12 +1378,26 @@ msgid "" msgstr "" #. type: =head1 +#: pod/multistrap:513 +msgid "Output" +msgstr "" + +#. type: textblock #: pod/multistrap:515 +msgid "" +"C can produce a lot of output - informational messages appear on " +"STDOUT, errors and warnings on STDERR. Calls to C and C respect " +"the same pattern, so it is simple to trim the combined C output " +"to just the errors, if desired." +msgstr "" + +#. type: =head1 +#: pod/multistrap:520 msgid "Bugs" msgstr "" #. type: textblock -#: pod/multistrap:517 +#: pod/multistrap:522 msgid "" "As C gets more complex, bugs will creep into the package. When " "reporting bugs against multistrap, B attach all configuration files. " @@ -1394,14 +1408,14 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:524 +#: pod/multistrap:529 msgid "" "The C<--simulate> option output is regularly expanded to help users debug " "problems in the configuration files." msgstr "" #. type: textblock -#: pod/multistrap:527 +#: pod/multistrap:532 msgid "" "Please also check (and update) the Multistrap wiki at http://wiki.debian.org/" "Multistrap and the Multistrap webpage content at http://www.emdebian.org/" diff --git a/doc/po/pt.po b/doc/po/pt.po index ae2a87c..116553c 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: multistrap 2.1.7\n" -"POT-Creation-Date: 2010-10-16 12:34+0200\n" +"POT-Creation-Date: 2010-10-16 15:30+0200\n" "PO-Revision-Date: 2010-09-02 22:47+0100\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" @@ -1349,12 +1349,26 @@ msgid "" msgstr "" #. type: =head1 +#: pod/multistrap:513 +msgid "Output" +msgstr "" + +#. type: textblock #: pod/multistrap:515 +msgid "" +"C can produce a lot of output - informational messages appear on " +"STDOUT, errors and warnings on STDERR. Calls to C and C respect " +"the same pattern, so it is simple to trim the combined C output " +"to just the errors, if desired." +msgstr "" + +#. type: =head1 +#: pod/multistrap:520 msgid "Bugs" msgstr "" #. type: textblock -#: pod/multistrap:517 +#: pod/multistrap:522 msgid "" "As C gets more complex, bugs will creep into the package. When " "reporting bugs against multistrap, B attach all configuration files. " @@ -1365,14 +1379,14 @@ msgid "" msgstr "" #. type: textblock -#: pod/multistrap:524 +#: pod/multistrap:529 msgid "" "The C<--simulate> option output is regularly expanded to help users debug " "problems in the configuration files." msgstr "" #. type: textblock -#: pod/multistrap:527 +#: pod/multistrap:532 msgid "" "Please also check (and update) the Multistrap wiki at http://wiki.debian.org/" "Multistrap and the Multistrap webpage content at http://www.emdebian.org/" diff --git a/pod/multistrap b/pod/multistrap index 189a8fb..995f7ab 100644 --- a/pod/multistrap +++ b/pod/multistrap @@ -510,7 +510,12 @@ just workarounds and wishlist bugs should be filed in Debian against packages which require the use of these mechanisms (or the packages which would prevent the particular package from operating normally). -=cut +=head1 Output + +C can produce a lot of output - informational messages +appear on STDOUT, errors and warnings on STDERR. Calls to C and +C respect the same pattern, so it is simple to trim the combined +C output to just the errors, if desired. =head1 Bugs