* scripts/update-alternatives.8: Add --config to action section, and add

  as EXAMPLES section.
* scripts/install-info.pl: install-info --version and --help now display
  on stdout.
* main/dpkg{,-query}.8: Mention what -S will not find.
* main/dpkg.8: Mention that downgrading a package can have serious
  consequences.
* scripts/dpkg-scanpackages.8: Include small note that other tools might
  use the generated Packages file.
* scripts/dpkg-source.1: Fix some typos.
* dselect/dselect.8: dselect is not the only interface for installing
  packages nowadays.
* utils/start-stop-daemon.8: Note that --nicelevel takes an argument.
* man/en/deb-control.8: Remove duplicate 'can'.
* scripts/dpkg-scansources.pl: Fix short description.
* main/dpkg.8: Move dpkg-query options to their own subsection, like
  dpkg-deb.
* main/main.c, main/dpkg.8: Add --dry-run and --simulate as synonyms to
  --no-act.
* scripts/dpkg-architecture.pl: Fix wrong reference to
  DEB_BUILD_GNU_SYSTEM on --host
* man/en/deb-control.5: s/Usuaully/Usually/
* dselect/dselect.8: Removed reference in dselect(8) about recommends not
  being handled well.
* scripts/dpkg-parsechangelog.pl: s/dpkg-source/dpkg-parsechangelog/ in
  -h
* scripts/dpkg-source.1: Unhighlight "May be repeated multiple times."
* dpkg-deb/main.c: Make all actions in -h lower case.
* utils/start-stop-daemon.[c8]: Add -g|--group.
* main/dpkg.8: s/THANKS/THANKS.gz/
* main/dpkg.8: Mention running dselect, install after --set-selections.
* main/main.c: Remove disabled --command-fd from help.

17 files changed, 304 insertions, 145 deletions

diff --git a/ChangeLog b/ChangeLog
index 23a58c800..3ae588c72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,38 @@
+Sat Sep 13 20:48:02 CDT 2003 Adam Heath <doogie@debian.org>
+
+  * scripts/update-alternatives.8: Add --config to action section, and add
+    as EXAMPLES section.
+  * scripts/install-info.pl: install-info --version and --help now display
+    on stdout.
+  * main/dpkg{,-query}.8: Mention what -S will not find.
+  * main/dpkg.8: Mention that downgrading a package can have serious
+    consequences.
+  * scripts/dpkg-scanpackages.8: Include small note that other tools might
+    use the generated Packages file.
+  * scripts/dpkg-source.1: Fix some typos.
+  * dselect/dselect.8: dselect is not the only interface for installing
+    packages nowadays.
+  * utils/start-stop-daemon.8: Note that --nicelevel takes an argument.
+  * man/en/deb-control.8: Remove duplicate 'can'.
+  * scripts/dpkg-scansources.pl: Fix short description.
+  * main/dpkg.8: Move dpkg-query options to their own subsection, like
+    dpkg-deb.
+  * main/main.c, main/dpkg.8: Add --dry-run and --simulate as synonyms to
+    --no-act.
+  * scripts/dpkg-architecture.pl: Fix wrong reference to
+    DEB_BUILD_GNU_SYSTEM on --host
+  * man/en/deb-control.5: s/Usuaully/Usually/
+  * dselect/dselect.8: Removed reference in dselect(8) about recommends not
+    being handled well.
+  * scripts/dpkg-parsechangelog.pl: s/dpkg-source/dpkg-parsechangelog/ in
+    -h
+  * scripts/dpkg-source.1: Unhighlight "May be repeated multiple times."
+  * dpkg-deb/main.c: Make all actions in -h lower case.
+  * utils/start-stop-daemon.[c8]: Add -g|--group.
+  * main/dpkg.8: s/THANKS/THANKS.gz/
+  * main/dpkg.8: Mention running dselect, install after --set-selections.
+  * main/main.c: Remove disabled --command-fd from help.
+
 Sat Sep 13 18:42:27 CDT 2003 Adam Heath <doogie@debian.org>
 
   * Makefile.conf.in, archtable, configure.in, dselect/Makefile.in,
diff --git a/debian/changelog b/debian/changelog
index ef24b6a2b..2b9f0e0ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,63 @@ dpkg (1.10.11) unstable; urgency=low
     Added alphaev68-linux-gnu to archtable.  Closes: #199360
   * Elie Rosenblum <fnord@debian.org>:
     Apply patch to support OpenBSD.  Closes: #154277
