Sfoglia il codice sorgente

man: Use minus signs and hyphens consistently

Any string that can be copy & pasted into control files or into a
terminal, for example, needs to correctly use minus signs (escaped
dashes), instead of the default hyphen.
Guillem Jover 15 anni fa
parent
commit
ed3ec669d2

+ 1 - 0
debian/changelog

@@ -172,6 +172,7 @@ dpkg (1.16.1) UNRELEASED; urgency=low
     - Use [option...] instead of [options] and friends.
     - Use [option...] instead of [options] and friends.
     - Use italics or bold instead of surrounding the text with <>.
     - Use italics or bold instead of surrounding the text with <>.
     - Correctly format text with bold and italics.
     - Correctly format text with bold and italics.
+    - Use minus signs and hyphens consistently in man pages.
   * Refer to Sources and Packages files as part of a repository instead of
   * Refer to Sources and Packages files as part of a repository instead of
     as being of exclusive use or owned by APT, which has never been the case.
     as being of exclusive use or owned by APT, which has never been the case.
   * Unify somewhat dpkg-maintscript-helper --help output with other commands.
   * Unify somewhat dpkg-maintscript-helper --help output with other commands.

+ 3 - 3
man/deb-control.5

@@ -1,6 +1,6 @@
 .\" Author: Raul Miller
 .\" Author: Raul Miller
 .\" Includes text from the debian Guidelines by Ian Jackson, Ian Murdock
 .\" Includes text from the debian Guidelines by Ian Jackson, Ian Murdock
-.TH deb\-control 5 "2011-07-04" "Debian Project" "Debian"
+.TH deb\-control 5 "2011-08-14" "Debian Project" "Debian"
 .SH NAME
 .SH NAME
 deb\-control \- Debian packages' master control file format
 deb\-control \- Debian packages' master control file format
 .
 .
@@ -252,8 +252,8 @@ Priority: required
 Section: base
 Section: base
 Maintainer: Wichert Akkerman <wakkerma@debian.org>
 Maintainer: Wichert Akkerman <wakkerma@debian.org>
 Architecture: sparc
 Architecture: sparc
-Version: 2.4-1
-Pre-Depends: libc6 (>= 2.0.105)
+Version: 2.4\-1
+Pre\-Depends: libc6 (>= 2.0.105)
 Provides: rgrep
 Provides: rgrep
 Conflicts: rgrep
 Conflicts: rgrep
 Description: GNU grep, egrep and fgrep.
 Description: GNU grep, egrep and fgrep.

+ 3 - 3
man/deb-old.5

@@ -1,4 +1,4 @@
-.TH deb\-old 5 "2006-02-28" "Debian Project" "Debian"
+.TH deb\-old 5 "2011-08-14" "Debian Project" "Debian"
 .SH NAME
 .SH NAME
 deb\-old \- old style Debian binary package format
 deb\-old \- old style Debian binary package format
 .
 .
@@ -50,5 +50,5 @@ on. The pathnames do not have leading slashes.
 .
 .
 .SH SEE ALSO
 .SH SEE ALSO
 .BR deb (5),
 .BR deb (5),
-.BR dpkg-deb (1),
-.BR deb-control (5).
+.BR dpkg\-deb (1),
+.BR deb\-control (5).

+ 2 - 2
man/deb-override.5

@@ -12,7 +12,7 @@
 .\"
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" You should have received a copy of the GNU General Public License
 .\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
 .\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
-.TH deb\-override 5 "2007-03-07" "Debian Project" "dpkg utilities"
+.TH deb\-override 5 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 .SH NAME
 deb\-override \- Debian archive override file
 deb\-override \- Debian archive override file
 .
 .
@@ -63,4 +63,4 @@ directory on any Debian mirror.
 .BR dpkg\-scanpackages (1),
 .BR dpkg\-scanpackages (1),
 .BR dpkg\-scansources (1),
 .BR dpkg\-scansources (1),
 .BR apt\-ftparchive (1),
 .BR apt\-ftparchive (1),
-.BR /usr/share/doc/debian-policy/policy.html/index.html .
+.BR /usr/share/doc/debian\-policy/policy.html/index.html .

+ 18 - 18
man/deb-src-control.5

@@ -1,6 +1,6 @@
 .\" Author: Oxan van Leeuwen
 .\" Author: Oxan van Leeuwen
 .\" Includes text from the deb-control manual page by Raul Miller
 .\" Includes text from the deb-control manual page by Raul Miller
-.TH deb\-src\-control 5 "2011-04-29" "Debian Project" "Debian"
+.TH deb\-src\-control 5 "2011-08-14" "Debian Project" "Debian"
 .SH NAME
 .SH NAME
 deb\-src\-control \- Debian source packages' master control file format
 deb\-src\-control \- Debian source packages' master control file format
 .
 .
@@ -259,7 +259,7 @@ package.
 .BI Provides: " package-list"
 .BI Provides: " package-list"
 .TP
 .TP
 .PD 0
 .PD 0
-.BI Built-Using: " package-list"
+.BI Built\-Using: " package-list"
 .br
 .br
 These fields declare relationships between packages. They are discussed in
 These fields declare relationships between packages. They are discussed in
 the
 the
@@ -292,30 +292,30 @@ source package control files.
 Source: dpkg
 Source: dpkg
 Section: admin
 Section: admin
 Priority: required
 Priority: required
-Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
+Maintainer: Dpkg Developers <debian\-dpkg@lists.debian.org>
 # this field is copied to the binary and source packages
 # this field is copied to the binary and source packages
-XBS-Upstream-Release-Status: stable
+XBS\-Upstream\-Release\-Status: stable
 Homepage: http://wiki.debian.org/Teams/Dpkg
 Homepage: http://wiki.debian.org/Teams/Dpkg
-Vcs-Browser: http://git.debian.org/?p=dpkg/dpkg.git
-Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git
-Standards-Version: 3.7.3
-Build-Depends: pkg-config, debhelper (>= 4.1.81),
- libselinux1-dev (>= 1.28-4) [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64]
+Vcs\-Browser: http://git.debian.org/?p=dpkg/dpkg.git
+Vcs\-Git: git://git.debian.org/git/dpkg/dpkg.git
+Standards\-Version: 3.7.3
+Build\-Depends: pkg\-config, debhelper (>= 4.1.81),
+ libselinux1\-dev (>= 1.28\-4) [!hurd\-i386 !kfreebsd\-i386 !kfreebsd\-amd64]
 
 
-Package: dpkg-dev
+Package: dpkg\-dev
 Section: utils
 Section: utils
 Priority: optional
 Priority: optional
 Architecture: all
 Architecture: all
 # this is a custom field in the binary package
 # this is a custom field in the binary package
-XB-Mentoring-Contact: Raphael Hertzog <hertzog@debian.org>
-Depends: dpkg (>= 1.14.6), perl5, perl-modules, cpio (>= 2.4.2-2), bzip2, lzma,
- patch (>= 2.2-1), make, binutils, libtimedate-perl
-Recommends: gcc | c-compiler, build-essential
-Suggests: gnupg, debian-keyring
-Conflicts: dpkg-cross (<< 2.0.0), devscripts (<< 2.10.26)
-Replaces: manpages-pl (<= 20051117-1)
+XB\-Mentoring\-Contact: Raphael Hertzog <hertzog@debian.org>
+Depends: dpkg (>= 1.14.6), perl5, perl\-modules, cpio (>= 2.4.2\-2),
+ bzip2, lzma, patch (>= 2.2\-1), make, binutils, libtimedate\-perl
+Recommends: gcc | c\-compiler, build\-essential
+Suggests: gnupg, debian\-keyring
+Conflicts: dpkg\-cross (<< 2.0.0), devscripts (<< 2.10.26)
+Replaces: manpages\-pl (<= 20051117\-1)
 Description: Debian package development tools
 Description: Debian package development tools
- This package provides the development tools (including dpkg-source)
+ This package provides the development tools (including dpkg\-source)
  required to unpack, build and upload Debian source packages.
  required to unpack, build and upload Debian source packages.
  .
  .
  Most Debian source packages will require additional tools to build;
  Most Debian source packages will require additional tools to build;

+ 5 - 5
man/deb-symbols.5

@@ -1,5 +1,5 @@
 .\" Author: Raphaël Hertzog
 .\" Author: Raphaël Hertzog
-.TH deb\-symbols 5 "2007-07-16" "Debian Project" "dpkg utilities"
+.TH deb\-symbols 5 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 .SH NAME
 deb\-symbols \- Debian's extended shared library information file
 deb\-symbols \- Debian's extended shared library information file
 .
 .
@@ -36,9 +36,9 @@ etc.
 .P
 .P
 Each entry for a library can also have some fields of meta-information.
 Each entry for a library can also have some fields of meta-information.
 Those fields are stored on lines starting with an asterisk. Currently,
 Those fields are stored on lines starting with an asterisk. Currently,
-the only valid field is \fIBuild-Depends-Package\fR, it indicates the name
+the only valid field is \fIBuild\-Depends\-Package\fR, it indicates the name
 of the "\-dev" package associated to the library and is used by
 of the "\-dev" package associated to the library and is used by
-\fBdpkg-shlibdeps\fP to make sure that the dependency generated is at least as
+\fBdpkg\-shlibdeps\fP to make sure that the dependency generated is at least as
 strict as the corresponding build dependency.
 strict as the corresponding build dependency.
 .SH EXAMPLES
 .SH EXAMPLES
 .SS Simple symbols file
 .SS Simple symbols file
@@ -51,9 +51,9 @@ libftp.so.3 libftp3 #MINVER#
 .PP 
 .PP 
 libGL.so.1 libgl1
 libGL.so.1 libgl1
 .br
 .br
-| libgl1-mesa-glx #MINVER#
+| libgl1\-mesa\-glx #MINVER#
 .br
 .br
-* Build-Depends-Package: libgl1-mesa-dev
+* Build\-Depends\-Package: libgl1\-mesa\-dev
  publicGlSymbol@Base 6.3-1
  publicGlSymbol@Base 6.3-1
  [...]
  [...]
  implementationSpecificSymbol@Base 6.5.2-7 1
  implementationSpecificSymbol@Base 6.5.2-7 1

+ 8 - 8
man/deb-triggers.5

@@ -1,4 +1,4 @@
-.TH deb\-triggers 5 "2009-03-15" "Debian Project" "dpkg utilities"
+.TH deb\-triggers 5 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 .SH NAME
 deb\-triggers \- package triggers
 deb\-triggers \- package triggers
 .
 .
@@ -21,14 +21,14 @@ The trigger control directives currently supported are:
 .I trigger-name
 .I trigger-name
 .PP
 .PP
 .in +5
 .in +5
-.B interest-noawait
+.B interest\-noawait
 .I trigger-name
 .I trigger-name
 .PP
 .PP
 .in +5
 .in +5
 Specifies that the package is interested in the named trigger. All
 Specifies that the package is interested in the named trigger. All
 triggers in which a package is interested must be listed using this
 triggers in which a package is interested must be listed using this
 directive in the triggers control file. The "noawait" variant does
 directive in the triggers control file. The "noawait" variant does
-not put the triggering packages in triggers-awaited state. This should
+not put the triggering packages in triggers\-awaited state. This should
 be used when the functionality provided by the trigger is not crucial.
 be used when the functionality provided by the trigger is not crucial.
 .PP
 .PP
 .in +5
 .in +5
