The following commit has been merged in the master branch:
commit 1f4c727c000ec7d618f561d5cad40a696bc81495
Author: Guillem Jover <[email protected]>
Date: Sun Mar 31 20:46:13 2013 +0200
man: Mark programs, variables, fields and command-line options in bold
diff --git a/debian/changelog b/debian/changelog
index bd3a253..daebe09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ dpkg (1.17.0) UNRELEASED; urgency=low
- Move compiler flags subsection from ENVIRONMENT to NOTES.
- Unify WARNING and ERROR sections into DIAGNOSTICS.
- Unify command-line options into a single OPTIONS section.
+ - Mark programs, variables, fields and command-line options in bold.
* Use colon instead of dot for user:group in dpkg debug output.
* Remove support for obsolete DM-Upload-Allowed from Dpkg::Vendor::Debian.
* Fix update-alternatives to use the current alternative link as the first
diff --git a/man/dpkg-architecture.1 b/man/dpkg-architecture.1
index c1807e7..47b74f4 100644
--- a/man/dpkg-architecture.1
+++ b/man/dpkg-architecture.1
@@ -28,7 +28,8 @@ dpkg\-architecture \- set and determine the architecture for
package building
.PP
.
.SH DESCRIPTION
-dpkg\-architecture does provide a facility to determine and set the build and
+.B dpkg\-architecture
+does provide a facility to determine and set the build and
host architecture for package building.
.PP
The build architecture is always determined by an external call to
@@ -184,7 +185,7 @@ The environment variables set by \fBdpkg\-architecture\fP
are passed to
\fIdebian/rules\fP as make variables (see make documentation). However,
you should not rely on them, as this breaks manual invocation of the
script. Instead, you should always initialize them using
-\fBdpkg\-architecture\fP with the \-q option. Here are some examples,
+\fBdpkg\-architecture\fP with the \fB\-q\fP option. Here are some examples,
which also show how you can improve the cross compilation support in your
package:
.PP
@@ -209,8 +210,8 @@ ifeq ($(DEB_HOST_ARCH),alpha)
endif
.fi
.PP
-or if you only need to check the CPU or OS type, use the DEB_HOST_ARCH_CPU
-or DEB_HOST_ARCH_OS variables.
+or if you only need to check the CPU or OS type, use the
+\fBDEB_HOST_ARCH_CPU\fP or \fBDEB_HOST_ARCH_OS\fP variables.
.PP
Note that you can also rely on an external Makefile snippet to properly
set all the variables that \fBdpkg\-architecture\fP can provide:
@@ -241,8 +242,8 @@ dpkg\-architecture \-elinux\-alpha
.IP
dpkg\-architecture \-amips \-elinux\-mips
.PP
-Check if the current architecture or an architecture provided with \-a are
-Linux systems:
+Check if the current architecture or an architecture provided with \fB\-a\fP
+are Linux systems:
.IP
dpkg\-architecture \-ilinux\-any
.IP
diff --git a/man/dpkg-buildflags.1 b/man/dpkg-buildflags.1
index d36e7e2..8ca4947 100644
--- a/man/dpkg-buildflags.1
+++ b/man/dpkg-buildflags.1
@@ -141,8 +141,8 @@ Show the version and exit.
.TP
.B CFLAGS
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 \fB\-g\fP and the default optimization level (\fB\-O2\fP usually,
+or \fB\-O0\fP if the \fBDEB_BUILD_OPTIONS\fP environment variable defines
\fInoopt\fP).
.TP
.B CPPFLAGS
diff --git a/man/dpkg-buildpackage.1 b/man/dpkg-buildpackage.1
index ac88135..95845a9 100644
--- a/man/dpkg-buildpackage.1
+++ b/man/dpkg-buildpackage.1
@@ -134,12 +134,12 @@ of the target Debian architecture.
.BI \-j jobs
Number of jobs allowed to be run simultaneously, equivalent to the
.BR make (1)
-option of the same name. Will add itself to the MAKEFLAGS
+option of the same name. Will add itself to the \fBMAKEFLAGS\fP
environment variable, which should cause all subsequent make
invocations to inherit the option. Also adds \fBparallel=\fP\fIjobs\fP
-to the DEB_BUILD_OPTIONS environment variable which allows
+to the \fBDEB_BUILD_OPTIONS\fP environment variable which allows
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 \fBDEB_BUILD_OPTIONS\fP environment variable
will override the \fB\-j\fP value if this option is given.
.TP
.B \-D
diff --git a/man/dpkg-checkbuilddeps.1 b/man/dpkg-checkbuilddeps.1
index 3d84066..41862d6 100644
--- a/man/dpkg-checkbuilddeps.1
+++ b/man/dpkg-checkbuilddeps.1
@@ -41,12 +41,12 @@ Change the location of the \fBdpkg\fR database. The default
location is
\fI/var/lib/dpkg\fP.
.TP
.B \-A
-Ignore \fIBuild\-Depends\-Arch\fR and \fIBuild\-Conflicts\-Arch\fR
+Ignore \fBBuild\-Depends\-Arch\fP and \fBBuild\-Conflicts\-Arch\fP
lines. Use when only arch-indep packages will be built, or combine with
\fB\-B\fP when only a source package is to be built.
.TP
.B \-B
-Ignore \fIBuild\-Depends\-Indep\fR and \fIBuild\-Conflicts\-Indep\fR
+Ignore \fBBuild\-Depends\-Indep\fP and \fBBuild\-Conflicts\-Indep\fP
lines. Use when only arch-dep packages will be built, or combine with
\fB\-A\fP when only a source package is to be built.
.TP
diff --git a/man/dpkg-divert.8 b/man/dpkg-divert.8
index 311a6e1..cd5b2f5 100644
--- a/man/dpkg-divert.8
+++ b/man/dpkg-divert.8
@@ -38,7 +38,7 @@ location, but to a \fIdiverted\fP location. Diversions can be
used through the
Debian package scripts to move a file away when it causes a conflict. System
administrators can also use it to override some package's configuration
file, or whenever some files (which aren't marked as 'conffiles') need to be
-preserved by dpkg, when installing a newer version of a package which
+preserved by \fBdpkg\fP, when installing a newer version of a package which
contains those files.
.sp
.SH COMMANDS
@@ -62,7 +62,8 @@ Print the real name for a diverted file.
.SH OPTIONS
.TP
.BI \-\-admindir " directory"
-Set the dpkg data directory to \fIdirectory\fP (default: \fI/var/lib/dpkg\fP).
+Set the \fBdpkg\fP data directory to \fIdirectory\fP (default:
+\fI/var/lib/dpkg\fP).
.TP
.BI \-\-divert " divert-to"
\fIdivert-to\fP is the location where the versions of \fIfile\fP, as
@@ -99,7 +100,7 @@ Show the version and exit.
.TP
.B DPKG_ADMINDIR
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 \fBdpkg\fP data directory.
.TP
.B DPKG_MAINTSCRIPT_PACKAGE
If set and the \fB\-\-local\fP and \fB\-\-package\fP options have not been
@@ -109,8 +110,8 @@ specified, \fBdpkg\-divert\fP will use it as the package
name.
.TP
.I /var/lib/dpkg/diversions
File which contains the current list of diversions of the system. It is
-located in the dpkg administration directory, along with other files
-important to dpkg, such as \fIstatus\fP or \fIavailable\fP.
+located in the \fBdpkg\fP administration directory, along with other files
+important to \fBdpkg\fP, such as \fIstatus\fP or \fIavailable\fP.
.br
Note: \fBdpkg\-divert\fP preserves the old copy of this file, with extension
\fI\-old\fP, before replacing it with the new one.
@@ -124,9 +125,9 @@ Directories can't be diverted with \fBdpkg\-divert\fP.
Care should be taken when diverting shared libraries, \fBldconfig\fP(8)
creates a symbolic link based on the DT_SONAME field embedded in the library.
-Because ldconfig doesn't honour diverts (only dpkg does), the symlink may
-end up pointing at the diverted library, if a diverted library has the
-same SONAME as the undiverted one.
+Because \fBldconfig\fP doesn't honour diverts (only \fBdpkg\fP does),
+the symlink may end up pointing at the diverted library, if a diverted
+library has the same SONAME as the undiverted one.
.
.SH EXAMPLES
To divert all copies of a \fI/usr/bin/example\fR to \fI/usr/bin/example.foo\fR,
diff --git a/man/dpkg-gencontrol.1 b/man/dpkg-gencontrol.1
index 33d53c1..9320dd1 100644
--- a/man/dpkg-gencontrol.1
+++ b/man/dpkg-gencontrol.1
@@ -33,7 +33,7 @@ binary package control file (which defaults to
debian/tmp/DEBIAN/control);
during this process it will simplify the relation fields.
.sp
Thus
-.IR Pre\-Depends ", " Depends ", " Recommends " and " Suggests
+.BR Pre\-Depends ", " Depends ", " Recommends " and " Suggests
are simplified in this
order by removing dependencies which are known to be true according to the
stronger dependencies already parsed. It will also remove any self-dependency
@@ -46,7 +46,7 @@ in the field, the superseding dependency will take the place
of the
discarded one.
.sp
The other relation fields
-.RI ( Enhances ", " Conflicts ", " Breaks ", " Replaces " and " Provides )
+.RB ( Enhances ", " Conflicts ", " Breaks ", " Replaces " and " Provides )
are also simplified individually by computing the union of the various
dependencies when a package is listed multiple times in the field.
.sp
@@ -110,7 +110,7 @@ instead of the normal package_version_arch.deb filename.
.BR \-is ", " \-ip ", " \-isp
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
+\fBdpkg\-gencontrol\fP to include the Section and Priority fields in the
control file. This is now the default behaviour. If you want to
get the old behaviour you can use the
.B \-U
diff --git a/man/dpkg-gensymbols.1 b/man/dpkg-gensymbols.1
index 8a1681c..4f42cd9 100644
--- a/man/dpkg-gensymbols.1
+++ b/man/dpkg-gensymbols.1
@@ -116,15 +116,15 @@ that has no value. The second symbol named
\fItagged_unquoted_symbol\fR is
only tagged with the tag named \fIoptional\fR. The last symbol is an
example of the normal untagged symbol.
.P
-Since symbol tags are an extension of the \fIdeb\-symbols(5)\fR format, they
+Since symbol tags are an extension of the \fBdeb\-symbols\fP(5) format, they
can only be part of the symbols files used in source packages (those files
should then be seen as templates used to build the symbols files that are
embedded in binary packages). When
-\fBdpkg\-gensymbols\fR is called without the \fI\-t\fR option, it will
-output symbols files compatible to the \fIdeb\-symbols(5)\fR format:
+\fBdpkg\-gensymbols\fR is called without the \fB\-t\fP option, it will
+output symbols files compatible to the \fBdeb\-symbols\fP(5) format:
it fully processes symbols according to the requirements of their standard tags
and strips all tags from the output. On the contrary, in template mode
-(\fI\-t\fR) all symbols and their tags (both standard and unknown ones)
+(\fB\-t\fP) all symbols and their tags (both standard and unknown ones)
are kept in the output and are written in their original form as they were
loaded.
.SS Standard symbol tags
@@ -164,7 +164,7 @@ from foreign arches) are always written to the symbol file
when operating
in template mode.
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
+\fBBuild\-Depends\fP field of \fIdebian/control\fR (except the enclosing
square brackets []). For example, the first symbol from the list below
will be considered only on alpha, any\-amd64 and ia64 architectures,
the second only on linux architectures, while the third one anywhere
@@ -203,14 +203,14 @@ 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.
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\fP failure under \fB\-c1\fP or
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
will only appear in the diff as MISSING. Moreover, like any symbol, the pattern
may be limited to the specific architectures with the \fIarch\fR tag. Please
refer to \fBStandard symbol tags\fR subsection above for more information.
-Patterns are an extension of the \fIdeb\-symbols(5)\fR format hence they are
+Patterns are an extension of the \fBdeb\-symbols\fP(5) format hence they are
only valid in symbol file templates. Pattern specification syntax is not any
different from the one of a specific symbol. However, symbol name part of the
specification serves as an expression to be matched against \fIname@version\fR
@@ -421,11 +421,11 @@ newer upstream version of your library.
.TP
.BI \-t
Write the symbol file in template mode rather than the format compatible with
-\fIdeb\-symbols(5)\fR. The main difference is that in the template mode symbol
+\fBdeb\-symbols\fP(5). The main difference is that in the template mode symbol
names and tags are written in their original form contrary to the
post-processed symbol names with tags stripped in the compatibility mode.
Moreover, some symbols might be omitted when writing a standard
-\fIdeb\-symbols(5)\fR file (according to the tag processing rules) while all
+\fBdeb\-symbols\fP(5) file (according to the tag processing rules) while all
symbols are always written to the symbol file template.
.TP
.BI \-c [0-4]
@@ -437,13 +437,13 @@ new symbols have been introduced. Level 3 fails if some
libraries have
disappeared. Level 4 fails if some libraries have been introduced.
This value can be overridden by the environment variable
-DPKG_GENSYMBOLS_CHECK_LEVEL.
+.BR DPKG_GENSYMBOLS_CHECK_LEVEL .
.TP
.BI \-q
Keep quiet and never generate a diff between generated symbols file and the
template file used as starting point or show any warnings about new/lost
libraries or new/lost symbols. This option only disables informational output
-but not the checks themselves (see \fI\-c\fR option).
+but not the checks themselves (see \fB\-c\fP option).
.TP
.BI \-a arch
Assume \fIarch\fR as host architecture when processing symbol files. Use this
diff --git a/man/dpkg-maintscript-helper.1 b/man/dpkg-maintscript-helper.1
index e65c583..690e2f2 100644
--- a/man/dpkg-maintscript-helper.1
+++ b/man/dpkg-maintscript-helper.1
@@ -32,8 +32,8 @@ dpkg\-maintscript\-helper \- works around known dpkg
limitations in maintainer s
.SH DESCRIPTION
.P
This program is designed to be run within maintainer scripts to achieve
-some tasks that dpkg can't (yet) handle natively either because of design
-decisions or due to current limitations.
+some tasks that \fBdpkg\fP can't (yet) handle natively either because of
+design decisions or due to current limitations.
.P
Many of those tasks require coordinated actions from several maintainer
scripts (\fBpreinst\fP, \fBpostinst\fP, \fBprerm\fP, \fBpostrm\fP). To
@@ -44,9 +44,9 @@ that you have to forward after a double dash.
.
.SH CONFFILE RELATED TASKS
.P
-When upgrading a package, dpkg will not automatically remove a conffile (a
-configuration file for which dpkg should preserve user changes) if it is
-not present in the newer version. There are two principal reasons for
+When upgrading a package, \fBdpkg\fP will not automatically remove a conffile
+(a configuration file for which \fBdpkg\fP should preserve user changes) if
+it is not present in the newer version. There are two principal reasons for
this; the first is that the conffile could've been dropped by accident and
the next version could restore it, users wouldn't want their changes
thrown away. The second is to allow packages to transition files from a
@@ -89,10 +89,11 @@ now preparing, not the first version of the package that
lacked the
conffile.
.P
\fIpackage\fP is the package name. If empty or omitted, the
-DPKG_MAINTSCRIPT_PACKAGE environment variable (as set by dpkg) will be used.
+\fBDPKG_MAINTSCRIPT_PACKAGE\fP environment variable (as set by \fBdpkg\fP)
+will be used.
.P
All the parameters of the maintainer scripts have to be forwarded to the
-program after "\-\-".
+program after \fB\-\-\fP.
.P
Current implementation: in the \fBpreinst\fP, it checks if the conffile
was modified and renames it either to \fIconffile\fP\fB.dpkg\-remove\fP (if not
@@ -108,8 +109,8 @@ original conffile. During purge, the \fBpostrm\fP will also
delete the
If a conffile is moved from one location to another, you need to make sure
you move across any changes the user has made. This may seem a simple
change to the \fBpreinst\fP script at first, however that will result in
-the user being prompted by dpkg to approve the conffile edits even though
-they are not responsible of them.
+the user being prompted by \fBdpkg\fP to approve the conffile edits even
+though they are not responsible of them.
.P
Graceful renaming can be implemented by putting the following shell
snippet in the \fBpreinst\fP, \fBpostinst\fP and \fBpostrm\fP maintainer
@@ -128,10 +129,11 @@ is empty or omitted, then the operation is tried on every
upgrade (note: it's
safer to give the version and have the operation tried only once).
.P
\fIpackage\fP is the package name. If empty or omitted, the
-DPKG_MAINTSCRIPT_PACKAGE environment variable (as set by dpkg) will be used.
+\fBDPKG_MAINTSCRIPT_PACKAGE\fP environment variable (as set by \fBdpkg\fP)
+will be used.
.P
All the parameters of the maintainer scripts have to be forwarded to the
-program after "\-\-".
+program after \fB\-\-\fP.
.P
Current implementation: the \fBpreinst\fP checks if the conffile has been
modified, if yes it's left on place otherwise it's renamed to
@@ -145,7 +147,7 @@ abort\-upgrade/abort\-install, the \fBpostrm\fP renames
.P
Given that \fBdpkg\-maintscript\-helper\fP is used in the \fBpreinst\fP,
using it unconditionally requires a pre-dependency to ensure that the
-required version of dpkg has been unpacked before. The required version
+required version of \fBdpkg\fP has been unpacked before. The required version
depends on the command used, for \fBrm_conffile\fP and \fBmv_conffile\fP
it is 1.15.7.2:
.P
@@ -154,7 +156,7 @@ it is 1.15.7.2:
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
program only if we know that the required command is supported by
-the currently installed dpkg:
+the currently installed \fBdpkg\fP:
.P
if dpkg\-maintscript\-helper supports \fIcommand\fP; then
dpkg\-maintscript\-helper \fIcommand\fP ...
diff --git a/man/dpkg-name.1 b/man/dpkg-name.1
index 04c043a..539b646 100644
--- a/man/dpkg-name.1
+++ b/man/dpkg-name.1
@@ -65,7 +65,7 @@ so a lot of packages will find their way to the `no\-section'
area. Use
this option with care, it's messy.
.TP
.BR \-c ", " \-\-create\-dir
-This option can used together with the \-s option. If a target
+This option can used together with the \fB\-s\fP option. If a target
directory isn't found it will be created automatically.
.B Use this option with care.
.TP
@@ -78,7 +78,7 @@ Show the version and exit.
.SH BUGS
Some packages don't follow the name structure
.IB package _ version _ architecture .deb\fR.\fP
-Packages renamed by dpkg\-name
+Packages renamed by \fBdpkg\-name\fP
will follow this structure. Generally this will have no impact on how
packages are installed by
.BR dselect (1)/ dpkg (1),
@@ -94,8 +94,8 @@ part of `bar\-foo.deb').
.TP
.B find /root/debian/ \-name \(aq*.deb\(aq | xargs \-n 1 dpkg\-name \-a
All files with the extension `deb' in the directory /root/debian and its
-subdirectory's will be renamed by dpkg\-name if required into names with no
-architecture information.
+subdirectory's will be renamed by \fBdpkg\-name\fP if required into names
+with no architecture information.
.TP
.B find \-name \(aq*.deb\(aq | xargs \-n 1 dpkg\-name \-a \-o \-s \-c
.B Don't do this.
diff --git a/man/dpkg-parsechangelog.1 b/man/dpkg-parsechangelog.1
index 7434f7d..0692b1d 100644
--- a/man/dpkg-parsechangelog.1
+++ b/man/dpkg-parsechangelog.1
@@ -129,7 +129,7 @@ include \fInumber\fP entries from the top (or the tail
if \fInumber\fP is lower than 0).
.TP
.BR \-\-offset " \fInumber\fP, " \-o \fInumber\fP
-change the starting point for \-\-count, counted from the top
+change the starting point for \fB\-\-count\fP, counted from the top
(or the tail if \fInumber\fP is lower than 0).
.TP
.B \-\-all
@@ -177,7 +177,7 @@ possibly generating incorrect output.
A changelog parser may not interact with the user at all.
.
.SH NOTES
-All \fBParser Options\fP except for \-v are only supported in
+All \fBParser Options\fP except for \fB\-v\fP are only supported in
\fBdpkg\fP, version 1.14.16 and later. Third party parsers for
changelog formats other than \fIdebian\fP might not support
all options.
diff --git a/man/dpkg-query.1 b/man/dpkg-query.1
index 23ef9c0..92bec4e 100644
--- a/man/dpkg-query.1
+++ b/man/dpkg-query.1
@@ -91,7 +91,7 @@ the given pattern. However the output can be customized using
the
\fB\-\-showformat\fP option.
The default output format gives one line per matching package, each line
having the name (extended with the architecture qualifier for
-\fIMulti\-Arch\fP \fBsame\fP packages) and installed version of the package,
+\fBMulti\-Arch\fP \fBsame\fP packages) and installed version of the package,
separated by a tab.
.TP
.BR \-s ", " \-\-status " \fIpackage-name\fP..."
@@ -232,10 +232,10 @@ Actually, all other fields found in the status file (i.e.
user defined
fields) can be requested, too. They will be printed as-is, though, no
conversion nor error checking is done on them. \fBbinary:Package\fP is
a special field that will print the package name with an architecture
-qualifier (like "libc6:amd64") if the package has a \fIMulti\-Arch\fP
+qualifier (like "libc6:amd64") if the package has a \fBMulti\-Arch\fP
field with a value of \fBsame\fP, and as such its name could be ambiguous.
-To get the name of the dpkg maintainer and the installed version, you could
-run:
+To get the name of the \fBdpkg\fP maintainer and the installed version,
+you could run:
.nf
\fBdpkg\-query \-W \-f=\(aq${binary:Package}
${Version}\\t${Maintainer}\\n\(aq dpkg\fP
@@ -248,13 +248,14 @@ The requested query was successfully performed.
.TP
.B 1
Problems were encountered while parsing the command line or performing the
-query, including no file or package being found (except for \-\-control\-path).
+query, including no file or package being found (except for
+\fB\-\-control\-path\fP).
.
.SH ENVIRONMENT
.TP
.B DPKG_ADMINDIR
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 \fBdpkg\fP data directory.
.TP
\fBCOLUMNS\fP
This setting influences the output of the \fB\-\-list\fP option by changing
diff --git a/man/dpkg-shlibdeps.1 b/man/dpkg-shlibdeps.1
index 63ad6d5..06f6334 100644
--- a/man/dpkg-shlibdeps.1
+++ b/man/dpkg-shlibdeps.1
@@ -83,7 +83,8 @@ Per-system overriding shared library dependency information.
.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.
-Unless overridden by \-\-admindir, those files are located in /var/lib/dpkg.
+Unless overridden by \fB\-\-admindir\fP, those files are located in
+/var/lib/dpkg.
.P
While scanning the symbols used by all binaries,
.B dpkg\-shlibdeps
@@ -93,10 +94,10 @@ library used (provided that the information of the
\fIsymbols\fR files are
accurate).
.P
As a safe-guard measure, a symbols file can provide a
-\fIBuild\-Depends\-Package\fR meta-information field and
+\fBBuild\-Depends\-Package\fP meta-information field and
.B dpkg\-shlibdeps
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 \fBBuild\-Depends\fP field and use this version if it's higher than the
minimal version computed by scanning symbols.
.SS Shlibs files
Shlibs files associate directly a library to a dependency (without looking
@@ -117,7 +118,8 @@ shlibs file in that build tree takes precedence over shlibs
files from
other binary packages.
.IP "Output from \(lq\fBdpkg\-query \-\-control\-path\fP \fIpackage\fR
shlibs\(rq"
Package-provided shared library dependency information.
-Unless overridden by \-\-admindir, those files are located in /var/lib/dpkg.
+Unless overridden by \fB\-\-admindir\fP, those files are located in
+/var/lib/dpkg.
.IP /etc/dpkg/shlibs.default
Per-system default shared library dependency information.
.P
@@ -299,19 +301,19 @@ has been unable to find the library.
.B dpkg\-shlibdeps
creates a list of directories to check as following: directories listed in
the RPATH of the binary, directories listed in /etc/ld.so.conf,
-directories listed in the LD_LIBRARY_PATH environment variable, and
+directories listed in the \fBLD_LIBRARY_PATH\fP environment variable, and
standard public directories (/lib, /usr/lib, /lib32, /usr/lib32, /lib64,
/usr/lib64). Then it checks those directories in the package's build tree
of the binary being analyzed, in the packages' build trees indicated with
-the \-S command-line option, in other packages' build trees that contains
+the \fB\-S\fP command-line option, in other packages' build trees that contains
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
error.
If the library not found is in a private directory of the same package,
-then you want to add the directory to LD_LIBRARY_PATH. If it's in another
+then you want to add the directory to \fBLD_LIBRARY_PATH\fP. If it's in another
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 \fBLD_LIBRARY_PATH\fP
contains the appropriate directory if it also is in a private directory.
.TP
.BI "no dependency information found for " library-file " (used by " binary
")."
@@ -343,7 +345,7 @@ of the binary to avoid problems.
Calling
.B dpkg\-shlibdeps
-in verbose mode (\-v) will provide much more information about where it
+in verbose mode (\fB\-v\fP) will provide much more information about where it
tried to find the dependency information. This might be useful if you
don't understand why it's giving you this error.
.SH SEE ALSO
diff --git a/man/dpkg-source.1 b/man/dpkg-source.1
index 1bcd2ed..4f51db1 100644
--- a/man/dpkg-source.1
+++ b/man/dpkg-source.1
@@ -208,13 +208,13 @@ some auto-generated files from the automatic patch
generation.
.BR \-I "[\fIfile-pattern\fP], " \-\-tar\-ignore [=\fIfile-pattern\fP]
If this option is specified, the pattern will be passed to
.BR tar (1)'s
-\-\-exclude
+.B \-\-exclude
option when it is called to generate a .orig.tar or .tar file. For
-example, \-ICVS will make tar skip over CVS directories when generating
+example, \fB\-I\fPCVS will make tar skip over CVS directories when generating
a .tar.gz file. The option may be repeated multiple times to list multiple
patterns to exclude.
-\fB\-I\fP by itself adds default \-\-exclude options that will
+\fB\-I\fP by itself adds default \fB\-\-exclude\fP options that will
filter out control files and directories of the most common revision
control systems, backup and swap files and Libtool build output
directories.
@@ -227,7 +227,7 @@ the full relative path of each file. \fB\-I\fP can specified
multiple times and takes a filename pattern with shell wildcards.
The pattern is applied to the full relative path but also
to each part of the path individually. The exact semantic of tar's
-\-\-exclude option is somewhat complicated, see
+\fB\-\-exclude\fP option is somewhat complicated, see
http://www.gnu.org/software/tar/manual/tar.html#wildcards for a full
documentation.
@@ -329,8 +329,8 @@ but will remove that directory after it has been used.
.TP
.B \-ss
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
-the tarfile to create the
+and as a tarfile. \fBdpkg\-source\fP will use the directory to create
+the diff, but the tarfile to create the
.BR .dsc .
This option must be used with care - if the directory and tarfile do
not match a bad source archive will be generated.
@@ -443,7 +443,7 @@ All patches listed in \fBdebian/patches/debian.series\fP or
\fBdebian/patches/series\fP are then applied.
If the former file is used and the latter one doesn't exist (or is a
symlink), then the latter is replaced with a symlink to the former. This
-is meant to simplify usage of quilt to manage the set of patches. Note
+is meant to simplify usage of \fBquilt\fP to manage the set of patches. Note
however that while \fBdpkg\-source\fP parses correctly series files with
explicit options used for patch application (stored on each line
after the patch filename and one or more spaces), it does ignore those
@@ -451,12 +451,13 @@ 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
such options, and the build is likely to fail.
.PP
-Contrary to quilt's default behaviour, patches are expected to apply
+Contrary to \fBquilt\fP's default behaviour, patches are expected to apply
without any fuzz. When that is not the case, you should refresh such
-patches with quilt, or dpkg-source will error out while trying to apply
-them.
+patches with \fBquilt\fP, or \fBdpkg\-source\fP will error out while
+trying to apply them.
.PP
-Similarly to quilt's default behaviour, the patches can remove files too.
+Similarly to \fBquilt\fP's default behaviour, the patches can remove
+files too.
.PP
The file \fB.pc/applied\-patches\fP is created if some
patches have been applied during the extraction.
@@ -473,7 +474,7 @@ directory. When the diff is non-empty, the build fails
unless
\fB\-\-single\-debian\-patch\fP or \fB\-\-auto\-commit\fP
has been used, in which case the diff is stored in the automatic patch.
If the automatic patch is created/deleted, it's added/removed from the
-series file and from the quilt metadata.
+series file and from the \fBquilt\fP metadata.
Any change
on a binary file is not representable in a diff and will thus lead to a
@@ -489,7 +490,7 @@ used to generate the debian tarball.
The automatically generated diff doesn't include changes on VCS specific
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.pc\fP directory used by quilt is ignored during generation of the
+\fB.pc\fP directory used by \fBquilt\fP is ignored during generation of the
automatic patch.
Note: \fBdpkg\-source\fP \fB\-\-before\-build\fP (and \fB\-b\fP) will
@@ -506,7 +507,7 @@ behavior.
.TP
.RI "\fB\-\-commit\fP [" directory "] [" patch-name "] [" patch-file ]
Generates a patch corresponding to the local changes that are not managed
-by the quilt patch system and integrates it in the patch system under
+by the \fBquilt\fP patch system and integrates it in the patch system under
the name \fIpatch-name\fP. If the name is missing, it will be asked
interactively. If \fIpatch-file\fP is given, it is used as the patch
corresponding to the local changes to integrate. Once integrated, an
@@ -528,10 +529,10 @@ they end up in the debian tarball (exactly like
\fBdpkg-source
.TP
.BI \-\-allow\-version\-of\-quilt\-db= version
Allow \fBdpkg\-source\fP to build the source package if the version of
-the quilt metadata is the one specified, even if \fBdpkg\-source\fP
+the \fBquilt\fP metadata is the one specified, even if \fBdpkg\-source\fP
doesn't know about it. Effectively this says that the given version of the
-quilt metadata is compatible with the version 2 that \fBdpkg\-source\fP
-currently supports. The version of the quilt metadata is stored in
+\fBquilt\fP metadata is compatible with the version 2 that \fBdpkg\-source\fP
+currently supports. The version of the \fBquilt\fP metadata is stored in
\fB.pc/.version\fP.
.TP
.B \-\-include\-removal
@@ -568,7 +569,7 @@ be used when the source package is just a bundle of
multiple upstream
software and where there's no "main" software.
.TP
.B \-\-no\-unapply\-patches, \-\-unapply\-patches
-By default, dpkg\-source will automatically unapply the patches in the
+By default, \fBdpkg\-source\fP will automatically unapply the patches in the
\fB\-\-after\-build\fP hook if it did apply them during
\fB\-\-before\-build\fP. Those options allow you to forcefully disable
or enable the patch unapplication process. Those options are only allowed
@@ -578,13 +579,13 @@ packages have the same behavior by default.
.B \-\-abort\-on\-upstream\-changes
The process fails if an automatic patch has been generated. This option
can be used to ensure that all changes were properly recorded in separate
-quilt patches prior to the source package build. This option is not
+\fBquilt\fP patches prior to the source package build. This option is not
allowed in \fBdebian/source/options\fP but can be used in
\fBdebian/source/local\-options\fP.
.TP
.B \-\-auto\-commit
The process doesn't fail if an automatic patch has been generated, instead
-it's immediately recorded in the quilt series.
+it's immediately recorded in the \fBquilt\fP series.
.PP
.B Extract options
@@ -607,7 +608,7 @@ in the current directory. At least one file must be given.
.TP
.BI \-\-target\-format= value
\fBRequired\fP. Defines the real format of the generated source package.
-The generated .dsc file will contain this value in its \fIFormat\fP field
+The generated .dsc file will contain this value in its \fBFormat\fP field
and not "3.0 (custom)".
.
.SS Format: 3.0 (git)
@@ -646,9 +647,9 @@ 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
include. It may also be any parameter that can be passed to
\fBgit\-rev\-list\fP(1). For example, to include only
-the master branch, use \-\-git\-ref=master. To include all tags and
-branches, except for the private branch, use \-\-git\-ref=\-\-all
-\-\-git\-ref=^private
+the master branch, use \fB\-\-git\-ref=\fPmaster. To include all tags and
+branches, except for the private branch, use \fB\-\-git\-ref=\fP\-\-all
+\fB\-\-git\-ref=\fP^private
.TP
.BI \-\-git\-depth= number
Creates a shallow clone with a history truncated to the specified number of
@@ -675,8 +676,8 @@ various cleanup are done to save space.
The file \fBdebian/source/format\fP should always exist and indicate the
desired source format. For backwards compatibility, format "1.0" is
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
-file doesn't exist.
+at some point in the future \fBdpkg\-source\fP will be modified to fail
+when that file doesn't exist.
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
@@ -752,7 +753,7 @@ on top of the upstream source package. Leading and trailing
spaces are
stripped. Lines starting with "#" are comments and are skipped. Empty
lines are ignored. Remaining lines start with a patch filename (relative
to the \fBdebian/patches/\fP directory) up to the first space character or
-the end of line. Optional quilt options can follow up to the end of line
+the end of line. Optional \fBquilt\fP options can follow up to the end of line
or the first "#" preceded by one or more spaces (which marks the start of
a comment up to the end of line).
.SH BUGS
diff --git a/man/dpkg-statoverride.8 b/man/dpkg-statoverride.8
index 3cf77b2..019ea27 100644
--- a/man/dpkg-statoverride.8
+++ b/man/dpkg-statoverride.8
@@ -29,7 +29,8 @@ dpkg\-statoverride \- override ownership and mode of files
.BR dpkg (1)
to use a different owner
or mode for a file when a package is installed. (note: I use the word
-`file' here, but in reality this can be any filesystem object that dpkg
+`file' here, but in reality this can be any filesystem object that
+.B dpkg
handles, including directories, devices, etc.). This can be used to
force programs that are normally setuid to be install without a setuid
flag, or only executable by a certain group.
@@ -48,7 +49,7 @@ or \fBnobody\fR), or by their number by prepending the number
with a
`\fB#\fR' (for example \fB#0\fR or \fB#65534\fR). The \fImode\fR needs
to be specified in octal.
-If \-\-update is specified and \fIfile\fP exists, it is immediately
+If \fB\-\-update\fP is specified and \fIfile\fP exists, it is immediately
set to the new owner and mode.
.TP
.BI \-\-remove " file"
@@ -69,8 +70,8 @@ Show the version and exit.
.SH OPTIONS
.TP
.BI \-\-admindir " directory"
-Change the \fIdirectory\fP of the dpkg database where the statoverride file is
-also stored. Defaults to \fI/var/lib/dpkg\fP.
+Change the \fIdirectory\fP of the \fBdpkg\fP database where the statoverride
+file is also stored. Defaults to \fI/var/lib/dpkg\fP.
.TP
.B \-\-force
Force an action, even if a sanity check would otherwise prohibit it.
@@ -87,14 +88,14 @@ Be less verbose about what we do.
.TP
.B DPKG_ADMINDIR
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 \fBdpkg\fP data directory.
.
.SH FILES
.TP
.I /var/lib/dpkg/statoverride
File which contains the current list of stat overrides of the system. It
-is located in the dpkg administration directory, along with other files
-important to dpkg, such as `status' or `available'.
+is located in the \fBdpkg\fP administration directory, along with other files
+important to \fBdpkg\fP, such as `status' or `available'.
.br
Note: \fBdpkg\-statoverride\fP preserves the old copy of this file, with
extension "\-old", before replacing it with the new one.
diff --git a/man/dpkg-trigger.1 b/man/dpkg-trigger.1
index dadbbdf..8a9d3cd 100644
--- a/man/dpkg-trigger.1
+++ b/man/dpkg-trigger.1
@@ -78,7 +78,7 @@ Just test, do not actually change anything.
.TP
.B DPKG_ADMINDIR
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 \fBdpkg\fP data directory.
.
.SH SEE ALSO
.BR dpkg (1),
diff --git a/man/dpkg-vendor.1 b/man/dpkg-vendor.1
index 77d512a..68af81e 100644
--- a/man/dpkg-vendor.1
+++ b/man/dpkg-vendor.1
@@ -36,7 +36,7 @@ with non-zero.
.TP
.BI \-\-derives\-from " vendor"
Exits with \fB0\fP if the current vendor distribution is a derivative of
-\fIvendor\fP, otherwise exits with non-zero. It uses the "Parent" field
+\fIvendor\fP, otherwise exits with non-zero. It uses the \fBParent\fP field
to browse all ancestors of the current vendor.
.TP
.BI \-\-query " field"
diff --git a/man/dpkg.1 b/man/dpkg.1
index 24eed90..54e2f08 100644
--- a/man/dpkg.1
+++ b/man/dpkg.1
@@ -405,7 +405,7 @@ Turns on (or off) all force options.
\fBdowngrade\fP(*):
Install a package, even if newer version of it is already installed.
-\fIWarning: At present dpkg does not do any dependency
+\fIWarning: At present \fP\fBdpkg\fP\fI 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
@@ -569,13 +569,13 @@ installed.
.TQ
.BI \-\-post\-invoke= command
Set an invoke hook \fIcommand\fP to be run via \*(lqsh \-c\*(rq before or
-after the dpkg run for the \fIunpack\fP, \fIconfigure\fP, \fIinstall\fP,
-\fItriggers\-only\fP, \fIremove\fP and \fIpurge\fP dpkg actions. This
+after the \fBdpkg\fP run for the \fIunpack\fP, \fIconfigure\fP, \fIinstall\fP,
+\fItriggers\-only\fP, \fIremove\fP and \fIpurge\fP \fBdpkg\fP actions. This
option can be specified multiple times. The order the options are specified
is preserved, with the ones from the configuration files taking precedence.
The environment variable \fBDPKG_HOOK_ACTION\fP is set for the hooks to the
-current dpkg action. Note: front-ends might call dpkg several times per
-invocation, which might run the hooks more times than expected.
+current \fBdpkg\fP action. Note: front-ends might call \fBdpkg\fP several
+times per invocation, which might run the hooks more times than expected.
.TP
.BI \-\-path\-exclude= glob-pattern
.TQ
diff --git a/man/start-stop-daemon.8 b/man/start-stop-daemon.8
index 206ebe6..a72b8ae 100644
--- a/man/start-stop-daemon.8
+++ b/man/start-stop-daemon.8
@@ -231,8 +231,8 @@ Chdir to
.I path
before starting the process. This is done after the chroot if the
\fB\-r\fP|\fB\-\-chroot\fP option is set. When not specified,
-start\-stop\-daemon will chdir to the root directory before starting
-the process.
+.B start\-stop\-daemon
+will chdir to the root directory before starting the process.
.TP
.BR \-b ", " \-\-background
Typically used with programs that don't detach on their own. This option
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