+  * Geoff Richards <qef@laxan.com>:
+    Add --config to action section, and add as EXAMPLES section.  Closes:
+    #208014, #115759
+  * Yann Dirson <dirson@debian.org>:
+    install-info --version and --help now display on stdout.  Closes:
+    #154633
+  * Dan Jacobson <jidanni@dman.ddts.net>:
+    Mention what dpkg and dpkg-query -S will not find.  Closes: #153096
+  * Sebastian Leske <sleske@enterprise.mathematik.uni-essen.de>:
+    Mention in dpkg(8) that downgrading a package can have serious
+    consequences.  Closes: #61156
+  * Dan Jacobson <jidanni@dman.ddts.net>:
+    In dpkg-scanpackages(8), including small note that other tools might
+    use the generated Packages file.  Closes: #208894
+  * Warren Turkal <wturkal@cbu.edu>:
+    Fix some typos in dpkg-source(1).  Closes: #207259, #204123, #167426
+  * Dan Jacobson <jidanni@dman.ddts.net>:
+    Alter text in dselect(8), implying that other interfaces are available
+    for installing packages.  Closes: #206164.
+  * Daniel Bonniot <bonniot@users.sourceforge.net>:
+    Note in start-stop-daemon(8) that --nicelevel takes an argument.
+  * Ruben Porras <nahoo82@telefonica.net>:
+    Remove duplicate 'can' in deb-control(5).  Closes: #183840
+  * Dan Jacobson <jidanni@dman.ddts.net>:
+    Fix short description in dpkg-scansources(8).  Closes: #175770
+  * Zefram <zefram@fysh.org>:
+    In dpkg(8), move dpkg-query options to their own subsection, like
+    dpkg-deb.  Closes: #174971
+  * Thomas Hood <jdthood@yahoo.co.uk>
+    Add --dry-run and --simulate as synonyms to --no-act.  Closes:
+    #165099
+  * Junichi Uekawa <dancer@netfort.gr.jp>:
+    Fix wrong reference to DEB_BUILD_GNU_SYSTEM on --host in
+    dpkg-architecture(1).  Closes: #163621
+  * Michael Klein <michael.klein@puffin.lb.shuttle.de>:
+    s/Usuaully/Usually/ in deb-control.5.  Closes: #161819
+  * Joey Hess <joeyh@debian.org>:
+    Removed reference in dselect(8) about recommends not being handled
+    well.  Closes: #157973
+  * Andrew Suffield <aps100@doc.ic.ac.uk>:
+    s/dpkg-source/dpkg-parsechangelog/ in dpkg-parsechangelog -h.
+    Closes: #155822
+  * Matej Vela <vela@debian.org>:
+    Unhighlight "May be repeated multiple times." in dpkg-source(1).
+    Closes: #151845
+  * Jordi Mallach <jordi@debian.org>:
+    Make all actions in dpkg-deb -h lower case.  Closes: #150642
+  * Alexander Hvostov <root@aoi.dyndns.org>:
+    Add -g|--group to start-stop-daemon, and document properly.  Closes:
+    #127342
+  * Szerb Tamas <toma@mlf.linux.rulez.org>:
+    s/THANKS/THANKS.gz/ in dpkg(8).  Closes: #91348
+  * "James R. Van Zandt" <jrv@vanzandt-pc.mitre.org>:
+    In dpkg(8), mention running dselect, install after --set-selections.
+    Closes: #175236
+  * Yann Dirson <dirson@debian.org>:
+    Remove disabled --command-fd from help.  Closes: #169619
 
  -- Wichert Akkerman <debian@extern.wiggy.net>  UNRELEASED
 
diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c
index dad11cb98..9d98e1d64 100644
--- a/dpkg-deb/main.c
+++ b/dpkg-deb/main.c
@@ -59,7 +59,7 @@ Command:\n\
   -b|--build <directory> [<deb>]    build an archive.\n\
   -c|--contents <deb>               list contents.\n\
   -I|--info <deb> [<cfile>...]      show info to stdout.\n\
-  -W|--show <deb>                   Show information on package(s)\n\
+  -W|--show <deb>                   show information on package(s)\n\
   -f|--field <deb> [<cfield>...]    show field(s) to stdout.\n\
   -e|--control <deb> [<directory>]  extract control info.\n\
   -x|--extract <deb> <directory>    extract files.\n\
@@ -73,8 +73,8 @@ Command:\n\
 <cfield> is the name of a field in the main `control' file.\n\
 \n\
 Options:\n\
-  --showformat=<format>      Use alternative format for --show\n\
-  -D                         Enable debugging output\n\
+  --showformat=<format>      use alternative format for --show\n\
+  -D                         enable debugging output\n\
   --old, --new               select archive format\n\
   --nocheck                  suppress control file check (build bad package).\n\
   -z# to set the compression when building\n\
@@ -85,7 +85,7 @@ Format syntax:\n\
   return) or \\\\ (plain backslash). Package information can be included\n\
   by inserting variable references to package fields using the ${var[;width]}\n\
   syntax. Fields will be right-aligned unless the width is negative in which\n\
-   case left aligenment will be used. \n\
+   case left alignment will be used. \n\
 \n\
 Use `dpkg' to install and remove packages from your system, or\n\
 `dselect' for user-friendly package management.  Packages unpacked\n\
diff --git a/dselect/dselect.8 b/dselect/dselect.8
index c721287b0..e96e4d8b9 100644
--- a/dselect/dselect.8
+++ b/dselect/dselect.8
@@ -8,8 +8,8 @@ dselect \- Debian package management frontend
 [\-\-colour | \-\-color screenpart:[foreground],[background][:attr[+attr+..]]]
 .SH DESCRIPTION
 .B dselect
-is the primary user interface for managing packages on a Debian system.
-At the \fBdselect\fP main menu, the system administrator can:
+is one of the primary user interfaces for managing packages on a Debian
+system.  At the \fBdselect\fP main menu, the system administrator can:
  \- Update the list of available package versions,
  \- View the status of installed and available packages,
  \- Alter package selections and manage dependencies,
@@ -415,9 +415,6 @@ The
 package selection interface is confusing to some new users.
 Reportedly, it even makes seasoned kernel developers cry.
 .sp
-.B dselect
-doesn't handle Recommends: field very well.
-.sp
 The documentation is lacking.
 .sp
 There is no help option in the main menu.
diff --git a/main/dpkg-query.8 b/main/dpkg-query.8
index 88ee35e10..4d1ae1428 100644
--- a/main/dpkg-query.8
+++ b/main/dpkg-query.8
@@ -41,7 +41,9 @@ installation-scripts are not listed.
 .TP
 \fB-S\fP | \fB--search\fP \fIfilename-search-pattern\fP ...
 Search for a filename from installed packages. All standard shell