@@ -36,7 +36,7 @@ be used when the functionality provided by the trigger is not crucial.
 .I trigger-name
 .I trigger-name
 .PP
 .PP
 .in +5
 .in +5
-.B activate-noawait
+.B activate\-noawait
 .I trigger-name
 .I trigger-name
 .PP
 .PP
 .in +5
 .in +5
@@ -45,14 +45,14 @@ specified trigger. The trigger will be activated at the start of
 the following operations: unpack, configure, remove (including for
 the following operations: unpack, configure, remove (including for
 the benefit of a conflicting package), purge and deconfigure.
 the benefit of a conflicting package), purge and deconfigure.
 The "noawait" variant does not put the triggering packages in
 The "noawait" variant does not put the triggering packages in
-triggers-awaited state. This should be used when the functionality
+triggers\-awaited state. This should be used when the functionality
 provided by the trigger is not crucial.
 provided by the trigger is not crucial.
 .PP
 .PP
 .in +5
 .in +5
 If this package disappears during the unpacking of another package
 If this package disappears during the unpacking of another package
 the trigger will be activated when the disappearance is noted
 the trigger will be activated when the disappearance is noted
 towards the end of the unpack. Trigger processing, and transition
 towards the end of the unpack. Trigger processing, and transition
-from triggers-awaited to installed, does not cause activations.
+from triggers\-awaited to installed, does not cause activations.
 In the case of unpack, triggers mentioned in both the old and new
 In the case of unpack, triggers mentioned in both the old and new
 versions of the package will be activated.
 versions of the package will be activated.
 .PP
 .PP
@@ -61,10 +61,10 @@ package.
 .PP
 .PP
 The "\-noawait" variants are only supported by dpkg 1.16.1 or newer, and
 The "\-noawait" variants are only supported by dpkg 1.16.1 or newer, and
 will lead to errors if used with an older dpkg. It is thus recommended
 will lead to errors if used with an older dpkg. It is thus recommended
-to add a "Pre-Depends: dpkg (>= 1.16.1)" to any package that wish to use
+to add a "Pre\-Depends: dpkg (>= 1.16.1)" to any package that wish to use
 those directives.
 those directives.
 .
 .
 .SH SEE ALSO
 .SH SEE ALSO
 .BR dpkg\-trigger (1),
 .BR dpkg\-trigger (1),
 .BR dpkg (1),
 .BR dpkg (1),
-.BR /usr/share/doc/dpkg-dev/triggers.txt.gz .
+.BR /usr/share/doc/dpkg\-dev/triggers.txt.gz .

+ 3 - 3
man/deb-version.5

@@ -2,7 +2,7 @@
 .\" The copyright given below is that of the whole policy, but probably
 .\" The copyright given below is that of the whole policy, but probably
 .\" incomplete.
 .\" incomplete.
 .\" Conversion to roff by Frank Lichtenheld
 .\" Conversion to roff by Frank Lichtenheld
-.TH deb\-version 5 "2011-07-04" "Debian Project" "Debian"
+.TH deb\-version 5 "2011-08-14" "Debian Project" "Debian"
 .SH NAME
 .SH NAME
 deb\-version \- Debian package version number format
 deb\-version \- Debian package version number format
 .
 .
@@ -111,10 +111,10 @@ interpret (such as 'ALPHA' or 'pre\-'), or with
 silly orderings.
 silly orderings.
 .SH CAVEATS
 .SH CAVEATS
 The tilde character and its special sorting properties were introduced
 The tilde character and its special sorting properties were introduced
-in dpkg, version 1.10 and some parts of dpkg-dev only gained
+in dpkg, version 1.10 and some parts of dpkg\-dev only gained
 support for it later in the 1.10.x series.
 support for it later in the 1.10.x series.
 .SH SEE ALSO
 .SH SEE ALSO
-.BR deb-control (5),
+.BR deb\-control (5),
 .BR deb (5),
 .BR deb (5),
 .BR dpkg (1)
 .BR dpkg (1)
 .SH AUTHORS
 .SH AUTHORS

+ 6 - 6
man/deb.5

@@ -1,4 +1,4 @@
-.TH deb 5 "2009-02-27" "Debian Project" "Debian"
+.TH deb 5 "2011-08-14" "Debian Project" "Debian"
 .SH NAME
 .SH NAME
 deb \- Debian binary package format
 deb \- Debian binary package format
 .SH SYNOPSIS
 .SH SYNOPSIS
@@ -12,7 +12,7 @@ of dpkg since 1.2.0 and all i386/ELF versions since 1.1.1elf.
 .PP
 .PP
 The format described here is used since Debian 0.93; details of the
 The format described here is used since Debian 0.93; details of the
 old format are described in
 old format are described in
-.BR deb-old (5).
+.BR deb\-old (5).
 .SH FORMAT
 .SH FORMAT
 The file is an
 The file is an
 .B ar
 .B ar
@@ -27,7 +27,7 @@ and the POSIX ustar format (long names supported since dpkg 1.15.0).
 Unrecognized tar typeflags are considered an error.
 Unrecognized tar typeflags are considered an error.
 .PP
 .PP
 The first member is named
 The first member is named
-.B debian-binary
+.B debian\-binary
 and contains a series of lines, separated by newlines. Currently only
 and contains a series of lines, separated by newlines. Currently only
 one line is present, the format version number,
 one line is present, the format version number,
 .BR 2.0
 .BR 2.0
@@ -77,6 +77,6 @@ inserted before
 with names starting with something other than underscores, or will
 with names starting with something other than underscores, or will
 (more likely) cause the major version number to be increased.
 (more likely) cause the major version number to be increased.
 .SH SEE ALSO
 .SH SEE ALSO
-.BR deb-old (5),
-.BR dpkg-deb (1),
-.BR deb-control (5).
+.BR deb\-old (5),
+.BR dpkg\-deb (1),
+.BR deb\-control (5).

+ 13 - 13
man/dpkg-architecture.1

@@ -1,14 +1,14 @@
-.TH dpkg\-architecture 1 "2011-07-04" "Debian Project" "dpkg utilities"
+.TH dpkg\-architecture 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH "NAME"
 .SH "NAME"
 dpkg\-architecture \- set and determine the architecture for package building
 dpkg\-architecture \- set and determine the architecture for package building
 .
 .
 .SH SYNOPSIS
 .SH SYNOPSIS
-.B dpkg-architecture
+.B dpkg\-architecture
 .RI [ option "...] [" command ]
 .RI [ option "...] [" command ]
 .PP
 .PP
 .
 .
 .SH DESCRIPTION
 .SH DESCRIPTION
-dpkg-architecture does provide a facility to determine and set the build and
+dpkg\-architecture does provide a facility to determine and set the build and
 host architecture for package building.
 host architecture for package building.
 .PP
 .PP
 The build architecture is always determined by an external call to
 The build architecture is always determined by an external call to
@@ -74,7 +74,7 @@ Set the GNU system type.
 .TP
 .TP
 .B \-f
 .B \-f
 Values set by existing environment variables with the same name as used by
 Values set by existing environment variables with the same name as used by
-the scripts are honored (i.e. used by \fBdpkg-architecture\fP), except if
+the scripts are honored (i.e. used by \fBdpkg\-architecture\fP), except if
 this force flag is present. This allows the user
 this force flag is present. This allows the user
 to override a value even when the call to \fBdpkg\-architecture\fP is buried
 to override a value even when the call to \fBdpkg\-architecture\fP is buried
 in some other script (for example \fBdpkg\-buildpackage\fP(1)).
 in some other script (for example \fBdpkg\-buildpackage\fP(1)).
@@ -193,18 +193,18 @@ Debian architectures which don't equal a processor name.
 .
 .
 .SH "BACKWARD COMPATIBILITY"
 .SH "BACKWARD COMPATIBILITY"
 The DEB_*_ARCH_BITS and DEB_*_ARCH_ENDIAN variables were introduced
 The DEB_*_ARCH_BITS and DEB_*_ARCH_ENDIAN variables were introduced
-in dpkg-dev 1.15.4. Using them in \fIdebian/rules\fR thus requires a
-build-dependency on dpkg-dev (>= 1.15.4).
+in dpkg\-dev 1.15.4. Using them in \fIdebian/rules\fR thus requires a
+build-dependency on dpkg\-dev (>= 1.15.4).
 .PP
 .PP
 The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were introduced
 The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were introduced
-in dpkg-dev 1.13.2. Before this \fIdebian/rules\fR files tended to check
+in dpkg\-dev 1.13.2. Before this \fIdebian/rules\fR files tended to check
 the values of the DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which
 the values of the DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which
 have been subject to change.
 have been subject to change.
 .PP
 .PP
 Where \fIdebian/rules\fR files check these variables to decide how or what
 Where \fIdebian/rules\fR files check these variables to decide how or what
 to compile, this should be updated to use the new variables and values.
 to compile, this should be updated to use the new variables and values.
 You may wish to retain backwards compatibility with older version of
 You may wish to retain backwards compatibility with older version of
-dpkg-dev by using the following code:
+dpkg\-dev by using the following code:
 .IP
 .IP
 .nf
 .nf
 DEB_HOST_ARCH_CPU := $(shell dpkg\-architecture \-qDEB_HOST_ARCH_CPU 2>/dev/null)
 DEB_HOST_ARCH_CPU := $(shell dpkg\-architecture \-qDEB_HOST_ARCH_CPU 2>/dev/null)
@@ -227,8 +227,8 @@ endif
 .PP
 .PP
 And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS.
 And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS.
 .PP
 .PP
-If you still wish to support versions of dpkg-dev that did not include
-\fBdpkg-architecture\fR, the following does the job:
+If you still wish to support versions of dpkg\-dev that did not include
+\fBdpkg\-architecture\fR, the following does the job:
 .IP
 .IP
 .nf
 .nf
 \&\s-1DEB_BUILD_ARCH\s0 := $(shell dpkg \-\-print\-architecture)
 \&\s-1DEB_BUILD_ARCH\s0 := $(shell dpkg \-\-print\-architecture)
@@ -236,7 +236,7 @@ If you still wish to support versions of dpkg-dev that did not include
 ifeq ($(filter\-out hurd\-%,$(\s-1DEB_BUILD_ARCH\s0)),)
 ifeq ($(filter\-out hurd\-%,$(\s-1DEB_BUILD_ARCH\s0)),)
   \s-1DEB_BUILD_GNU_SYSTEM\s0 := gnu
   \s-1DEB_BUILD_GNU_SYSTEM\s0 := gnu
 else
 else
-  \s-1DEB_BUILD_GNU_SYSTEM\s0 := linux-gnu
+  \s-1DEB_BUILD_GNU_SYSTEM\s0 := linux\-gnu
 endif
 endif
 DEB_BUILD_GNU_TYPE=$(\s-1DEB_BUILD_GNU_CPU\s0)\-$(\s-1DEB_BUILD_GNU_SYSTEM\s0)
 DEB_BUILD_GNU_TYPE=$(\s-1DEB_BUILD_GNU_CPU\s0)\-$(\s-1DEB_BUILD_GNU_SYSTEM\s0)
 
 
@@ -247,7 +247,7 @@ DEB_BUILD_GNU_TYPE=$(\s-1DEB_BUILD_GNU_CPU\s0)\-$(\s-1DEB_BUILD_GNU_SYSTEM\s0)
 .fi
 .fi
 .PP
 .PP
 Put a subset of these lines at the top of your debian/rules file; these
 Put a subset of these lines at the top of your debian/rules file; these
