Synchronise usage information of dpkg, dpkg-deb, and

dpkg-query man pages. This fixes some small mistakes
and also Closes: #321520

diff --git a/debian/changelog b/debian/changelog
index 33c11bfa2e807d44e59afd33c58fe2c7b39522c8..52f327885454cbf727c153eadc20ec273eefc596 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 dpkg (1.14.6) UNRELEASED; urgency=low
 
+  [ Frank Lichtenheld ]
+  * Synchronise usage information of dpkg, dpkg-deb, and
+    dpkg-query man pages. This fixes some small mistakes
+    and also Closes: #321520
+  
   [ Updated scripts translations ]
   * French (Frédéric Bothamy, Christian Perrier).
 

diff --git a/man/ChangeLog b/man/ChangeLog
index ca5c217af670b7ee2fe4271965208b4d5da8cc1a..dbe7313ef8f64a839e8f27a974ada49e8175afd6 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-10  Frank Lichtenheld  <djpig@debian.org>
+
+       * dpkg.1, dpkg-query.1, dpkg-deb.1: Synchronise
+       usage information between these three man pages.
+       Also fix some formatting oddities and small
+       mistakes.
+
 2007-07-08  Helge Kreutzmann  <debian@helgefjell.de>
 
        * po/de.po: Updated to 1061t1f219u.

diff --git a/man/dpkg-deb.1 b/man/dpkg-deb.1
index 40d352669b556cc67e172f251a46beacbd50b9a5..77f9ccf464a6488fcf5e2901b4bf9e9db0abac25 100644 (file)
--- a/man/dpkg-deb.1
+++ b/man/dpkg-deb.1
@@ -149,7 +149,7 @@ format. Together with
 .BR tar (1)
 this can be used to extract a particular file from a package archive.
 .TP
-.BR \-e ", " \-\-control " \fIarchive directory\fP"
+.BR \-e ", " \-\-control " \fIarchive\fP [\fIdirectory\fP]"
 Extracts the control information files from a package archive into the
 specified directory.
 

diff --git a/man/dpkg-query.1 b/man/dpkg-query.1
index 69b8886e3cc846c5f00f453b4f2580c838c5b6d1..41558ca6bec1d141e88e83b88e88f9965f6bc85f 100644 (file)
--- a/man/dpkg-query.1
+++ b/man/dpkg-query.1
@@ -43,7 +43,7 @@ Report status of specified package. This just displays the entry in
 the installed package status database.
 .TP
 .BR \-L ", " \-\-listfiles " \fIpackage-name\fP ..."
-List files installed to your system from \fBpackage-name\fP.
+List files installed to your system from \fIpackage-name\fP.
 However, note that files created by package-specific
 installation-scripts are not listed.
 .TP
@@ -53,7 +53,7 @@ wildchars can be used in the pattern. This command will not list
 extra files created by maintainer scripts, nor will it list
 alternatives.
 .TP
-.BR \-p ", " \-\-print\-avail " \fIpackage-name\fP"
+.BR \-p ", " \-\-print\-avail " \fIpackage-name\fP ..."
 Display details about \fIpackage-name\fP, as found in
 \fI/var/lib/dpkg/available\fP.
 .TP

diff --git a/man/dpkg.1 b/man/dpkg.1
index eb380dc929cff3b940e34afddba147a042ed1d8c..39647ea744fc9d3fe7c89d80e6cae7fccdcb44d1 100644 (file)
--- a/man/dpkg.1
+++ b/man/dpkg.1
@@ -252,24 +252,24 @@ Display \fBdpkg\fP version information.
 See \fBdpkg\-deb\fP(1) for more information about the following actions.
 
 .nf
-\fBdpkg \-b\fP | \fB\-\-build\fP \fIdirectory\fP [\fIfilename\fP]
+\fBdpkg \-b\fP | \fB\-\-build\fP \fIdirectory\fP [\fIarchive\fP|\fIdirectory\fP]
     Build a deb package.
-\fBdpkg \-c\fP | \fB\-\-contents\fP \fIfilename\fP
+\fBdpkg \-c\fP | \fB\-\-contents\fP \fIarchive\fP
     List contents of a deb package.
 \fBdpkg \-e\fP | \fB\-\-control\fP \fIfilename\fP [\fIdirectory\fP]
     Extract control-information from a package.
-\fBdpkg \-x\fP | \fB\-\-extract\fP \fIfilename directory\fP
+\fBdpkg \-x\fP | \fB\-\-extract\fP \fIarchive directory\fP
     Extract the files contained by package.
-\fBdpkg \-f\fP | \fB\-\-field\fP  \fIfilename\fP [\fIcontrol-field\fP] ...
+\fBdpkg \-X\fP | \fB\-\-vextract\fP \fIarchive directory\fP
+    Extract and display the filenames contained by a
+    package.
+\fBdpkg \-f\fP | \fB\-\-field\fP  \fIarchive\fP [\fIcontrol-field\fP ...]
     Display control field(s) of a package.
-\fBdpkg \-\-fsys\-tarfile\fP \fIfilename\fP
+\fBdpkg \-\-fsys\-tarfile\fP \fIarchive\fP
     Display the filesystem tar-file contained by a
     Debian package.
-\fBdpkg \-I\fP | \fB\-\-info\fP \fIfilename\fP [\fIcontrol-file\fP]
+\fBdpkg \-I\fP | \fB\-\-info\fP \fIarchive\fP [\fIcontrol-file\fP ...]
     Show information about a package.
-\fBdpkg \-X\fP | \fB\-\-vextract\fP \fIfilename\fP \fIdirectory\fP
-    Extract and display the filenames contained by a
-    package.
 .fi
 
 .TP
@@ -282,12 +282,13 @@ See \fBdpkg\-query\fP(1) for more information about the following actions.
     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 \-L\fP | \fB\-\-listfiles\fP \fIpackage-name\fP ...
+    List files installed to your system from \fIpackage-name\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.
+\fBdpkg \-p\fP | \fB\-\-print\-avail\fP \fIpackage-name\fP ...
+    Display details about \fIpackage-name\fP, as found in
+    \fI/var/lib/dpkg/available\fP.
 .fi
 .
 .SH OPTIONS