-wildchars can be used in the pattern.
+wildchars can be used in the pattern.  This command will not list
+extra files created by maintainer scripts, nor will it list
+alternatives.
 .TP
 \fB-p\fP |\fB--print-avail\fP package
 Display details about \fIpackage\fP, as found in
diff --git a/main/dpkg.8 b/main/dpkg.8
index fabf8028a..21fdb4532 100644
--- a/main/dpkg.8
+++ b/main/dpkg.8
@@ -1,31 +1,33 @@
-.TH DPKG 8 "February 2000" "Debian Project" "dpkg suite"
+.TH DPKG 8 "April 12, 1998" "Debian Project" "dpkg suite"
 .SH NAME
-dpkg \- medium-level package manager for Debian
-..
+dpkg \- a medium-level package manager for Debian
+
 .SH SYNOPSIS
 .B dpkg
 [\fIoptions\fP] \fIaction\fP
-..
+
 .SH WARNING
 This manual is intended for users wishing to understand \fBdpkg\fP's
 command line options and package states in more detail than that
 provided by \fBdpkg --help\fP.
-.PP
+
 It should \fInot\fP be used by package maintainers wishing to
 understand how \fBdpkg\fP will install their packages.  The
 descriptions of what \fBdpkg\fP does when installing and removing
-packages are particularly inadequate.
-.PP
-For information about this, please refer to sections regarding the
-Debian packaging system in the Debian FAQ or the Debian Reference.
-..
+packages are particularly inadequate.  For detailed information about
+this, please refer to the \fIPackage Management System\fP topic under
+\fIdebian-faq\fP in the GNU Info system.  For information about
+creating Debian packages, see the \fIDebian Package Management
+Tools\fP topic in the same place.
+
 .SH DESCRIPTION
 \fBdpkg\fP is a medium-level tool to install, build, remove and manage
-Debian packages. \fBdpkg\fP is
+Debian packages. The primary and more user-friendly
+front-end for \fBdpkg\fP is \fBdselect\fP(8).  \fBdpkg\fP itself is
 controlled entirely via command line parameters, which consist of exactly
 one action and zero or more options. The action-parameter tells dpkg
 what to do and options control the behavior of the action in some way.
-.PP
+
 \fBdpkg\fP can be also be used as a front-end to \fBdpkg-deb\fP.
 The following
 are \fBdpkg-deb\fP actions, and if they are encountered, \fBdpkg\fP
@@ -41,11 +43,7 @@ just runs \fBdpkg-deb\fP with the parameters given to it:
     \fB--fsys-tarfile\fP.
 .fi
 Please refer to \fBdpkg-deb\fP(1) for information about these actions.
-.PP
-Note: the primary and more user-friendly front-end for \fBdpkg\fP is
-\fBdselect\fP(8). There are other front-ends such as those based on
-\fBapt\fP(8).
-..
+
 .SH INFORMATION ABOUT PACKAGES
 \fBdpkg\fP maintains some usable information about available
 packages. The information is divided in three classes: \fBstates\fP,
@@ -94,31 +92,37 @@ unless forced to do that with option \fB--force-hold\fP.
 A package marked \fBreinst-required\fP is broken and requires
 reinstallation. These packages cannot be removed, unless forced with
 option \fB--force-reinstreq\fP.
-..
+
 .SH ACTIONS
 .TP
 \fBdpkg -i\fP | \fB--install\fP \fIpackage_file\fP...
 Install the package. If \fB--recursive\fP or \fB-R\fP option is
 specified, \fIpackage_file\fP must refer to a directory instead.
-.PP
+
 Installation consists of the following steps:
 .br
+
 \fB1.\fP Extract the control files of the new package.
 .br
+
 \fB2.\fP If another version of the same package was installed before
 the new installation, execute \fIprerm\fP script of the old package.
 .br
+
 \fB3.\fP Run \fIpreinst\fP script, if provided by the package.
 .br
+
 \fB4.\fP Unpack the new files, and at the same time back up the old
 files, so that if something goes wrong, they can be restored.
 .br
+
 \fB5.\fP If another version of the same package was installed before
 the new installation, execute the \fIpostrm\fP script of the old
 package. Note that this script is executed after the \fIpreinst\fP
 script of the new package, because new files are written at the same
 time old files are removed.
 .br
+
 \fB6.\fP Configure the package. See \fB--configure\fP for detailed
 information about how this is done.
 .TP
@@ -131,13 +135,15 @@ directory instead.
 Reconfigure an unpacked package.  If \fB-a\fP or \fB--pending\fP is
 given instead of \fIpackage\fP, all unpacked but unconfigured
 packages are configured.
-.PP
+
 Configuring consists of the following steps:
 .br
+
 \fB1.\fP Unpack the configuration files, and at the same time back up
 the old configuration files, so that they can be restored if
 something goes wrong.
 .br
+
 \fB2.\fP Run \fIpostinst\fP script, if provided by the package.
 .TP
 \fBdpkg -r\fP | \fB--remove\fP | \fB-P\fP | \fB--purge \fP\fIpackage\fP ... | \fB-a\fP | \fB--pending\fP
@@ -150,20 +156,19 @@ files.  If \fB-a\fP or \fB--pending\fP is given instead of a package
 name, then all packages unpacked, but marked to be removed or purged
 in file \fI/var/lib/dpkg/status\fP, are removed or purged,
 respectively.
-.PP
+
 Removing of a package consists of the following steps:
 .br