-default values will be overwritten if dpkg-architecture is used.
+default values will be overwritten if dpkg\-architecture is used.
 .PP
 .PP
 You don't need the full set. Choose a consistent set which contains the
 You don't need the full set. Choose a consistent set which contains the
 values you use in the rules file. For example, if you only need the host
 values you use in the rules file. For example, if you only need the host
@@ -282,7 +282,7 @@ dpkg\-architecture \-ilinux\-any
 dpkg\-architecture \-ai386 \-ilinux\-any
 dpkg\-architecture \-ai386 \-ilinux\-any
 .
 .
 .SH FILES
 .SH FILES
-All these files have to be present for \fBdpkg-architecture\fP to
+All these files have to be present for \fBdpkg\-architecture\fP to
 work. Their location can be overridden at runtime with the environment
 work. Their location can be overridden at runtime with the environment
 variable \fBDPKG_DATADIR\fP.
 variable \fBDPKG_DATADIR\fP.
 .TP
 .TP

+ 4 - 4
man/dpkg-buildflags.1

@@ -1,4 +1,4 @@
-.TH dpkg\-buildflags 1 "2011-07-07" "Debian Project" "dpkg suite"
+.TH dpkg\-buildflags 1 "2011-08-14" "Debian Project" "dpkg suite"
 .SH NAME
 .SH NAME
 dpkg\-buildflags \- returns build flags to use during package build
 dpkg\-buildflags \- returns build flags to use during package build
 .
 .
@@ -97,8 +97,8 @@ Show the version and exit.
 .TP
 .TP
 .B CFLAGS
 .B CFLAGS
 Options for the C compiler. The default value set by the vendor
 Options for the C compiler. The default value set by the vendor
-includes \fI-g\fP and the default optimization level (\fI-O2\fP usually,
-or \fI-O0\fP if the \fBDEB_BUILD_OPTIONS\fP environment variable defines
+includes \fI\-g\fP and the default optimization level (\fI\-O2\fP usually,
+or \fI\-O0\fP if the \fBDEB_BUILD_OPTIONS\fP environment variable defines
 \fInoopt\fP).
 \fInoopt\fP).
 .TP
 .TP
 .B CPPFLAGS
 .B CPPFLAGS
@@ -113,7 +113,7 @@ Options for the Fortran compiler. Same as \fBCFLAGS\fP.
 .B LDFLAGS
 .B LDFLAGS
 Options passed to the compiler when linking executables or shared
 Options passed to the compiler when linking executables or shared
 objects (if the linker is called directly, then
 objects (if the linker is called directly, then
-.B -Wl
+.B \-Wl
 and
 and
 .B ,
 .B ,
 have to be stripped from these options). Default value: empty.
 have to be stripped from these options). Default value: empty.

+ 17 - 17
man/dpkg-buildpackage.1

@@ -1,4 +1,4 @@
-.TH dpkg\-buildpackage 1 "2011-07-04" "Debian Project" "dpkg utilities"
+.TH dpkg\-buildpackage 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 .SH NAME
 dpkg\-buildpackage \- build binary or source packages from sources
 dpkg\-buildpackage \- build binary or source packages from sources
 .
 .
@@ -23,7 +23,7 @@ option, it calls that target and stops here. Otherwise it calls
 \fBfakeroot debian/rules clean\fP to clean the build-tree (unless
 \fBfakeroot debian/rules clean\fP to clean the build-tree (unless
 \fB\-nc\fP is specified).
 \fB\-nc\fP is specified).
 .IP \fB4.\fP 3
 .IP \fB4.\fP 3
-It calls \fBdpkg-source \-b\fP to generate the source package (unless
+It calls \fBdpkg\-source \-b\fP to generate the source package (unless
 a binary\-only build has been requested with \fB\-b\fP, \fB\-B\fP or
 a binary\-only build has been requested with \fB\-b\fP, \fB\-B\fP or
 \fB\-A\fP).
 \fB\-A\fP).
 .IP \fB5.\fP 3
 .IP \fB5.\fP 3
@@ -31,15 +31,15 @@ It calls \fBdebian/rules\fP \fBbuild\fP followed by
 \fBfakeroot debian/rules\fP \fIbinary-target\fP (unless a source-only
 \fBfakeroot debian/rules\fP \fIbinary-target\fP (unless a source-only
 build has been requested with \fB\-S\fP). Note that \fIbinary-target\fR is
 build has been requested with \fB\-S\fP). Note that \fIbinary-target\fR is
 either \fBbinary\fP (default case, or if \fB\-b\fP is specified)
 either \fBbinary\fP (default case, or if \fB\-b\fP is specified)
-or \fBbinary-arch\fP (if \fB\-B\fP is specified) or \fBbinary-indep\fP
+or \fBbinary\-arch\fP (if \fB\-B\fP is specified) or \fBbinary\-indep\fP
 (if \fB\-A\fP is specified).
 (if \fB\-A\fP is specified).
 .IP \fB6.\fP 3
 .IP \fB6.\fP 3
 It calls \fBgpg\fP to sign the \fB.dsc\fP file (if any, unless
 It calls \fBgpg\fP to sign the \fB.dsc\fP file (if any, unless
 \fB\-us\fP is specified).
 \fB\-us\fP is specified).
 .IP \fB7.\fP 3
 .IP \fB7.\fP 3
-It calls \fBdpkg-genchanges\fP to generate a \fB.changes\fP file.
-Many \fBdpkg-buildpackage\fP options are forwarded to
-\fBdpkg-genchanges\fP.
+It calls \fBdpkg\-genchanges\fP to generate a \fB.changes\fP file.
+Many \fBdpkg\-buildpackage\fP options are forwarded to
+\fBdpkg\-genchanges\fP.
 .IP \fB8.\fP 3
 .IP \fB8.\fP 3
 It calls \fBgpg\fP to sign the \fB.changes\fP file (unless \fB\-uc\fP
 It calls \fBgpg\fP to sign the \fB.changes\fP file (unless \fB\-uc\fP
 is specified).
 is specified).
@@ -51,19 +51,19 @@ again. Finally it calls \fBdpkg\-source \-\-after\-build\fP.
 .TP
 .TP
 .B \-b
 .B \-b
 Specifies a binary-only build, no source files are to be built and/or
 Specifies a binary-only build, no source files are to be built and/or
-distributed. Passed to \fBdpkg-genchanges\fP.
+distributed. Passed to \fBdpkg\-genchanges\fP.
 .TP
 .TP
 .B \-B
 .B \-B
 Specifies a binary-only build, limited to architecture dependent packages.
 Specifies a binary-only build, limited to architecture dependent packages.
-Passed to \fBdpkg-genchanges\fP.
+Passed to \fBdpkg\-genchanges\fP.
 .TP
 .TP
 .B \-A
 .B \-A
 Specifies a binary-only build, limited to architecture independent
 Specifies a binary-only build, limited to architecture independent
-packages. Passed to \fBdpkg-genchanges\fP.
+packages. Passed to \fBdpkg\-genchanges\fP.
 .TP
 .TP
 .B \-S
 .B \-S
 Specifies a source-only build, no binary packages need to be made.
 Specifies a source-only build, no binary packages need to be made.
-Passed to \fBdpkg-genchanges\fP.
+Passed to \fBdpkg\-genchanges\fP.
 .TP
 .TP
 .B \-F
 .B \-F
 Specifies a normal full build, binary and source packages will be built.
 Specifies a normal full build, binary and source packages will be built.
@@ -100,7 +100,7 @@ run with root rights.
 .br
 .br
 .BI \-e maintaineraddress
 .BI \-e maintaineraddress
 .RS
 .RS
-Passed unchanged to \fBdpkg-genchanges\fP. See its manual page.
+Passed unchanged to \fBdpkg\-genchanges\fP. See its manual page.
 .RE
 .RE
 .TP
 .TP
 .BI \-a architecture
 .BI \-a architecture
@@ -122,7 +122,7 @@ invocations to inherit the option. Also adds \fBparallel=\fP\fIjobs\fP
 to the DEB_BUILD_OPTIONS environment variable which allows
 to the DEB_BUILD_OPTIONS environment variable which allows
 debian/rules files to use this information for their own purposes.
 debian/rules files to use this information for their own purposes.
 The \fBparallel=\fP\fIjobs\fP in DEB_BUILD_OPTIONS environment variable
 The \fBparallel=\fP\fIjobs\fP in DEB_BUILD_OPTIONS environment variable
-will override the \fB-j\fP value if this option is given.
+will override the \fB\-j\fP value if this option is given.
 .TP
 .TP
 .B \-D
 .B \-D
 Check build dependencies and conflicts; abort if unsatisfied. This is the
 Check build dependencies and conflicts; abort if unsatisfied. This is the
