The following commit has been merged in the master branch:
commit 08ba74db5cec89d678030b93b9e3b984a41ec024
Author: Guillem Jover <[email protected]>
Date: Fri Mar 29 14:59:14 2013 +0100
man: Use .TQ instead of .TP and .PD 0 or other ad-hoc markup
diff --git a/man/deb-control.5 b/man/deb-control.5
index e179ab1..26ebdf3 100644
--- a/man/deb-control.5
+++ b/man/deb-control.5
@@ -134,13 +134,10 @@ The name of the source package that this binary package
came from, if
different than the name of the package itself.
.TP
-.PD 0
.BI Subarchitecture: " value"
-.TP
-.PD 0
+.TQ
.BI Kernel\-Version: " value"
-.TP
-.PD
+.TQ
.BI Installer\-Menu\-Item: " value"
These fields are used by the debian\-installer and are usually not needed.
See /usr/share/doc/debian\-installer/devel/modules.txt from the
diff --git a/man/deb-src-control.5 b/man/deb-src-control.5
index 9061c2b..c41a290 100644
--- a/man/deb-src-control.5
+++ b/man/deb-src-control.5
@@ -237,13 +237,10 @@ packages used by the debian installer. "deb" is the
default value, it's
assumed if the field is absent. More types might be added in the future.
.TP
-.PD 0
.BI Subarchitecture: " value"
-.TP
-.PD 0
+.TQ
.BI Kernel\-Version: " value"
-.TP
-.PD 0
+.TQ
.BI Installer\-Menu\-Item: " value"
These fields are used by the debian\-installer and are usually not needed.
See /usr/share/doc/debian\-installer/devel/modules.txt from the
@@ -251,16 +248,12 @@ See /usr/share/doc/debian\-installer/devel/modules.txt
from the
package for more details about them.
.TP
-.PD 0
.BR Essential: " \fByes\fP|\fBno\fP"
-.TP
-.PD 0
+.TQ
.BR Multi\-Arch: " \fBsame\fP|\fBforeign\fP|\fBallowed\fP"
-.TP
-.PD 0
+.TQ
.BI Tag: " tag-list"
-.TP
-.PD 0
+.TQ
.BR Description: " \fIshort-description\fP (required)"
These fields are described in the
.BR deb\-control (5)
@@ -268,36 +261,25 @@ manual page, as they are copied literally to the control
file of the binary
package.
.TP
-.PD 0
.BI Depends: " package-list"
-.TP
-.PD 0
+.TQ
.BI Pre\-Depends: " package-list"
-.TP
-.PD 0
+.TQ
.BI Recommends: " package-list"
-.TP
-.PD 0
+.TQ
.BI Suggests: " package-list"
-.TP
-.PD 0
+.TQ
.BI Breaks: " package-list"
-.TP
-.PD 0
+.TQ
.BI Enhances: " package-list"
-.TP
-.PD 0
+.TQ
.BI Replaces: " package-list"
-.TP
-.PD 0
+.TQ
.BI Conflicts: " package-list"
-.TP
-.PD 0
+.TQ
.BI Provides: " package-list"
-.TP
-.PD 0
+.TQ
.BI Built\-Using: " package-list"
-.br
These fields declare relationships between packages. They are discussed in
the
.BR deb\-control (5)
diff --git a/man/dpkg-buildpackage.1 b/man/dpkg-buildpackage.1
index 8804b61..ac88135 100644
--- a/man/dpkg-buildpackage.1
+++ b/man/dpkg-buildpackage.1
@@ -90,40 +90,36 @@ Passed to \fBdpkg\-genchanges\fP.
.B \-F
Specifies a normal full build, binary and source packages will be built.
This is the same as the default case when no build option is specified.
-.P
+.TP
.BI \-\-target= target
-.br
+.TQ
.BI "\-\-target " target
-.br
+.TQ
.BI \-T target
-.RS
Calls \fBdebian/rules\fP \fItarget\fP after having setup the build
environment and stops the package build process here. If
\fB\-\-as\-root\fP is also given, then the command is executed
as root (see \fB\-r\fP). Note that official targets that are required to
be run as root by the Debian policy do not need this option.
-.RE
.TP
.B \-\-as\-root
Only meaningful together with \fB\-\-target\fP. Requires that the target be
run with root rights.
-.P
+.TP
.B \-si
-.br
+.TQ
.B \-sa
-.br
+.TQ
.B \-sd
-.br
+.TQ
.BI \-v version
-.br
+.TQ
.BI \-C changes-description
-.br
+.TQ
.BI \-m maintainer-address
-.br
+.TQ
.BI \-e maintainer-address
-.RS
Passed unchanged to \fBdpkg\-genchanges\fP. See its manual page.
-.RE
.TP
.BI \-a architecture
Specify the Debian architecture we build for. The architecture of the
@@ -218,32 +214,27 @@ Do not sign the \fB.changes\fP file.
.BR \-\-force\-sign
Force the signing of the resulting files (since dpkg 1.17.0),
regardless of \fB\-us\fP or \fB\-uc\fP or other internal heuristics.
-.P
+.TP
.BR \-i [\fIregexp\fP]
-.br
+.TQ
.BI \-I [\fIpattern\fP]
-.br
+.TQ
.BR \-s [ nsAkurKUR ]
-.br
+.TQ
.BR \-z ", " \-Z
-.br
-.RS
Passed unchanged to \fBdpkg\-source\fP. See its manual page.
-.RE
.TP
.BI \-\-source\-option= opt
Pass option \fIopt\fP to \fBdpkg\-source\fP.
.TP
.BI \-\-changes\-option= opt
Pass option \fIopt\fP to \fBdpkg\-genchanges\fP.
-.P
+.TP
.BI \-\-admindir= dir
-.br
+.TQ
.BI "\-\-admindir " dir
-.RS
Change the location of the \fBdpkg\fR database. The default location is
\fI/var/lib/dpkg\fP.
-.RE
.TP
.BR \-? ", " \-\-help
Show the usage message and exit.
diff --git a/man/dpkg.1 b/man/dpkg.1
index bc6dc34..24eed90 100644
--- a/man/dpkg.1
+++ b/man/dpkg.1
@@ -564,11 +564,10 @@ be marked selected for deinstallation.
.BR \-E ", " \-\-skip\-same\-version
Don't install the package if the same version of the package is already
installed.
-.P
+.TP
.BI \-\-pre\-invoke= command
-.br
+.TQ
.BI \-\-post\-invoke= command
-.RS
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
@@ -577,12 +576,10 @@ 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.
-.RE
-.P
+.TP
.BI \-\-path\-exclude= glob-pattern
-.br
+.TQ
.BI \-\-path\-include= glob-pattern
-.RS
Set \fIglob-pattern\fP as a path filter, either by excluding or re-including
previously excluded paths matching the specified patterns during install.
@@ -612,7 +609,6 @@ to remove all documentation files except the copyright
files.
These two options can be specified multiple times, and interleaved with
each other. Both are processed in the given order, with the last rule that
matches a file name making the decision.
-.RE
.TP
\fB\-\-status\-fd \fR\fIn\fR
Send machine-readable package status and progress information to file
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