+
 \fB1.\fP Run \fIprerm\fP script
 .br
+
 \fB2.\fP Remove the installed files
 .br
+
 \fB3.\fP Run \fIpostrm\fP script
 .br
 .TP
-.BI "dpkg  -p|--print-avail " package
-Display details about \fIpackage\fP, as found in
-\fI/var/lib/dpkg/available\fP.
-.TP
 \fBdpkg --update-avail\fP | \fB--merge-avail\fP \fIPackages-file\fP
 Update \fBdpkg\fP's and \fBdselect\fP's idea of which packages are
 available.  With action \fB--merge-avail\fP, old information is
@@ -185,17 +190,6 @@ Forget about uninstalled unavailable packages.
 .B dpkg --clear-avail
 Erase the existing information about what packages are available.
 .TP
-\fBdpkg -l\fP | \fB--list\fP \fIpackage-name-pattern\fP ...
-List packages matching given pattern. If no \fIpackage-name-pattern\fP
-is given, list all packages in \fI/var/lib/dpkg/available\fP.  Normal
-shell wildchars are allowed in \fIpackage-name-pattern\fP.  (You will
-probably have to quote \fIpackage-name-pattern\fP to prevent the shell
-from performing filename expansion.  For example, \fBdpkg -l 'libc5*'\fP will list all the package names starting with "libc5".)
-.TP
-\fBdpkg -s\fP | \fB--status\fP \fIpackage-name\fP ...
-Report status of specified package. This just displays the entry in
-the installed package status database.
-.TP
 \fBdpkg -C\fP | \fB--audit\fP
 Searches for packages that have been installed only partially on your
 system.  \fBdpkg\fP will suggest what to do with them to get them
@@ -211,14 +205,6 @@ Set package selections using file read from stdin.
 Searches for packages selected for installation, but which for some
 reason still haven't been installed.
 .TP
-\fBdpkg -L\fP | \fB--listfiles\fP \fIpackage\fP ...
-List files installed to your system from \fBpackage\fP.
-However, note that files created by package-specific
-installation-scripts are not listed.
-.TP
-\fBdpkg -S\fP | \fB--search\fP \fIfilename-search-pattern\fP ...
-Search for a filename from installed packages. All standard shell
-wildchars can be used in the pattern.
 .TP
 .B dpkg --print-architecture
 Print target architecture (for example, "i386").  This option uses
@@ -247,7 +233,7 @@ additional options set on the command line, and thru this file descriptor,
 are not reset for subsequent commands executed during the same run.
 .TP
 .B dpkg --help
-Display the usage instructions.
+Display a brief help message.
 .TP
 .B dpkg --force-help
 Give help about the \fB--force-\fP\fIthing\fP options.
@@ -256,14 +242,14 @@ Give help about the \fB--force-\fP\fIthing\fP options.
 Give help about debugging options.
 .TP
 \fBdpkg --licence\fP | \fBdpkg --license\fP
-Display \fBdpkg\fP copyright and licence information.
+Display \fBdpkg\fP licence.
 .TP
 \fBdpkg --version\fP
 Display \fBdpkg\fP version information.
 .TP
 \fBdpkg-deb-actions\fP
 See \fBdpkg-deb\fP(1) for more information about the following actions.
-.PP
+
 .nf
 \fBdpkg -b\fP | \fB--build\fP \fIdirectory\fP [\fIfilename\fP]
     Build a deb package.
@@ -284,7 +270,27 @@ See \fBdpkg-deb\fP(1) for more information about the following actions.
     Extract and display the filenames contained by a
     package.
 .fi
-..
+
+.TP
+\fBdpkg-query-actions\fP
+See \fBdpkg-query\fP(1) for more information about the following actions.
+
+.nf
+
+\fBdpkg -l\fP | \fB--list\fP \fIpackage-name-pattern\fP ...
+    List packages matching given pattern.
+\fBdpkg -s\fP | \fB--status\fP \fIpackage-name\fP ...
+    Report status of specified package.
+\fBdpkg -L\fP | \fB--listfiles\fP \fIpackage\fP ...
+    List files installed to your system from \fBpackage\fP.
+\fBdpkg -S\fP | \fB--search\fP \fIfilename-search-pattern\fP ...
+    Search for a filename from installed packages.
+\fBdpkg -p\fP | \fB--print-avail\fP \fIpackage\fP
+    Display details about \fIpackage\fP, as found in \fI/var/lib/dpkg/available\fP.
+.fi
+
+
+
 .SH OPTIONS
 All options can be specified both on the commandline and in the \fBdpkg\fP
 configuration file \fI/etc/dpkg/dpkg.cfg\fP. Each line in the configuration
@@ -320,90 +326,98 @@ debugging values.
  2000   Insane amounts of drivel
 .TP
 \fB--force-\fP\fIthings\fP | \fB--no-force-\fP\fIthings\fP | \fB--refuse-\fP\fIthings\fP
+
 Force or refuse (\fBno-force\fP and \fBrefuse\fP mean the same thing)
 to do some things.  \fIthings\fP is a comma separated list of things
 specified below.  \fB--force-help\fP displays a message describing them.
 Things marked with (*) are forced by default.
-.PP
+
 \fIWarning: These options are mostly intended to be used by experts
 only. Using them without fully understanding their effects may break
 your whole system.\fP
-.br
+
 \fBall\fP:
 Turns on(or off) all force options.
-.br
+
 \fBauto-select\fP(*):
 Select packages to install them, and deselect packages to remove them.
-.br
+
 \fBdowngrade\fP(*):
 Install a package, even if newer version of it is already installed.