@@ -133,7 +133,7 @@ Do not check build dependencies and conflicts.
 .TP
 .TP
 .B \-nc
 .B \-nc
 Do not clean the source tree (implies \fB\-b\fP if nothing else has been
 Do not clean the source tree (implies \fB\-b\fP if nothing else has been
-selected among \fB-B\fP, \fB-A\fP or \fB-S\fP).
+selected among \fB\-B\fP, \fB\-A\fP or \fB\-S\fP).
 .TP
 .TP
 .B \-tc
 .B \-tc
 Clean the source tree (using
 Clean the source tree (using
@@ -173,7 +173,7 @@ possible to use another program invocation to build the package (it can
 include space separated parameters).
 include space separated parameters).
 Alternatively it can be used to execute the standard rules file with
 Alternatively it can be used to execute the standard rules file with
 another make program (for example by using
 another make program (for example by using
-.B /usr/local/bin/make -f debian/rules
+.B /usr/local/bin/make \-f debian/rules
 as \fIrules-file\fR).
 as \fIrules-file\fR).
 .TP
 .TP
 .BI \-p sign-command
 .BI \-p sign-command
@@ -208,10 +208,10 @@ Passed unchanged to \fBdpkg\-source\fP. See its manual page.
 .RE
 .RE
 .TP
 .TP
 .BI \-\-source\-option= opt
 .BI \-\-source\-option= opt
-Pass option \fIopt\fP to \fBdpkg-source\fP.
+Pass option \fIopt\fP to \fBdpkg\-source\fP.
 .TP
 .TP
 .BI \-\-changes\-option= opt
 .BI \-\-changes\-option= opt
-Pass option \fIopt\fP to \fBdpkg-genchanges\fP.
+Pass option \fIopt\fP to \fBdpkg\-genchanges\fP.
 .P
 .P
 .BI \-\-admindir= dir
 .BI \-\-admindir= dir
 .br
 .br
@@ -231,7 +231,7 @@ Show the version and exit.
 Even if \fBdpkg\-buildpackage\fP exports some variables, \fBdebian/rules\fP
 Even if \fBdpkg\-buildpackage\fP exports some variables, \fBdebian/rules\fP
 should not rely on their presence and should instead use the
 should not rely on their presence and should instead use the
 respective interface to retrieve the needed values.
 respective interface to retrieve the needed values.
-.SS Variables set by dpkg-architecture
+.SS Variables set by dpkg\-architecture
 \fBdpkg\-architecture\fP is called with the \fB\-a\fP and \fB\-t\fP
 \fBdpkg\-architecture\fP is called with the \fB\-a\fP and \fB\-t\fP
 parameters forwarded. Any variable that is output by its \fB\-s\fP
 parameters forwarded. Any variable that is output by its \fB\-s\fP
 option is integrated in the build environment.
 option is integrated in the build environment.

+ 2 - 2
man/dpkg-deb.1

@@ -1,4 +1,4 @@
-.TH dpkg\-deb 1 "2011-07-04" "Debian Project" "dpkg suite"
+.TH dpkg\-deb 1 "2011-08-14" "Debian Project" "dpkg suite"
 .SH NAME
 .SH NAME
 dpkg\-deb \- Debian package archive (.deb) manipulation tool
 dpkg\-deb \- Debian package archive (.deb) manipulation tool
 .
 .
@@ -190,7 +190,7 @@ produced using
 on the same package. A complete explanation of the formatting options
 on the same package. A complete explanation of the formatting options
 (including escape sequences and field tabbing) can be found in the
 (including escape sequences and field tabbing) can be found in the
 explanation of the \fB\-\-showformat\fP option in
 explanation of the \fB\-\-showformat\fP option in
-.BR dpkg-query (1).
+.BR dpkg\-query (1).
 
 
 The default for this field is "${Package}\\t${Version}\\n".
 The default for this field is "${Package}\\t${Version}\\n".
 .TP
 .TP

+ 5 - 5
man/dpkg-divert.8

@@ -1,4 +1,4 @@
-.TH dpkg\-divert 8 "2011-07-04" "Debian Project" "dpkg utilities"
+.TH dpkg\-divert 8 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 .SH NAME
 dpkg\-divert \- override a package's version of a file
 dpkg\-divert \- override a package's version of a file
 .
 .
@@ -93,21 +93,21 @@ To divert all copies of a \fI/usr/bin/example\fR to \fI/usr/bin/example.foo\fR,
 i.e. directs all packages providing \fI/usr/bin/example\fR to install it as
 i.e. directs all packages providing \fI/usr/bin/example\fR to install it as
 \fI/usr/bin/example.foo\fR, performing the rename if required:
 \fI/usr/bin/example.foo\fR, performing the rename if required:
 .HP
 .HP
-dpkg-divert \-\-divert /usr/bin/example.foo \-\-rename /usr/bin/example
+dpkg\-divert \-\-divert /usr/bin/example.foo \-\-rename /usr/bin/example
 .PP
 .PP
 To remove that diversion:
 To remove that diversion:
 .HP
 .HP
-dpkg-divert \-\-rename \-\-remove /usr/bin/example
+dpkg\-divert \-\-rename \-\-remove /usr/bin/example
 
 
 .PP
 .PP
 To divert any package trying to install \fI/usr/bin/example\fR to
 To divert any package trying to install \fI/usr/bin/example\fR to
 \fI/usr/bin/example.foo\fR, except your own \fIwibble\fR package:
 \fI/usr/bin/example.foo\fR, except your own \fIwibble\fR package:
 .HP
 .HP
-dpkg-divert \-\-package wibble \-\-divert /usr/bin/example.foo \-\-rename /usr/bin/example
+dpkg\-divert \-\-package wibble \-\-divert /usr/bin/example.foo \-\-rename /usr/bin/example
 .PP
 .PP
 To remove that diversion:
 To remove that diversion:
 .HP
 .HP
-dpkg-divert \-\-package wibble \-\-rename \-\-remove /usr/bin/example
+dpkg\-divert \-\-package wibble \-\-rename \-\-remove /usr/bin/example
 .
 .
 .SH ENVIRONMENT
 .SH ENVIRONMENT
 .TP
 .TP

+ 2 - 2
man/dpkg-genchanges.1

@@ -1,4 +1,4 @@
-.TH dpkg\-genchanges 1 "2011-07-04" "Debian Project" "dpkg utilities"
+.TH dpkg\-genchanges 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 .SH NAME
 dpkg\-genchanges \- generate Debian .changes files
 dpkg\-genchanges \- generate Debian .changes files
 .
 .
@@ -29,7 +29,7 @@ target(s) of the package being built.
 Specifies that only the source should be uploaded (no binary packages
 Specifies that only the source should be uploaded (no binary packages
 will be included).
 will be included).
 .PP
 .PP
-The \fB-s\fP\fIx\fP options control whether the original source archive is
+The \fB\-s\fP\fIx\fP options control whether the original source archive is
 included in the upload if any source is being generated (i.e.
 included in the upload if any source is being generated (i.e.
 .BR \-b " or " \-B
 .BR \-b " or " \-B
 haven't been used).
 haven't been used).

+ 4 - 4
man/dpkg-gencontrol.1

@@ -1,4 +1,4 @@
-.TH dpkg\-gencontrol 1 "2011-07-04" "Debian Project" "dpkg utilities"
+.TH dpkg\-gencontrol 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 .SH NAME
 dpkg\-gencontrol \- generate Debian control files
 dpkg\-gencontrol \- generate Debian control files
 .
 .
@@ -13,7 +13,7 @@ binary package control file (which defaults to debian/tmp/DEBIAN/control);
 during this process it will simplify the relation fields.
 during this process it will simplify the relation fields.
 .sp
 .sp
 Thus
 Thus
-.IR Pre-Depends ", " Depends ", " Recommends " and " Suggests
+.IR Pre\-Depends ", " Depends ", " Recommends " and " Suggests
 are simplified in this
 are simplified in this
 order by removing dependencies which are known to be true according to the
 order by removing dependencies which are known to be true according to the
 stronger dependencies already parsed. It will also remove any self-dependency
 stronger dependencies already parsed. It will also remove any self-dependency
@@ -90,8 +90,8 @@ instead of the normal package_version_arch.deb filename.
 .TP
 .TP
 .BR \-is ", " \-ip ", " \-isp
 .BR \-is ", " \-ip ", " \-isp
 These options are ignored for compatibility with older versions of
 These options are ignored for compatibility with older versions of
-dpkg-dev but are now deprecated. Previously they were used to tell
-dpkg-gencontrol to include the Section and Priority fields in the
+dpkg\-dev but are now deprecated. Previously they were used to tell
+dpkg\-gencontrol to include the Section and Priority fields in the
 control file. This is now the default behaviour. If you want to
 control file. This is now the default behaviour. If you want to
 get the old behaviour you can use the
 get the old behaviour you can use the
 .B \-U
 .B \-U

+ 10 - 10
man/dpkg-gensymbols.1

@@ -1,5 +1,5 @@
 .\" Author: Raphaël Hertzog
 .\" Author: Raphaël Hertzog
-.TH dpkg\-gensymbols 1 "2011-07-04" "Debian Project" "dpkg utilities"
+.TH dpkg\-gensymbols 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 .SH NAME
 dpkg\-gensymbols \- generate symbols files (shared library dependency information)
 dpkg\-gensymbols \- generate symbols files (shared library dependency information)
 .
 .
@@ -147,12 +147,12 @@ from foreign arches) are always written to the symbol file when operating
 in template mode.
 in template mode.
 
 
 The format of \fIarchitecture list\fR is the same as the one used in the
 The format of \fIarchitecture list\fR is the same as the one used in the
-\fIBuild-Depends\fR field of \fIdebian/control\fR (except the enclosing
+\fIBuild\-Depends\fR field of \fIdebian/control\fR (except the enclosing
 square brackets []). For example, the first symbol from the list below
 square brackets []). For example, the first symbol from the list below
-will be considered only on alpha, amd64, kfreebsd-amd64 and ia64 architectures
+will be considered only on alpha, amd64, kfreebsd\-amd64 and ia64 architectures
 while the second one anywhere except on armel.
 while the second one anywhere except on armel.
 
 
- (arch=alpha amd64 kfreebsd-amd64 ia64)a_64bit_specific_symbol@Base 1.0
+ (arch=alpha amd64 kfreebsd\-amd64 ia64)a_64bit_specific_symbol@Base 1.0
  (arch=!armel)symbol_armel_does_not_have@Base 1.0
  (arch=!armel)symbol_armel_does_not_have@Base 1.0
 .TP
 .TP
 .B ignore\-blacklist
 .B ignore\-blacklist
@@ -177,14 +177,14 @@ below.
 .SS Using symbol patterns
 .SS Using symbol patterns
 .P
 .P
 Unlike a standard symbol specification, a pattern may cover multiple real
 Unlike a standard symbol specification, a pattern may cover multiple real
-symbols from the library. \fBdpkg-gensymbols\fR will attempt to match each
+symbols from the library. \fBdpkg\-gensymbols\fR will attempt to match each
 pattern against each real symbol that does \fInot\fR have a specific symbol
 pattern against each real symbol that does \fInot\fR have a specific symbol
 counterpart defined in the symbol file. Whenever the first matching pattern is
 counterpart defined in the symbol file. Whenever the first matching pattern is
 found, all its tags and properties will be used as a basis specification of the
 found, all its tags and properties will be used as a basis specification of the
 symbol. If none of the patterns matches, the symbol will be considered as new.
 symbol. If none of the patterns matches, the symbol will be considered as new.
 
 
 A pattern is considered lost if it does not match any symbol in the library. By
 A pattern is considered lost if it does not match any symbol in the library. By
-default this will trigger a \fBdpkg-gensymbols\fR failure under \fI-c1\fR or
+default this will trigger a \fBdpkg\-gensymbols\fR failure under \fI\-c1\fR or
 higher level. However, if the failure is undesired, the pattern may be marked
 higher level. However, if the failure is undesired, the pattern may be marked
 with the \fIoptional\fR tag. Then if the pattern does not match anything, it
 with the \fIoptional\fR tag. Then if the pattern does not match anything, it
 will only appear in the diff as MISSING. Moreover, like any symbol, the pattern
 will only appear in the diff as MISSING. Moreover, like any symbol, the pattern
@@ -205,7 +205,7 @@ This pattern is denoted by the \fIc++\fR tag. It matches only C++ symbols by
 their demangled symbol name (as emitted by \fBc++filt\fR(1) utility). This
 their demangled symbol name (as emitted by \fBc++filt\fR(1) utility). This
 pattern is very handy for matching symbols which mangled names might vary
 pattern is very handy for matching symbols which mangled names might vary
 across different architectures while their demangled names remain the same. One
 across different architectures while their demangled names remain the same. One
-group of such symbols is \fInon-virtual thunks\fR which have architecture
+group of such symbols is \fInon\-virtual thunks\fR which have architecture
 specific offsets embedded in their mangled names. A common instance of this
 specific offsets embedded in their mangled names. A common instance of this
 case is a virtual destructor which under diamond inheritance needs a
 case is a virtual destructor which under diamond inheritance needs a
 non-virtual thunk symbol. For example, even if _ZThn8_N3NSB6ClassDD1Ev@Base on
 non-virtual thunk symbol. For example, even if _ZThn8_N3NSB6ClassDD1Ev@Base on
@@ -215,7 +215,7 @@ ones, it can be matched with a single \fIc++\fR pattern:
 .PP
 .PP
 libdummy.so.1 libdummy1 #MINVER#
 libdummy.so.1 libdummy1 #MINVER#
  [...]
  [...]
- (c++)"non-virtual thunk to NSB::ClassD::~ClassD()@Base" 1.0
+ (c++)"non\-virtual thunk to NSB::ClassD::~ClassD()@Base" 1.0
  [...]
  [...]
 .P
 .P
 The demangled name above can be obtained by executing the following command:
 The demangled name above can be obtained by executing the following command:
@@ -301,7 +301,7 @@ When multiple patterns match the same real symbol, aliases (first \fIc++\fR,
 then \fIsymver\fR) are preferred over generic patterns. Generic patterns are
 then \fIsymver\fR) are preferred over generic patterns. Generic patterns are
 matched in the order they are found in the symbol file template until the first
 matched in the order they are found in the symbol file template until the first
 success.  Please note, however, that manual reordering of template file entries
 success.  Please note, however, that manual reordering of template file entries
-is not recommended because \fBdpkg-gensymbols\fR generates diffs based on the
+is not recommended because \fBdpkg\-gensymbols\fR generates diffs based on the
 alphanumerical order of their names.
 alphanumerical order of their names.
 .SS Using includes
 .SS Using includes
 .P
 .P
@@ -448,7 +448,7 @@ Show the usage message and exit.
 Show the version and exit.
 Show the version and exit.
 .
 .
 .SH "SEE ALSO"
 .SH "SEE ALSO"
-.BR http://people.redhat.com/drepper/symbol-versioning
+.BR http://people.redhat.com/drepper/symbol\-versioning
 .br
 .br
 .BR http://people.redhat.com/drepper/goodpractice.pdf
 .BR http://people.redhat.com/drepper/goodpractice.pdf
 .br
 .br

+ 4 - 4
man/dpkg-maintscript-helper.1

@@ -1,4 +1,4 @@
-.TH dpkg\-maintscript\-helper 1 "2011-07-04" "Debian Project" "dpkg suite"
+.TH dpkg\-maintscript\-helper 1 "2011-08-14" "Debian Project" "dpkg suite"
 .SH NAME
 .SH NAME
 dpkg\-maintscript\-helper \- works around known dpkg limitations in maintainer scripts
 dpkg\-maintscript\-helper \- works around known dpkg limitations in maintainer scripts
 .
 .
@@ -114,15 +114,15 @@ required version of dpkg has been unpacked before. The required version
 depends on the command used, for \fBrm_conffile\fP and \fBmv_conffile\fP
 depends on the command used, for \fBrm_conffile\fP and \fBmv_conffile\fP
 it is 1.15.7.2:
 it is 1.15.7.2:
 .P
 .P
-    \fBPre-Depends:\fP dpkg (>= 1.15.7.2)
+    \fBPre\-Depends:\fP dpkg (>= 1.15.7.2)
 .P
 .P
 But in many cases the operation done by the program is not critical for
 But in many cases the operation done by the program is not critical for
 the package, and instead of using a pre-dependency we can call the
 the package, and instead of using a pre-dependency we can call the
 program only if we know that the required command is supported by
 program only if we know that the required command is supported by
 the currently installed dpkg:
 the currently installed dpkg:
 .P
 .P
-    if dpkg-maintscript-helper supports \fIcommand\fP; then
-        dpkg-maintscript-helper \fIcommand\fP ...
+    if dpkg\-maintscript\-helper supports \fIcommand\fP; then
+        dpkg\-maintscript\-helper \fIcommand\fP ...
     fi
     fi
 .
 .
 .SH AUTHORS
 .SH AUTHORS

+ 7 - 7
man/dpkg-mergechangelogs.1

@@ -1,10 +1,10 @@
-.TH dpkg\-mergechangelogs 1 "2010-04-18" "Debian Project" "dpkg suite"
+.TH dpkg\-mergechangelogs 1 "2011-08-14" "Debian Project" "dpkg suite"
 .SH NAME
 .SH NAME
 dpkg\-mergechangelogs \- 3-way merge of debian/changelog files
 dpkg\-mergechangelogs \- 3-way merge of debian/changelog files
 .
 .
 .SH SYNOPSIS
 .SH SYNOPSIS
 .B dpkg\-mergechangelogs
 .B dpkg\-mergechangelogs
-.RI [ option "...] " old " " new\-a " " new\-b " [" out ]
+.RI [ option "...] " old " " new-a " " new-b " [" out ]
 .
 .
 .SH DESCRIPTION
 .SH DESCRIPTION
 .P
 .P
@@ -17,23 +17,23 @@ Each entry is identified by its version number and they are assumed to
 be not conflicting, they are simply merged in the right order (by
 be not conflicting, they are simply merged in the right order (by
 decreasing version number). When \fB\-\-merge\-prereleases\fP is used, the
 decreasing version number). When \fB\-\-merge\-prereleases\fP is used, the
 part of the version number after the last tilde is dropped so that
 part of the version number after the last tilde is dropped so that
-1.0-1~exp1 and 1.0-1~exp5 are considered to be the same entry. When the
-same version is available in both \fInew\-a\fP and \fInew\-b\fP, a standard
+1.0\-1~exp1 and 1.0\-1~exp5 are considered to be the same entry. When the
+same version is available in both \fInew-a\fP and \fInew-b\fP, a standard
 line-based 3-way merge is attempted (provided that the module
 line-based 3-way merge is attempted (provided that the module
 Algorithm::Merge is available \[em] it's part of the package
 Algorithm::Merge is available \[em] it's part of the package
-libalgorithm-merge-perl \[em] otherwise you get a global conflict on the
+libalgorithm\-merge\-perl \[em] otherwise you get a global conflict on the
 content of the entry).
 content of the entry).
 .
 .
 .SH OPTIONS
 .SH OPTIONS
 .TP
 .TP
-.BR \-\-merge-prereleases ", " \-m
+.BR \-\-merge\-prereleases ", " \-m
 Drop the part after the last tilde in the version number when doing
 Drop the part after the last tilde in the version number when doing
 version comparison to identify if two entries are supposed to be
 version comparison to identify if two entries are supposed to be
 the same or not.
 the same or not.
 .sp
 .sp
 This is useful when you keep using the same changelog entry but you
 This is useful when you keep using the same changelog entry but you
 increase its version number regularly. For instance, you might have
 increase its version number regularly. For instance, you might have
-2.3-1~exp1, 2.3-1~exp2, ... until the official release 2.3-1 and they
+2.3\-1~exp1, 2.3\-1~exp2, ... until the official release 2.3\-1 and they
 are all the same changelog entry that has evolved over time.
 are all the same changelog entry that has evolved over time.
 .TP
 .TP
 .B \-\-help
 .B \-\-help

+ 3 - 3
man/dpkg-name.1

@@ -3,7 +3,7 @@
 .\"
 .\"
 .\" This is free software; see the GNU General Public Licence version 2
 .\" This is free software; see the GNU General Public Licence version 2
 .\" or later for copying conditions.  There is NO warranty.
 .\" or later for copying conditions.  There is NO warranty.
-.TH dpkg\-name 1 "2011-07-04" "Debian Project" "dpkg utilities"
+.TH dpkg\-name 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 .SH NAME
 dpkg\-name \- rename Debian packages to full package names
 dpkg\-name \- rename Debian packages to full package names
 .
 .
@@ -45,8 +45,8 @@ the files will be moved into that directory otherwise the name of
 the target directory is extracted from the section field in the
 the target directory is extracted from the section field in the
 control part of the package. The target directory will be
 control part of the package. The target directory will be
 `unstable/binary\-\fIarchitecture\fP/\fIsection\fP'. If the section is
 `unstable/binary\-\fIarchitecture\fP/\fIsection\fP'. If the section is
-not found in the control, then `no-section' is assumed, and in this case,
-as well as for sections `non-free' and `contrib' the target directory is
+not found in the control, then `no\-section' is assumed, and in this case,
+as well as for sections `non\-free' and `contrib' the target directory is
 `\fIsection\fP/binary\-\fIarchitecture\fP'. The section field isn't required
 `\fIsection\fP/binary\-\fIarchitecture\fP'. The section field isn't required
 so a lot of packages will find their way to the `no\-section' area. Use
 so a lot of packages will find their way to the `no\-section' area. Use
 this option with care, it's messy.
 this option with care, it's messy.

+ 2 - 2
man/dpkg-parsechangelog.1

@@ -1,4 +1,4 @@
-.TH dpkg\-parsechangelog 1 "2011-07-04" "Debian Project" "dpkg utilities"
+.TH dpkg\-parsechangelog 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 .SH NAME
 dpkg\-parsechangelog \- parse Debian changelog files
 dpkg\-parsechangelog \- parse Debian changelog files
 .
 .
@@ -47,7 +47,7 @@ Set the output format. Currently supported values are
 .IR dpkg " and " rfc822 .
 .IR dpkg " and " rfc822 .
 \fIdpkg\fP is the classic output format (from before this
 \fIdpkg\fP is the classic output format (from before this
 option existed) and the default. It consists of one paragraph
 option existed) and the default. It consists of one paragraph
-in Debian control format (see \fBdeb-control\fP(5)). If more
+in Debian control format (see \fBdeb\-control\fP(5)). If more
 than one entry is requested, then most fields are taken from the
 than one entry is requested, then most fields are taken from the
 latest entry, except otherwise stated:
 latest entry, except otherwise stated:
 .RS
 .RS

+ 3 - 3
man/dpkg-query.1

@@ -1,4 +1,4 @@
-.TH dpkg\-query 1 "2011-07-04" "Debian Project" "dpkg suite"
+.TH dpkg\-query 1 "2011-08-14" "Debian Project" "dpkg suite"
 .SH NAME
 .SH NAME
 dpkg\-query \- a tool to query the dpkg database
 dpkg\-query \- a tool to query the dpkg database
 .
 .
@@ -176,8 +176,8 @@ fields or fields stored in the binary package end up in it):
     \fBStatus\fP (internal)
     \fBStatus\fP (internal)
     \fBSuggests\fP
     \fBSuggests\fP
     \fBTag\fP (usually not in the .deb but in the repository Packages files)
     \fBTag\fP (usually not in the .deb but in the repository Packages files)