-.br
+
+\fIWarning: At present dpkg does not do any dependency 
+checking on downgrades and therefore will not warn you 
+if the downgrade breaks the dependency of some other 
+package.  This can have serious side effects, downgrading
+essential system components can even make your whole
+system unusable.  Use with care.\fP
+
 \fBconfigure-any\fP:
 Configure also any unpacked but unconfigured packages on which the current
 package depends.
-.br
+
 \fBhold\fP:
 Process packages even when marked "hold".
-.br
+
 \fBremove-reinstreq\fP:
 Remove a package, even if it's broken and marked to require
 reinstallation.  This may, for example, cause parts of the package to
 remain on the system, which will then be forgotten by \fBdpkg\fP.
-.br
+
 \fBremove-essential\fP:
 Remove, even if the package is considered essential. Essential
 packages contain mostly very basic Unix commands. Removing them might
 cause the whole system to stop working, so use with caution.
-.br
+
 \fBdepends\fP:
 Turn all dependency problems into warnings.
-.br
+
 \fBdepends-version\fP:
 Don't care about versions when checking dependencies.
-.br
+
 \fBconflicts\fP:
 Install, even if it conflicts with another package. This is dangerous,
 for it will usually cause overwriting of some files.
-.br
+
 \fBconfmiss\fP:
 Always install a missing configuration file. This is dangerous,
 since it means not preserving a change (removing) made to the
 file.
-.br
+
 \fBconfnew\fP:
 If a conffile has been modified always install the new version without
 prompting, unless the \fB--force-confdef\fP is also specified, in
 which case the default action is preferred.
-.br
+
 \fBconfold\fP:
 If a conffile has been modified always keep the old version without
 prompting, unless the \fB--force-confdef\fP is also specified, in
 which case the default action is preferred.
-.br
+
 \fBconfdef\fP:
 If a conffile has been modified always choose the default action. If
 there is no default action it will stop to ask the user unless 
 \fB--force-confnew\fP or \fB--force-confold\fP is also been given, in
 which case it will use that to decide the final action.
-.br
+
 \fBoverwrite\fP:
 Overwrite one package's file with another's file.
-.br
-\fBoverwrite-dir\fP:
+
+\fBoverwrite-dir\fP
 Overwrite one package's directory with another's file.
-.br
+
 \fBoverwrite-diverted\fP:
 Overwrite a diverted file with an undiverted version.
-.br
+
 \fBarchitecture\fP:
 Process even packages with the wrong architecture.
-.br
+
 \fBbad-path\fP:
 \fBPATH\fP is missing important programs, so problems are likely.
-.br
+
 \fBnot-root\fP:
 Try to (de)install things even when not root.
-.br
+
 .TP
 \fB--ignore-depends\fP=\fIpackage\fP,...
 Ignore dependency-checking for specified packages (actually, checking is
@@ -417,15 +431,15 @@ option.
 Don't read or check contents of control file while building a package.
 This is a \fBdpkg-deb\fP(1) option.
 .TP
-.B --no-act
+\fB--no-act\fP | \fB--dry-run\fP | \fB--simulate\fP
 Do everything which is supposed to be done, but don't write any
 changes. This is used to see what would happen with the specified
 action, without actually modifying anything.
-.PP
+
 Be sure to give \fB--no-act\fP before the action-parameter, or you might
 end up with undesirable results.  (e.g.  \fBdpkg --purge foo
 --no-act\fP will first purge package foo and then try to purge package
---no-act, even though you probably expected it to actually do nothing!)
+--no-act, even though you probably expected it to actually do nothing)
 .TP
 \fB-R\fP | \fB--recursive\fP
 Recursively handle all regular files matching pattern \fB*.deb\fP
@@ -461,7 +475,6 @@ installed.
 \fB--status-fd \fP\fI<n>\fP
 Send package status info to file descriptor \fI<n>\fP.  This can be given
 multiple times.  Status updates are of the form `status: <pkg>: <pkg qstate>'.
-..
 .SH FILES
 .TP
 .I /etc/dpkg/dpkg.cfg
@@ -493,7 +506,7 @@ for more information about them:
 .I prerm
 .TP
 .I postrm
-..
+
 .SH ENVIRONMENT VARIABLES
 .TP
 .B DPKG_NO_TSTP
@@ -516,20 +529,28 @@ file.
 Set by \fBdpkg\fP to the filename of the newversion of a configuration file
 when you start a shell to examine a changed configuration.
 file.
-..
+
 .SH EXAMPLES
-To list packages containing the string `vi' in their name:
+To list packages related to the editor vi:
 .br
 \fB     dpkg -l '*vi*'\fP
-.PP
-To see the entries in \fI/var/lib/dpkg/available\fP on several packages:
 .br
-\fB     dpkg -p base-files login xfree86-common | pager\fP
-.PP
-To remove an installed package named "elvis":
+
+To see the entries in \fI/var/lib/dpkg/available\fP on two packages:
+.br
+\fB     dpkg --print-avail elvis vim | less\fP
+.br
+
+To search the listing of packages yourself:
+.br
+\fB     less /var/lib/dpkg/available\fP
+.br
+
+To remove an installed elvis package:
 .br
 \fB     dpkg -r elvis\fP
-.PP
+.br
+
 To install a package, you first need to find it in an archive or
 CDROM.  The "available" file shows that the vim package is in section
 "editors":
@@ -537,12 +558,12 @@ CDROM.  The "available" file shows that the vim package is in section
 \fB     cd /cdrom/hamm/hamm/binary/editors\fP
 \fB     dpkg -i vim_4.5-3.deb\fP
 .br
-(Note: \fBapt-get\fP(8) is commonly used for this.)
-.PP
+
 To make a local copy of the package selection states:
 .br
 \fB     dpkg --get-selections >myselections\fP
-.PP
+.br
+
 You might transfer this file to another computer, and install it there
 with:
 .br
@@ -551,33 +572,24 @@ with:
 Note that this will not actually install or remove anything, but just
 set the selection state on the requested packages.  You will need some
 other application to actually download and install the requested
-packages.
-.PP
+packages.  For example, run \fBdselect\fP and choose "Install".
+
 Ordinarily, you will find that \fBdselect\fP(8) provides a more
 convenient way to modify the package selection states.
-..
-.SH SEE ALSO
-.BR dpkg-deb (1),
-.BR deb (5),
-.BR deb-control (5),
-.BR dselect (8),
-.BR apt (8).
-..
-.SH BUGS/RESTRICTIONS
-dpkg doesn't do any intelligent package ordering on installation.
 .br
-There is no automatic logging ability in dpkg.
-.br
-Depending package relations may sometimes get out of sync on upgrades
-(e.g. exact dependencies of a library -dev package on the library package).
-.PP
-The --no-act option usually gives less information than might be helpful.
-.br
-There is no --status information for virtual packages.
-..
+.SH SEE ALSO
+\fBdselect\fP(8),
+\fBdpkg-deb\fP(1),
+\fBdeb\fP(5),
+and
+\fBdeb-control\fP(5)
+
+.SH BUGS
+
+\fB--no-act\fP usually gives less information than might be helpful.
+
 .SH AUTHORS
 .nf
-\fBdpkg\fP was originally written by Ian Jackson, and later updated by
-many other people, full list of which you may find in the
-\fB/usr/share/doc/dpkg/THANKS\fP file.
+See \fB/usr/share/doc/dpkg/THANKS.gz\fP for the list of people who have
+contributed to \fBdpkg\fP .
 .fi
diff --git a/main/main.c b/main/main.c
index 8f963d609..c516960d2 100644
--- a/main/main.c
+++ b/main/main.c
@@ -67,7 +67,6 @@ Usage: \n\
   dpkg --update-avail <Packages-file>      replace available packages info\n\
   dpkg --merge-avail <Packages-file>       merge with info from file\n\
   dpkg --clear-avail                       erase existing available info\n\
-  dpkg --command-fd <n>                    pass commands in on this file descriptor\n\
   dpkg --forget-old-unavail                forget uninstalled unavailable pkgs\n\
   dpkg -s|--status <package-name> ...      display package status details\n\
   dpkg -p|--print-avail <package-name> ... display available version details\n\
@@ -98,7 +97,8 @@ Options:\n\
   -G|--refuse-downgrade      Skip packages with earlier version than installed\n\
   -B|--auto-deconfigure      Install even if it would break some other package\n\
   --no-debsig                Do no try to verify package signatures\n\
-  --no-act                   Just say what we would do - don't do it\n\
+  --no-act|--dry-run|--simulate\n\
+                             Just say what we would do - don't do it\n\
   -D|--debug=<octal>         Enable debugging - see -Dhelp or --debug=help\n\
   --status-fd <n>            Send status change updates to file descriptor <n>\n\
   --ignore-depends=<package>,... Ignore dependencies involving <package>\n\