-    \fBTriggers-Awaited\fP (internal)
-    \fBTriggers-Pending\fP (internal)
+    \fBTriggers\-Awaited\fP (internal)
+    \fBTriggers\-Pending\fP (internal)
     \fBVersion\fP
     \fBVersion\fP
 .fi
 .fi
 
 

+ 4 - 4
man/dpkg-scanpackages.1

@@ -12,7 +12,7 @@
 .\"
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" You should have received a copy of the GNU General Public License
 .\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
 .\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
-.TH dpkg\-scanpackages 1 "2011-07-04" "Debian Project" "dpkg utilities"
+.TH dpkg\-scanpackages 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 .SH NAME
 dpkg\-scanpackages \- create Packages index files
 dpkg\-scanpackages \- create Packages index files
 .
 .
@@ -74,7 +74,7 @@ differ in architecture only the first one found is used.
 Scan for *.\fItype\fP packages, instead of *.deb.
 Scan for *.\fItype\fP packages, instead of *.deb.
 .TP
 .TP
 .BR \-u ", " \-\-udeb
 .BR \-u ", " \-\-udeb
-\fBObsolete\fP alias for \fB-tudeb\fP.
+\fBObsolete\fP alias for \fB\-tudeb\fP.
 .TP
 .TP
 .BR \-e ", " \-\-extra\-override " \fIfile\fP"
 .BR \-e ", " \-\-extra\-override " \fIfile\fP"
 Scan \fIfile\fP to find supplementary overrides (the file can be
 Scan \fIfile\fP to find supplementary overrides (the file can be
@@ -89,8 +89,8 @@ scanning for all debs.
 .BR \-m ", " \-\-multiversion
 .BR \-m ", " \-\-multiversion
 Include all found packages in the output.
 Include all found packages in the output.
 .TP
 .TP
-.BR \-M ", " \-\-medium " \fIid\-string\fP"
-Add an X-Medium field containing the value \fIid\-string\fP. This field
+.BR \-M ", " \-\-medium " \fIid-string\fP"
+Add an X\-Medium field containing the value \fIid-string\fP. This field
 is required if you want to generate \fBPackages.cd\fP files for use
 is required if you want to generate \fBPackages.cd\fP files for use
 by the multicd access method of dselect.
 by the multicd access method of dselect.
 .TP
 .TP

+ 3 - 3
man/dpkg-scansources.1

@@ -1,4 +1,4 @@
-.TH dpkg\-scansources 1 "2011-07-04" "Debian Project" "dpkg utilities"
+.TH dpkg\-scansources 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 .SH NAME
 dpkg\-scansources \- create Sources index files
 dpkg\-scansources \- create Sources index files
 .
 .
@@ -11,14 +11,14 @@ dpkg\-scansources \- create Sources index files
 .I Sources
 .I Sources
 .
 .
 .SH DESCRIPTION
 .SH DESCRIPTION
-\fBdpkg-scansources\fR scans the given \fIbinary-dir\fR for \fI.dsc\fR files.
+\fBdpkg\-scansources\fR scans the given \fIbinary-dir\fR for \fI.dsc\fR files.
 These are used to create a Debian source index, which is output to
 These are used to create a Debian source index, which is output to
 stdout.
 stdout.
 .PP
 .PP
 The \fIoverride-file\fR, if given, is used to set priorities in the resulting
 The \fIoverride-file\fR, if given, is used to set priorities in the resulting
 index records and to override the maintainer field given in the \fI.dsc\fR
 index records and to override the maintainer field given in the \fI.dsc\fR
 files. The file can be compressed. See
 files. The file can be compressed. See
-.BR deb-override (5)
+.BR deb\-override (5)
 for the format of this file. \s-1NB:\s0  Since
 for the format of this file. \s-1NB:\s0  Since
 the override file is indexed by binary, not source, packages, there's a bit
 the override file is indexed by binary, not source, packages, there's a bit
 of a problem here. The current implementation uses the highest priority of
 of a problem here. The current implementation uses the highest priority of

+ 16 - 16
man/dpkg-shlibdeps.1

@@ -1,4 +1,4 @@
-.TH dpkg\-shlibdeps 1 "2011-07-04" "Debian Project" "dpkg utilities"
+.TH dpkg\-shlibdeps 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 .SH NAME
 dpkg\-shlibdeps \- generate shared library substvar dependencies
 dpkg\-shlibdeps \- generate shared library substvar dependencies
 .
 .
@@ -40,7 +40,7 @@ by the library package and should thus be available as
 or /var/lib/dpkg/info/\fIpackage\fR.\fIshlibs\fR. The package name is
 or /var/lib/dpkg/info/\fIpackage\fR.\fIshlibs\fR. The package name is
 identified in two steps: find the library file on the system (looking in
 identified in two steps: find the library file on the system (looking in
 the same directories that \fBld.so\fR would use), then use
 the same directories that \fBld.so\fR would use), then use
-.BI "dpkg -S " library\-file
+.BI "dpkg \-S " library-file
 to lookup the package providing the library.
 to lookup the package providing the library.
 .SS Symbols files
 .SS Symbols files
 Symbols files contain finer-grained dependency information by providing
 Symbols files contain finer-grained dependency information by providing
@@ -59,8 +59,8 @@ other binary packages.
 .IP /etc/dpkg/symbols/\fIpackage\fR.symbols
 .IP /etc/dpkg/symbols/\fIpackage\fR.symbols
 Per-system overriding shared library dependency information.
 Per-system overriding shared library dependency information.
 \fIarch\fR is the architecture of the current system (obtained by
 \fIarch\fR is the architecture of the current system (obtained by
-.BR "dpkg-architecture -qDEB_HOST_ARCH" ).
-.IP "Output from \(lq\fBdpkg-query \-\-control\-path\fR \fIpackage\fR symbols\(rq"
+.BR "dpkg\-architecture \-qDEB_HOST_ARCH" ).
+.IP "Output from \(lq\fBdpkg\-query \-\-control\-path\fR \fIpackage\fR symbols\(rq"
 Package-provided shared library dependency information.
 Package-provided shared library dependency information.
 Unless overridden by \-\-admindir, those files are located in /var/lib/dpkg.
 Unless overridden by \-\-admindir, those files are located in /var/lib/dpkg.
 .P 
 .P 
@@ -72,10 +72,10 @@ library used (provided that the information of the \fIsymbols\fR files are
 accurate).
 accurate).
 .P
 .P
 As a safe-guard measure, a symbols file can provide a
 As a safe-guard measure, a symbols file can provide a
-\fIBuild-Depends-Package\fR meta-information field and
-.B dpkg-shlibdeps
+\fIBuild\-Depends\-Package\fR meta-information field and
+.B dpkg\-shlibdeps
 will extract the minimal version required by the corresponding package in
 will extract the minimal version required by the corresponding package in
-the Build-Depends field and use this version if it's higher than the
+the Build\-Depends field and use this version if it's higher than the
 minimal version computed by scanning symbols.
 minimal version computed by scanning symbols.
 .SS Shlibs files
 .SS Shlibs files
 Shlibs files associate directly a library to a dependency (without looking
 Shlibs files associate directly a library to a dependency (without looking
@@ -94,7 +94,7 @@ Shared library information generated by the current build process that also invo
 They are only used if the library is found in a package's build tree. The
 They are only used if the library is found in a package's build tree. The
 shlibs file in that build tree takes precedence over shlibs files from
 shlibs file in that build tree takes precedence over shlibs files from
 other binary packages.
 other binary packages.
-.IP "Output from \(lq\fBdpkg-query \-\-control\-path\fP \fIpackage\fR shlibs\(rq"
+.IP "Output from \(lq\fBdpkg\-query \-\-control\-path\fP \fIpackage\fR shlibs\(rq"
 Package-provided shared library dependency information.
 Package-provided shared library dependency information.
 Unless overridden by \-\-admindir, those files are located in /var/lib/dpkg.
 Unless overridden by \-\-admindir, those files are located in /var/lib/dpkg.
 .IP /etc/dpkg/shlibs.default
 .IP /etc/dpkg/shlibs.default
@@ -231,8 +231,8 @@ here are the various warnings that you can encounter:
 .BI symbol " sym" " used by " binary " found in none of the libraries."
 .BI symbol " sym" " used by " binary " found in none of the libraries."
 The indicated symbol has not been found in the libraries linked with the
 The indicated symbol has not been found in the libraries linked with the
 binary. The \fIbinary\fR is most likely a library and it needs to be linked
 binary. The \fIbinary\fR is most likely a library and it needs to be linked
-with an additional library during the build process (option \fB-l\fR\fIlibrary\fR
-of the linker).
+with an additional library during the build process (option
+\fB\-l\fR\fIlibrary\fR of the linker).
 .TP
 .TP
 .IB binary " contains an unresolvable reference to symbol " sym ": it's probably a plugin
 .IB binary " contains an unresolvable reference to symbol " sym ": it's probably a plugin
 The indicated symbol has not been found in the libraries linked with the
 The indicated symbol has not been found in the libraries linked with the
@@ -267,8 +267,8 @@ symbols file). A public library has a SONAME and is versioned
 (libsomething.so.\fIX\fR). A private library (like a plugin) should not
 (libsomething.so.\fIX\fR). A private library (like a plugin) should not
 have a SONAME and doesn't need to be versioned.
 have a SONAME and doesn't need to be versioned.
 .TP
 .TP
-.BI "couldn't find library " library\-soname " needed by " binary " (its RPATH is '" rpath "')"
-The \fIbinary\fR uses a library called \fIlibrary\-soname\fR but
+.BI "couldn't find library " library-soname " needed by " binary " (its RPATH is '" rpath "')"
+The \fIbinary\fR uses a library called \fIlibrary-soname\fR but
 .B dpkg\-shlibdeps
 .B dpkg\-shlibdeps
 has been unable to find the library.
 has been unable to find the library.
 .B dpkg\-shlibdeps
 .B dpkg\-shlibdeps
@@ -278,7 +278,7 @@ directories listed in the LD_LIBRARY_PATH environment variable, and
 standard public directories (/lib, /usr/lib, /lib32, /usr/lib32, /lib64,
 standard public directories (/lib, /usr/lib, /lib32, /usr/lib32, /lib64,
 /usr/lib64). Then it checks those directories in the package's build tree
 /usr/lib64). Then it checks those directories in the package's build tree
 of the binary being analyzed, in the packages's build trees indicated with
 of the binary being analyzed, in the packages's build trees indicated with
-the \-S command\-line option, in other packages's build trees that contains
+the \-S command-line option, in other packages's build trees that contains
 a DEBIAN/shlibs or DEBIAN/symbols file and finally in the root directory.
 a DEBIAN/shlibs or DEBIAN/symbols file and finally in the root directory.
 If the library is not found in any of those directories, then you get this
 If the library is not found in any of those directories, then you get this
 error.
 error.
@@ -289,15 +289,15 @@ binary package being built, you want to make sure that the shlibs/symbols
 file of this package is already created and that LD_LIBRARY_PATH
 file of this package is already created and that LD_LIBRARY_PATH
 contains the appropriate directory if it also is in a private directory.
 contains the appropriate directory if it also is in a private directory.
 .TP
 .TP
-.BI "no dependency information found for " library\-file " (used by " binary ")."
+.BI "no dependency information found for " library-file " (used by " binary ")."
 The library needed by \fIbinary\fR has been found by
 The library needed by \fIbinary\fR has been found by
 .B dpkg\-shlibdeps
 .B dpkg\-shlibdeps
-in \fIlibrary\-file\fR but
+in \fIlibrary-file\fR but
 .B dpkg\-shlibdeps
 .B dpkg\-shlibdeps
 has been unable to find any dependency information for that library. To
 has been unable to find any dependency information for that library. To
 find out the dependency, it has tried to map the library to a Debian
 find out the dependency, it has tried to map the library to a Debian
 package with the help of
 package with the help of
-.BI "dpkg -S " library\-file\fR.
+.BI "dpkg \-S " library-file\fR.
 Then it checked the corresponding shlibs and symbols files in
 Then it checked the corresponding shlibs and symbols files in
 /var/lib/dpkg/info/, and in the various package's build trees
 /var/lib/dpkg/info/, and in the various package's build trees
 (debian/*/DEBIAN/).
 (debian/*/DEBIAN/).

+ 39 - 39
man/dpkg-source.1

@@ -1,5 +1,5 @@
 .\" Authors: Ian Jackson, Raphaël Hertzog
 .\" Authors: Ian Jackson, Raphaël Hertzog
-.TH dpkg\-source 1 "2011-07-12" "Debian Project" "dpkg utilities"
+.TH dpkg\-source 1 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 .SH NAME
 dpkg\-source \- Debian source package (.dsc) manipulation tool
 dpkg\-source \- Debian source package (.dsc) manipulation tool
 .
 .
@@ -147,7 +147,7 @@ Note that this option will not cause existing tarballs to be recompressed,
 it only affects new files. Supported values are:
 it only affects new files. Supported values are:
 .IR gzip ", " bzip2 ", " lzma " and " xz .
 .IR gzip ", " bzip2 ", " lzma " and " xz .
 \fIgzip\fP is the default. \fIxz\fP is only supported since
 \fIgzip\fP is the default. \fIxz\fP is only supported since
-dpkg-dev 1.15.5.
+dpkg\-dev 1.15.5.
 .TP
 .TP
 .BR \-z "\fIlevel\fP, " \-\-compression\-level =\fIlevel\fP
 .BR \-z "\fIlevel\fP, " \-\-compression\-level =\fIlevel\fP
 Compression level to use. As with \fB\-Z\fP it only affects newly created
 Compression level to use. As with \fB\-Z\fP it only affects newly created
@@ -199,10 +199,10 @@ control systems, backup and swap files and Libtool build output
 directories.
 directories.
 .PP
 .PP
 .B Note:
 .B Note:
-While they have similar purposes, \fB-i\fP and \fB-I\fP have very
-different syntax and semantics. \fB-i\fP can only be specified once and
+While they have similar purposes, \fB\-i\fP and \fB\-I\fP have very
+different syntax and semantics. \fB\-i\fP can only be specified once and
 takes a perl compatible regular expression which is matched against
 takes a perl compatible regular expression which is matched against
-the full relative path of each file. \fB-I\fP can specified
+the full relative path of each file. \fB\-I\fP can specified
 multiple times and takes a filename pattern with shell wildcards.
 multiple times and takes a filename pattern with shell wildcards.
 The pattern is applied to the full relative path but also
 The pattern is applied to the full relative path but also
 to each part of the path individually. The exact semantic of tar's
 to each part of the path individually. The exact semantic of tar's
@@ -225,8 +225,8 @@ Refuse to unpack the source package if it doesn't contain an OpenPGP
 signature that can be verified either with the user's
 signature that can be verified either with the user's
 \fItrustedkeys.gpg\fP keyring, one of the vendor-specific keyrings, or one
 \fItrustedkeys.gpg\fP keyring, one of the vendor-specific keyrings, or one
 of the official Debian keyrings
 of the official Debian keyrings
-(\fI/usr/share/keyrings/debian-keyring.gpg\fP
-and \fI/usr/share/keyrings/debian-maintainers.gpg\fP).
+(\fI/usr/share/keyrings/debian\-keyring.gpg\fP
+and \fI/usr/share/keyrings/debian\-maintainers.gpg\fP).
 
 
 .SH SOURCE PACKAGE FORMATS
 .SH SOURCE PACKAGE FORMATS
 If you don't know what source format to use, you should probably pick
 If you don't know what source format to use, you should probably pick
@@ -308,7 +308,7 @@ but will remove that directory after it has been used.
 .TP
 .TP
 .B \-ss
 .B \-ss
 Specifies that the original source is available both as a directory
 Specifies that the original source is available both as a directory
-and as a tarfile. dpkg-source will use the directory to create the diff, but
+and as a tarfile. dpkg\-source will use the directory to create the diff, but
 the tarfile to create the
 the tarfile to create the
 .BR .dsc .
 .BR .dsc .
 This option must be used with care - if the directory and tarfile do
 This option must be used with care - if the directory and tarfile do
@@ -390,22 +390,22 @@ except that it doesn't use an explicit list of patches. All files in
 must be valid patches: they are applied at extraction time.
 must be valid patches: they are applied at extraction time.
 
 
 When building a new source package, any change to the upstream source
 When building a new source package, any change to the upstream source
-is stored in a patch named \fBzz_debian-diff-auto\fP.
+is stored in a patch named \fBzz_debian\-diff\-auto\fP.
 .
 .
 .SS Format: 3.0 (native)
 .SS Format: 3.0 (native)
 This format is an extension of the native package format as defined
 This format is an extension of the native package format as defined
 in the 1.0 format. It supports all compression methods and
 in the 1.0 format. It supports all compression methods and
 will ignore by default any VCS specific files and directories
 will ignore by default any VCS specific files and directories
 as well as many temporary files (see default value associated to
 as well as many temporary files (see default value associated to
-\fB-I\fP option in the \fB\-\-help\fP output).
+\fB\-I\fP option in the \fB\-\-help\fP output).
 .
 .
 .SS Format: 3.0 (quilt)
 .SS Format: 3.0 (quilt)
 A source package in this format contains at least
 A source package in this format contains at least
 an original tarball (\fB.orig.tar.\fP\fIext\fP where \fIext\fP can be
 an original tarball (\fB.orig.tar.\fP\fIext\fP where \fIext\fP can be
 \fBgz\fP, \fBbz2\fP, \fBlzma\fP and \fBxz\fP) and a debian tarball
 \fBgz\fP, \fBbz2\fP, \fBlzma\fP and \fBxz\fP) and a debian tarball
 (\fB.debian.tar.\fP\fIext\fP). It can also contain additional original
 (\fB.debian.tar.\fP\fIext\fP). It can also contain additional original
-tarballs (\fB.orig-\fP\fIcomponent\fP\fB.tar.\fP\fIext\fP).
-\fIcomponent\fP can only contain alphanumeric characters and dashes ("-").
+tarballs (\fB.orig\-\fP\fIcomponent\fP\fB.tar.\fP\fIext\fP).
+\fIcomponent\fP can only contain alphanumeric characters and dashes ("\-").
 .PP
 .PP
 .B Extracting
 .B Extracting
 .PP
 .PP
@@ -426,13 +426,13 @@ is meant to simplify usage of quilt to manage the set of patches. Note
 however that while \fBdpkg\-source\fP parses correctly series files with
 however that while \fBdpkg\-source\fP parses correctly series files with
 explicit options used for patch application (stored on each line
 explicit options used for patch application (stored on each line
 after the patch filename and one or more spaces), it does ignore those
 after the patch filename and one or more spaces), it does ignore those
-options and always expect patches that can be applied with the \fB-p1\fP
+options and always expect patches that can be applied with the \fB\-p1\fP
 option of \fBpatch\fP. It will thus emit a warning when it encounters
 option of \fBpatch\fP. It will thus emit a warning when it encounters
 such options, and the build is likely to fail.
 such options, and the build is likely to fail.
 .PP
 .PP
 Similarly to quilt's default behaviour, the patches can remove files too.
 Similarly to quilt's default behaviour, the patches can remove files too.
 .PP
 .PP
-The file \fB.pc/applied-patches\fP is created if some
+The file \fB.pc/applied\-patches\fP is created if some
 patches have been applied during the extraction.
 patches have been applied during the extraction.
 .PP
 .PP
 .B Building
 .B Building
@@ -440,8 +440,8 @@ patches have been applied during the extraction.
 All original tarballs found in the current directory are extracted in a
 All original tarballs found in the current directory are extracted in a
 temporary directory by following the same logic as for the unpack, the
 temporary directory by following the same logic as for the unpack, the
 debian directory is copied over in the temporary directory, and all
 debian directory is copied over in the temporary directory, and all
-patches except the automatic patch (\fBdebian-changes-\fP\fIversion\fP
-or \fBdebian-changes\fP, depending on \fB\-\-single\-debian\-patch\fP) are
+patches except the automatic patch (\fBdebian\-changes\-\fP\fIversion\fP
+or \fBdebian\-changes\fP, depending on \fB\-\-single\-debian\-patch\fP) are
 applied. The temporary directory is compared to the source package
 applied. The temporary directory is compared to the source package
 directory. When the diff is non-empty, the build fails unless
 directory. When the diff is non-empty, the build fails unless
 \fB\-\-single\-debian\-patch\fP or \fB\-\-auto\-commit\fP
 \fB\-\-single\-debian\-patch\fP or \fB\-\-auto\-commit\fP
@@ -453,16 +453,16 @@ Any change
 on a binary file is not representable in a diff and will thus lead to a
 on a binary file is not representable in a diff and will thus lead to a
 failure unless the maintainer deliberately decided to include that
 failure unless the maintainer deliberately decided to include that
 modified binary file in the debian tarball (by listing it in
 modified binary file in the debian tarball (by listing it in
-\fBdebian/source/include-binaries\fP). The build will also fail if it
+\fBdebian/source/include\-binaries\fP). The build will also fail if it
 finds binary files in the debian sub-directory unless they have been
 finds binary files in the debian sub-directory unless they have been
-whitelisted through \fBdebian/source/include-binaries\fP.
+whitelisted through \fBdebian/source/include\-binaries\fP.
 
 
 The updated debian directory and the list of modified binaries is then
 The updated debian directory and the list of modified binaries is then
 used to generate the debian tarball.
 used to generate the debian tarball.
 
 
 The automatically generated diff doesn't include changes on VCS specific
 The automatically generated diff doesn't include changes on VCS specific
 files as well as many temporary files (see default value associated to
 files as well as many temporary files (see default value associated to
-\fB-i\fP option in the \fB\-\-help\fP output). In particular, the
+\fB\-i\fP option in the \fB\-\-help\fP output). In particular, the
 \fB.pc\fP directory used by quilt is ignored during generation of the
 \fB.pc\fP directory used by quilt is ignored during generation of the
 automatic patch.
 automatic patch.
 
 
@@ -470,7 +470,7 @@ Note: \fBdpkg\-source\fP \fB\-\-before\-build\fP (and \fB\-b\fP) will
 ensure that all patches listed in the series file are applied so that a
 ensure that all patches listed in the series file are applied so that a
 package build always has all patches applied. It does this by finding
 package build always has all patches applied. It does this by finding
 unapplied patches (they are listed in the \fBseries\fP file but not in
 unapplied patches (they are listed in the \fBseries\fP file but not in
-\fB.pc/applied-patches\fP), and if the first patch in that set can be
+\fB.pc/applied\-patches\fP), and if the first patch in that set can be
 applied without errors, it will apply them all. The option
 applied without errors, it will apply them all. The option
 \fB\-\-no\-preparation\fP can be used to disable this
 \fB\-\-no\-preparation\fP can be used to disable this
 behavior.
 behavior.
@@ -508,7 +508,7 @@ Include timestamp in the automatically generated patch.
 .TP
 .TP
 .B \-\-include\-binaries
 .B \-\-include\-binaries
 Add all modified binaries in the debian tarball. Also add them to
 Add all modified binaries in the debian tarball. Also add them to
-\fBdebian/source/include-binaries\fP: they will be added by default
+\fBdebian/source/include\-binaries\fP: they will be added by default
 in subsequent builds and this option is thus no more needed.
 in subsequent builds and this option is thus no more needed.
 .TP
 .TP
 .B \-\-no\-preparation
 .B \-\-no\-preparation
@@ -516,13 +516,13 @@ Do not try to prepare the build tree by applying patches which are
 apparently unapplied.
 apparently unapplied.
 .TP
 .TP
 .B \-\-single\-debian\-patch
 .B \-\-single\-debian\-patch
-Use \fBdebian/patches/debian-changes\fP instead of
-\fBdebian/patches/debian-changes-\fP\fIversion\fP for the name of the
+Use \fBdebian/patches/debian\-changes\fP instead of
+\fBdebian/patches/debian\-changes\-\fP\fIversion\fP for the name of the
 automatic patch generated during build. This option is particularly
 automatic patch generated during build. This option is particularly
 useful when the package is maintained in a VCS and a patch set can't reliably
 useful when the package is maintained in a VCS and a patch set can't reliably
 be generated. Instead the current diff with upstream should be stored in a
 be generated. Instead the current diff with upstream should be stored in a
-single patch. The option would be put in \fBdebian/source/local-options\fP
-and would be accompanied by a \fBdebian/source/local-patch-header\fP file
+single patch. The option would be put in \fBdebian/source/local\-options\fP
+and would be accompanied by a \fBdebian/source/local\-patch\-header\fP file
 explaining how the Debian changes can be best reviewed, for example in the
 explaining how the Debian changes can be best reviewed, for example in the
 VCS that is used.
 VCS that is used.
 .TP
 .TP
@@ -598,7 +598,7 @@ it could be anything.) Any other branches will be available under
 Before going any further, some checks are done to ensure that we
 Before going any further, some checks are done to ensure that we
 don't have any non-ignored uncommitted changes.
 don't have any non-ignored uncommitted changes.
 .PP
 .PP
-\fBgit-bundle\fP(1) is used to generate a bundle of the git repository.
+\fBgit\-bundle\fP(1) is used to generate a bundle of the git repository.
 By default, all branches and tags in the repository are included in the
 By default, all branches and tags in the repository are included in the
 bundle.
 bundle.
 .PP
 .PP
@@ -609,7 +609,7 @@ Allows specifying a git ref to include in the git bundle. Use disables
 the default behavior of including all branches and tags. May be specified
 the default behavior of including all branches and tags. May be specified
 multiple times. The \fIref\fP can be the name of a branch or tag to
 multiple times. The \fIref\fP can be the name of a branch or tag to
 include. It may also be any parameter that can be passed to
 include. It may also be any parameter that can be passed to
-\fBgit-rev-list\fP(1). For example, to include only
+\fBgit\-rev\-list\fP(1). For example, to include only
 the master branch, use \-\-git\-ref=master. To include all tags and
 the master branch, use \-\-git\-ref=master. To include all tags and
 branches, except for the private branch, use \-\-git\-ref=\-\-all
 branches, except for the private branch, use \-\-git\-ref=\-\-all
 \-\-git\-ref=^private
 \-\-git\-ref=^private
@@ -639,12 +639,12 @@ various cleanup are done to save space.
 The file \fBdebian/source/format\fP should always exist and indicate the
 The file \fBdebian/source/format\fP should always exist and indicate the
 desired source format. For backwards compatibility, format "1.0" is
 desired source format. For backwards compatibility, format "1.0" is
 assumed when the file doesn't exist but you should not rely on this:
 assumed when the file doesn't exist but you should not rely on this:
-at some point in the future dpkg-source will be modified to fail when that
+at some point in the future dpkg\-source will be modified to fail when that
 file doesn't exist.
 file doesn't exist.
 
 
 The rationale is that format "1.0" is no longer the recommended format,
 The rationale is that format "1.0" is no longer the recommended format,
 you should usually pick one of the newer formats ("3.0 (quilt)", "3.0
 you should usually pick one of the newer formats ("3.0 (quilt)", "3.0
-(native)") but \fBdpkg-source\fP will not do this automatically for you.
+(native)") but \fBdpkg\-source\fP will not do this automatically for you.
 If you want to continue using the old format, you should be explicit about
 If you want to continue using the old format, you should be explicit about
 it and put "1.0" in \fBdebian/source/format\fP.
 it and put "1.0" in \fBdebian/source/format\fP.
 .SS the diff modifies the following upstream files
 .SS the diff modifies the following upstream files
@@ -673,7 +673,7 @@ of that fact.
 This file contains on a single line the format that should be used to
 This file contains on a single line the format that should be used to
 build the source package (possible formats are described above). No leading
 build the source package (possible formats are described above). No leading
 or trailing spaces are allowed.
 or trailing spaces are allowed.
-.SS debian/source/include-binaries
+.SS debian/source/include\-binaries
 This file contains a list of binary files (one per line) that should be
 This file contains a list of binary files (one per line) that should be
 included in the debian tarball. Leading and trailing spaces are stripped.
 included in the debian tarball. Leading and trailing spaces are stripped.
 Lines starting with "#" are comments and are skipped. Empty lines are ignored.
 Lines starting with "#" are comments and are skipped. Empty lines are ignored.
@@ -690,24 +690,24 @@ stripped and short options are not allowed. Optional spaces are allowed
 around the "=" symbol and optional quotes are allowed around the value.
 around the "=" symbol and optional quotes are allowed around the value.
 Here's an example of such a file:
 Here's an example of such a file:
 .P
 .P
-  # let dpkg-source create a debian.tar.bz2 with maximal compression
+  # let dpkg\-source create a debian.tar.bz2 with maximal compression
   compression = "bzip2"
   compression = "bzip2"
-  compression-level = 9
-  # use debian/patches/debian-changes as automatic patch
-  single-debian-patch
+  compression\-level = 9
+  # use debian/patches/debian\-changes as automatic patch
+  single\-debian\-patch
 .P
 .P
 Note: \fBformat\fR options are not accepted in this file, you should
 Note: \fBformat\fR options are not accepted in this file, you should
 use \fBdebian/source/format\fR instead.
 use \fBdebian/source/format\fR instead.
-.SS debian/source/local-options
+.SS debian/source/local\-options
 Exactly like \fBdebian/source/options\fP except that the file is not
 Exactly like \fBdebian/source/options\fP except that the file is not
 included in the generated source package. It can be useful to store
 included in the generated source package. It can be useful to store
 a preference tied to the maintainer or to the VCS repository where
 a preference tied to the maintainer or to the VCS repository where
 the source package is maintained.
 the source package is maintained.
-.SS debian/source/local-patch-header
-.SS debian/source/patch-header
+.SS debian/source/local\-patch\-header
+.SS debian/source/patch\-header
 Free form text that is put on top of the automatic patch generated
 Free form text that is put on top of the automatic patch generated
-in formats "2.0" or "3.0 (quilt)". \fBlocal-patch-header\fP is not
-included in the generated source package while \fBpatch-header\fP is.
+in formats "2.0" or "3.0 (quilt)". \fBlocal\-patch\-header\fP is not
+included in the generated source package while \fBpatch\-header\fP is.
 .SS debian/patches/series
 .SS debian/patches/series
 This file lists all patches that have to be applied (in the given order)
 This file lists all patches that have to be applied (in the given order)
 on top of the upstream source package. Leading and trailing spaces are
 on top of the upstream source package. Leading and trailing spaces are

+ 4 - 3
man/dpkg-trigger.1

@@ -1,4 +1,4 @@
-.TH dpkg\-trigger 1 "2009-03-15" "Debian Project" "dpkg suite"
+.TH dpkg\-trigger 1 "2011-08-14" "Debian Project" "dpkg suite"
 .SH NAME
 .SH NAME
 dpkg\-trigger \- a package trigger utility
 dpkg\-trigger \- a package trigger utility
 .
 .
@@ -64,5 +64,6 @@ If set and the \fB\-\-admindir\fP option has not been specified, it will
 be used as the dpkg data directory.
 be used as the dpkg data directory.
 .
 .
 .SH SEE ALSO
 .SH SEE ALSO
-.BR dpkg "(1), " deb-triggers "(5), " /usr/share/doc/dpkg-dev/triggers.txt.gz .
-
+.BR dpkg (1),
+.BR deb\-triggers (5),
+.BR /usr/share/doc/dpkg\-dev/triggers.txt.gz .

+ 2 - 2
man/dpkg.1

@@ -1,4 +1,4 @@
-.TH dpkg 1 "2011-04-27" "Debian Project" "dpkg suite"
+.TH dpkg 1 "2011-08-14" "Debian Project" "dpkg suite"
 .SH NAME
 .SH NAME
 dpkg \- package manager for Debian
 dpkg \- package manager for Debian
 .
 .
@@ -582,7 +582,7 @@ Package status changed; \fIstatus\fR is as in the status file.
 An error occurred. Any possible newlines in \fIextended-error-message\fR
 An error occurred. Any possible newlines in \fIextended-error-message\fR
 will be converted to spaces before output.
 will be converted to spaces before output.
 .TP
 .TP
-.BI "status: " file " : conffile-prompt : '" real-old "' '" real-new "' " useredited " " distedited
+.BI "status: " file " : conffile\-prompt : '" real-old "' '" real-new "' " useredited " " distedited
 User is being asked a conffile question.
 User is being asked a conffile question.
 .TP
 .TP
 .BI "processing: " stage ": " package
 .BI "processing: " stage ": " package

+ 4 - 4
man/update-alternatives.8

@@ -5,7 +5,7 @@
 .\" by the Free Software Foundation; either version 2 of the License, or
 .\" by the Free Software Foundation; either version 2 of the License, or
 .\" (at your option) any later version.  There is NO WARRANTY.  You can
 .\" (at your option) any later version.  There is NO WARRANTY.  You can
 .\" find the GNU GPL in /usr/share/common-licenses/GPL on any Debian system.
 .\" find the GNU GPL in /usr/share/common-licenses/GPL on any Debian system.
-.TH update\-alternatives 8 "2011-07-04" "Debian Project" "dpkg utilities"
+.TH update\-alternatives 8 "2011-08-14" "Debian Project" "dpkg utilities"
 .SH NAME
 .SH NAME
 update\-alternatives \- maintain symbolic links determining default commands
 update\-alternatives \- maintain symbolic links determining default commands
 .
 .
@@ -271,7 +271,7 @@ Call \fB\-\-config\fP on all alternatives. It can be usefully combined with
 \fB\-\-skip\-auto\fP to review and configure all alternatives which are
 \fB\-\-skip\-auto\fP to review and configure all alternatives which are
 not configured in automatic mode. Broken alternatives are also displayed.
 not configured in automatic mode. Broken alternatives are also displayed.
 Thus a simple way to fix all broken alternatives is to call
 Thus a simple way to fix all broken alternatives is to call
-\fByes \[aq]\[aq] | update-alternatives \-\-force \-\-all\fR.
+\fByes \[aq]\[aq] | update\-alternatives \-\-force \-\-all\fR.
 .TP
 .TP
 \fB\-\-auto\fR \fIname\fR
 \fB\-\-auto\fR \fIname\fR
 Switch the link group behind the alternative for
 Switch the link group behind the alternative for
@@ -299,7 +299,7 @@ might contain spaces).
 .TP
 .TP
 \fB\-\-set\-selections\fR
 \fB\-\-set\-selections\fR
 Read configuration of alternatives on standard input in the format
 Read configuration of alternatives on standard input in the format
-generated by \fBupdate-alternatives \-\-get\-selections\fR and reconfigure
+generated by \fBupdate\-alternatives \-\-get\-selections\fR and reconfigure
 them accordingly.
 them accordingly.
 .TP
 .TP
 \fB\-\-query\fR \fIname\fR
 \fB\-\-query\fR \fIname\fR
@@ -335,7 +335,7 @@ Specifies the log file, when this is to be different from the default
 (/var/log/alternatives.log).
 (/var/log/alternatives.log).
 .TP
 .TP
 .BI \-\-force
 .BI \-\-force
-Let \fBupdate-alternatives\fR replace or drop any real file that is installed
+Let \fBupdate\-alternatives\fR replace or drop any real file that is installed
 where an alternative link has to be installed or removed.
 where an alternative link has to be installed or removed.
 .TP
 .TP
 .BI \-\-skip\-auto
 .BI \-\-skip\-auto