@@ -395,6 +395,8 @@ static const struct cmdinfo cmdinfos[]= {
   { "pending",           'a',  0,  &f_pending,     0,  0,             1              },
   { "recursive",         'R',  0,  &f_recursive,   0,  0,             1              },
   { "no-act",             0,   0,  &f_noact,       0,  0,             1              },
+  { "dry-run",            0,   0,  &f_noact,       0,  0,             1              },
+  { "simulate,            0,   0,  &f_noact,       0,  0,             1              },
   { "no-debsig",          0,   0,  &f_nodebsig,    0,  0,             1              },
   {  0,                  'G',  0,  &fc_downgrade,  0,  0, /* alias for --refuse */ 0 },
   { "selected-only",     'O',  0,  &f_alsoselect,  0,  0,             0              },
diff --git a/man/en/deb-control.5 b/man/en/deb-control.5
index 606ce0d6b..508fcb1de 100644
--- a/man/en/deb-control.5
+++ b/man/en/deb-control.5
@@ -148,9 +148,9 @@ field to force removal of the other package, if this one also has the
 same files as the conflicted package.
 .TP
 .BR Provides: \ <package\ list>
-This is a list of virtual packages that this one provides. Usuaully this is
+This is a list of virtual packages that this one provides. Usually this is
 used in the case of several packages all providing the same service.
-For example, sendmail and exim can can serve as a mail server, so they
+For example, sendmail and exim can serve as a mail server, so they
 provide a common package (`mail-transport-agent') on which other packages
 can depend. This will allow sendmail or exim to serve as a valid option
 to satisy the dependency. This prevents the packages that depend on a mail
diff --git a/scripts/dpkg-architecture.pl b/scripts/dpkg-architecture.pl
index 3a1e9f529..638d3b80c 100755
--- a/scripts/dpkg-architecture.pl
+++ b/scripts/dpkg-architecture.pl
@@ -399,7 +399,7 @@ dpkg-architecture with the -q option.  Here are some examples, which
 also show how you can improve the cross compilation support in your
 package:
 
-Instead:
+Instead of:
 
 ARCH=`dpkg --print-architecture`
 configure $(ARCH)-linux
@@ -409,9 +409,9 @@ please use the following:
 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
-configure --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_BUILD_GNU_SYSTEM)
+configure --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 
-Instead:
+Instead of:
 
 ARCH=`dpkg --print-architecture`
 ifeq ($(ARCH),alpha)
diff --git a/scripts/dpkg-parsechangelog.pl b/scripts/dpkg-parsechangelog.pl
index 6c6120910..b8d0d5d02 100755
--- a/scripts/dpkg-parsechangelog.pl
+++ b/scripts/dpkg-parsechangelog.pl
@@ -16,7 +16,7 @@ require 'controllib.pl';
 
 sub usageversion {
     print STDERR
-"Debian dpkg-source $version.
+"Debian dpkg-parsechangelog $version.
 Copyright (C) 1996 Ian Jackson.
 Copyright (C) 2001 Wichert Akkerman
 This is free software; see the GNU General Public Licence
diff --git a/scripts/dpkg-scanpackages.8 b/scripts/dpkg-scanpackages.8
index b63e63982..9521f446e 100644
--- a/scripts/dpkg-scanpackages.8
+++ b/scripts/dpkg-scanpackages.8
@@ -29,8 +29,8 @@ dpkg-scanpackages \- create Packages files
 .B dpkg-scanpackages
 sorts through a tree of Debian binary packages and creates a Packages
 file, used by
-.BR dselect (8)
-to tell the user what packages are available for installation.  These
+.BR dselect (8),
+etc, to tell the user what packages are available for installation.  These
 Packages files are the same as those found on Debian archive sites
 and CD-ROMs.  You might use
 .B dpkg-scanpackages
diff --git a/scripts/dpkg-scansources.pl b/scripts/dpkg-scansources.pl
index 15306bfa4..7464aae40 100755
--- a/scripts/dpkg-scansources.pl
+++ b/scripts/dpkg-scansources.pl
@@ -528,7 +528,7 @@ __END__
 
 =head1 NAME
 
-dpkg-scansources - prog
+dpkg-scansources - search for '.dsc' files and build the 'Sources' index
 
 =head1 SYNOPSIS
 
diff --git a/scripts/dpkg-source.1 b/scripts/dpkg-source.1
index de20bd31f..d8cc6954d 100644
--- a/scripts/dpkg-source.1
+++ b/scripts/dpkg-source.1
@@ -1,5 +1,5 @@
 .\" Authors: Ian Jackson
-.TH DPKG\-SOURCE 1 "Januari 2000" "Debian Project" "dpkg utilities"
+.TH DPKG\-SOURCE 1 "January 2000" "Debian Project" "dpkg utilities"
 .SH NAME 
 dpkg\-source, dpkg\-gencontrol, dpkg\-shlibdeps, dpkg\-genchanges,
 dpkg\-buildpackage, dpkg\-distaddfile, dpkg\-parsechangelog
@@ -623,7 +623,8 @@ Passed unchanged to
 .TP
 .B -I<filename>
 Passed unchanged to
-.BR dpkg-source . May be repeated multiple times.
+.BR dpkg-source .
+May be repeated multiple times.
 .TP
 .B -D
 Check build dependencies and conflicts; abort if unsatisfied.
@@ -632,7 +633,7 @@ Check build dependencies and conflicts; abort if unsatisfied.
 Do not check build dependencies and conflicts.
 .TP
 .B -nc
-Do not clean the source tree(imlies -b).
+Do not clean the source tree(implies -b).
 .SH DPKG-DISTADDFILE ARGUMENTS
 .B dpkg-distaddfile
 does not take any non-common options.  It takes three non-option
diff --git a/scripts/install-info.pl b/scripts/install-info.pl
index 8442cd02c..19f3eab56 100755
--- a/scripts/install-info.pl
+++ b/scripts/install-info.pl
@@ -8,7 +8,8 @@ use Text::Wrap;
 
 $version= '0.93.42.2'; # This line modified by Makefile
 sub version {
-        print STDERR <<END;
+        $file = $_[0];
+        print $file <<END;
 Debian install-info $version.  Copyright (C) 1994,1995
 Ian Jackson.  This is free software; see the GNU General Public Licence
 version 2 or later for copying conditions.  There is NO warranty.
@@ -16,7 +17,8 @@ END
 }
 
 sub usage {
-    print STDERR <<END;
+    $file = $_[0];
+    print $file <<END;
 usage: install-info [--version] [--help] [--debug] [--maxwidth=nnn]
              [--section regexp title] [--infodir=xxx] [--align=nnn]
              [--calign=nnn] [--quiet] [--menuentry=xxx] [--info-dir=xxx]
@@ -52,7 +54,7 @@ while ($ARGV[0] =~ m/^--/) {
     $_= shift(@ARGV);
     last if $_ eq '--';
     if ($_ eq '--version') {
-        &version; exit 0;
+        &version(STDOUT); exit 0;
     } elsif ($_ eq '--quiet') {
         $quiet=1;
     } elsif ($_ eq '--test') {
@@ -65,14 +67,14 @@ while ($ARGV[0] =~ m/^--/) {
         $remove=1;
         $remove_exactly=1;
     } elsif ($_ eq '--help') {
-        &usage; exit 0;
+        &usage(STDOUT); exit 0;
     } elsif ($_ eq '--debug') {
         open(DEBUG,">&STDERR") || die "Could not open stderr for output! $!\n";
 	$debug=1;
     } elsif ($_ eq '--section') {
         if (@ARGV < 2) {
             print STDERR "$name: --section needs two more args\n";
-            &usage; exit 1;
+            &usage(STDERR); exit 1;
         }
         $sectionre= shift(@ARGV);
         $sectiontitle= shift(@ARGV);
@@ -89,17 +91,17 @@ while ($ARGV[0] =~ m/^--/) {
     } elsif (m/^--description=/) {
         $description=$';
     } else {
-        print STDERR "$name: unknown option \`$_'\n"; &usage; exit 1;
+        print STDERR "$name: unknown option \`$_'\n"; &usage(STDERR); exit 1;
     }
 }
 
-if (!@ARGV) { &version; print STDERR "\n"; &usage; exit 1; }
+if (!@ARGV) { &version(STDERR); print STDERR "\n"; &usage(STDERR); exit 1; }
 
 if ( !$filename ) {
 	$filename= shift(@ARGV);
 	$name = "$name($filename)";
 }
-if (@ARGV) { print STDERR "$name: too many arguments\n"; &usage; exit 1; }
+if (@ARGV) { print STDERR "$name: too many arguments\n"; &usage(STDERR); exit 1; }
 
 if ($remove) {
     print STDERR "$name: --section ignored with --remove\n" if length($sectiontitle);
diff --git a/scripts/update-alternatives.8 b/scripts/update-alternatives.8
index 3d07d3931..2f2148944 100644
--- a/scripts/update-alternatives.8
+++ b/scripts/update-alternatives.8
@@ -210,6 +210,42 @@ manual mode
 When a link group is in manual mode,
 the alternatives system will not make any changes
 to the system administrator's settings.
+.SH EXAMPLES
+There are several packages which provide a text editor compatible
+with
+.BR vi ,
+for example
+.BR nvi &quot; and &quot; vim .
+Which one is used is controlled by the link group
+.BR vi ,
+which includes links for the program itself and the associated manpage.
+.PP
+To display the available packages which provide
+.B vi
+and the current setting for it, use the
+.I --display
+action:
+.RS
+.PP
+update-alternatives --display vi
+.RE
+.PP
+To choose a particular
+.B vi
+implementation, use this command as root and then select a number
+from the list:
+.RS
+.PP
+update-alternatives --config vi
+.RE
+.PP
+To go back to having the
+.B vi
+implementation chosen automatically, do this as root:
+.RS
+.PP
+update-alternatives --auto vi
+.RE
 .SH OPTIONS
 Exactly one action must be specified if
 .B update-alternatives
@@ -321,6 +357,13 @@ and the highest priority alternative currently installed.
 .TP
 \fB--list\fR \fIlink\fR
 Display all targets of the link group.
+.TP
+\fB--config\fR \fIlink\fR
+Show available alternatives for a link group and allow the user to
+interactively select which one to use.  The link group is updated
+and taken out of
+.I auto
+mode.
 .SH FILES
 .TP
 .I /etc/alternatives/
diff --git a/utils/start-stop-daemon.8 b/utils/start-stop-daemon.8
index dd446751e..a3f68555a 100644
--- a/utils/start-stop-daemon.8
+++ b/utils/start-stop-daemon.8
@@ -82,6 +82,9 @@ Check for processes owned by the user specified by
 or
 .IR uid .
 .TP
+\fB-g\fP|\fB--group\fP \fIgroup\fP|\fIgid\fP
+Change to \fIgroup\fP or \fIgid\fP when starting the process.
+.TP
 \fB-n\fP|\fB--name\fP \fIprocess-name\fP
 Check for processes with the name
 .I process-name
@@ -193,7 +196,7 @@ reason. This is a last resort, and is only meant for programs that either
 make no sense forking on their own, or where it's not feasible to add the
 code for it to do this itself.
 .TP
-.BR -N | --nicelevel
+\fB-N\fP|\fB--nicelevel\fP \fIint\fP 
 This alters the prority of the process before starting it.
 .TP
 .BR -m | --make-pidfile
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 0559f46c1..fb4ce234f 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -274,6 +274,7 @@ do_help(void)
 "  -c|--chuid <name|uid[:group|gid]>\n"
 "  		change to this user/group before starting process\n"
 "  -u|--user <username>|<uid>    stop processes owned by this user\n"
+"  -g|--group <group|gid>        run process as this group\n"
 "  -n|--name <process-name>      stop processes with this name\n"
 "  -s|--signal <signal>          signal to send (default TERM)\n"
 "  -a|--startas <pathname>       program to start (default is <executable>)\n"
@@ -456,6 +457,7 @@ parse_options(int argc, char * const *argv)
 		{ "signal",	  1, NULL, 's'},
 		{ "test",	  0, NULL, 't'},
 		{ "user",	  1, NULL, 'u'},
+		{ "group",	  1, NULL, 'g'},
 		{ "chroot",	  1, NULL, 'r'},
 		{ "verbose",	  0, NULL, 'v'},
 		{ "exec",	  1, NULL, 'x'},
@@ -469,7 +471,7 @@ parse_options(int argc, char * const *argv)
 	int c;
 
 	for (;;) {
-		c = getopt_long(argc, argv, "HKSVa:n:op:qr:s:tu:vx:c:N:bmR:",
+		c = getopt_long(argc, argv, "HKSVa:n:op:qr:s:tu:vx:c:N:bmR:g:",
 				longopts, (int *) 0);
 		if (c == -1)
 			break;
@@ -523,6 +525,9 @@ parse_options(int argc, char * const *argv)
 			changeuser = strtok(changeuser, ":");
 			changegroup = strtok(NULL, ":");
 			break;
+		case 'g':  /* --group <group>|<gid> */
+			changegroup = optarg;
+			break;
 		case 'r':  /* --chroot /new/root */
 			changeroot = optarg;
 			break;