Просмотр исходного кода

man: Use .TQ instead of .TP and .PD 0 or other ad-hoc markup

Guillem Jover лет назад: 13
Родитель
Сommit
08ba74db5c
4 измененных файлов с 36 добавлено и 70 удалено
  1. 2 5
      man/deb-control.5
  2. 14 32
      man/deb-src-control.5
  3. 16 25
      man/dpkg-buildpackage.1
  4. 4 8
      man/dpkg.1

+ 2 - 5
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.
 different than the name of the package itself.
 
 
 .TP
 .TP
-.PD 0
 .BI Subarchitecture: " value"
 .BI Subarchitecture: " value"
-.TP
-.PD 0
+.TQ
 .BI Kernel\-Version: " value"
 .BI Kernel\-Version: " value"
-.TP
-.PD
+.TQ
 .BI Installer\-Menu\-Item: " value"
 .BI Installer\-Menu\-Item: " value"
 These fields are used by the debian\-installer and are usually not needed.
 These fields are used by the debian\-installer and are usually not needed.
 See /usr/share/doc/debian\-installer/devel/modules.txt from the
 See /usr/share/doc/debian\-installer/devel/modules.txt from the

+ 14 - 32
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.
 assumed if the field is absent. More types might be added in the future.
 
 
 .TP
 .TP
-.PD 0
 .BI Subarchitecture: " value"
 .BI Subarchitecture: " value"
-.TP
-.PD 0
+.TQ
 .BI Kernel\-Version: " value"
 .BI Kernel\-Version: " value"
-.TP
-.PD 0
+.TQ
 .BI Installer\-Menu\-Item: " value"
 .BI Installer\-Menu\-Item: " value"
 These fields are used by the debian\-installer and are usually not needed.
 These fields are used by the debian\-installer and are usually not needed.
 See /usr/share/doc/debian\-installer/devel/modules.txt from the
 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.
 package for more details about them.
 
 
 .TP
 .TP
-.PD 0
 .BR Essential: " \fByes\fP|\fBno\fP"
 .BR Essential: " \fByes\fP|\fBno\fP"
-.TP
-.PD 0
+.TQ
 .BR Multi\-Arch: " \fBsame\fP|\fBforeign\fP|\fBallowed\fP"
 .BR Multi\-Arch: " \fBsame\fP|\fBforeign\fP|\fBallowed\fP"
-.TP
-.PD 0
+.TQ
 .BI Tag: " tag-list"
 .BI Tag: " tag-list"
-.TP
-.PD 0
+.TQ
 .BR Description: " \fIshort-description\fP (required)"
 .BR Description: " \fIshort-description\fP (required)"
 These fields are described in the
 These fields are described in the
 .BR deb\-control (5)
 .BR deb\-control (5)
@@ -268,36 +261,25 @@ manual page, as they are copied literally to the control file of the binary
 package.
 package.
 
 
 .TP
 .TP
-.PD 0
 .BI Depends: " package-list"
 .BI Depends: " package-list"
-.TP
-.PD 0
+.TQ
 .BI Pre\-Depends: " package-list"
 .BI Pre\-Depends: " package-list"
-.TP
-.PD 0
+.TQ
 .BI Recommends: " package-list"
 .BI Recommends: " package-list"
-.TP
-.PD 0
+.TQ
 .BI Suggests: " package-list"
 .BI Suggests: " package-list"
-.TP
-.PD 0
+.TQ
 .BI Breaks: " package-list"
 .BI Breaks: " package-list"
-.TP
-.PD 0
+.TQ
 .BI Enhances: " package-list"
 .BI Enhances: " package-list"
-.TP
-.PD 0
+.TQ
 .BI Replaces: " package-list"
 .BI Replaces: " package-list"
-.TP
-.PD 0
+.TQ
 .BI Conflicts: " package-list"
 .BI Conflicts: " package-list"
-.TP
-.PD 0
+.TQ
 .BI Provides: " package-list"
 .BI Provides: " package-list"
-.TP
-.PD 0
+.TQ
 .BI Built\-Using: " package-list"
 .BI Built\-Using: " package-list"
-.br
 These fields declare relationships between packages. They are discussed in
 These fields declare relationships between packages. They are discussed in
 the
 the
 .BR deb\-control (5)
 .BR deb\-control (5)

+ 16 - 25
man/dpkg-buildpackage.1

@@ -90,40 +90,36 @@ Passed to \fBdpkg\-genchanges\fP.
 .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.
 This is the same as the default case when no build option is specified.
 This is the same as the default case when no build option is specified.
-.P
+.TP
 .BI \-\-target= target
 .BI \-\-target= target
-.br
+.TQ
 .BI "\-\-target " target
 .BI "\-\-target " target
-.br
+.TQ
 .BI \-T target
 .BI \-T target
-.RS
 Calls \fBdebian/rules\fP \fItarget\fP after having setup the build
 Calls \fBdebian/rules\fP \fItarget\fP after having setup the build
 environment and stops the package build process here. If
 environment and stops the package build process here. If
 \fB\-\-as\-root\fP is also given, then the command is executed
 \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
 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.
 be run as root by the Debian policy do not need this option.
-.RE
 .TP
 .TP
 .B \-\-as\-root
 .B \-\-as\-root
 Only meaningful together with \fB\-\-target\fP. Requires that the target be
 Only meaningful together with \fB\-\-target\fP. Requires that the target be
 run with root rights.
 run with root rights.
-.P
+.TP
 .B \-si
 .B \-si
-.br
+.TQ
 .B \-sa
 .B \-sa
-.br
+.TQ
 .B \-sd
 .B \-sd
-.br
+.TQ
 .BI \-v version
 .BI \-v version
-.br
+.TQ
 .BI \-C changes-description
 .BI \-C changes-description
-.br
+.TQ
 .BI \-m maintainer-address
 .BI \-m maintainer-address
-.br
+.TQ
 .BI \-e maintainer-address
 .BI \-e maintainer-address
-.RS
 Passed unchanged to \fBdpkg\-genchanges\fP. See its manual page.
 Passed unchanged to \fBdpkg\-genchanges\fP. See its manual page.
-.RE
 .TP
 .TP
 .BI \-a architecture
 .BI \-a architecture
 Specify the Debian architecture we build for. The architecture of the
 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
 .BR \-\-force\-sign
 Force the signing of the resulting files (since dpkg 1.17.0),
 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.
 regardless of \fB\-us\fP or \fB\-uc\fP or other internal heuristics.
-.P
+.TP
 .BR \-i [\fIregexp\fP]
 .BR \-i [\fIregexp\fP]
-.br
+.TQ
 .BI \-I [\fIpattern\fP]
 .BI \-I [\fIpattern\fP]
-.br
+.TQ
 .BR \-s [ nsAkurKUR ]
 .BR \-s [ nsAkurKUR ]
-.br
+.TQ
 .BR \-z ", " \-Z
 .BR \-z ", " \-Z
-.br
-.RS
 Passed unchanged to \fBdpkg\-source\fP. See its manual page.
 Passed unchanged to \fBdpkg\-source\fP. See its manual page.
-.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
+.TP
 .BI \-\-admindir= dir
 .BI \-\-admindir= dir
-.br
+.TQ
 .BI "\-\-admindir " dir
 .BI "\-\-admindir " dir
-.RS
 Change the location of the \fBdpkg\fR database. The default location is
 Change the location of the \fBdpkg\fR database. The default location is
 \fI/var/lib/dpkg\fP.
 \fI/var/lib/dpkg\fP.
-.RE
 .TP
 .TP
 .BR \-? ", " \-\-help
 .BR \-? ", " \-\-help
 Show the usage message and exit.
 Show the usage message and exit.

+ 4 - 8
man/dpkg.1

@@ -564,11 +564,10 @@ be marked selected for deinstallation.
 .BR \-E ", " \-\-skip\-same\-version
 .BR \-E ", " \-\-skip\-same\-version
 Don't install the package if the same version of the package is already
 Don't install the package if the same version of the package is already
 installed.
 installed.
-.P
+.TP
 .BI \-\-pre\-invoke= command
 .BI \-\-pre\-invoke= command
-.br
+.TQ
 .BI \-\-post\-invoke= command
 .BI \-\-post\-invoke= command
-.RS
 Set an invoke hook \fIcommand\fP to be run via \*(lqsh \-c\*(rq before or
 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,
 after the dpkg run for the \fIunpack\fP, \fIconfigure\fP, \fIinstall\fP,
 \fItriggers\-only\fP, \fIremove\fP and \fIpurge\fP dpkg actions. This
 \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
 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
 current dpkg action. Note: front-ends might call dpkg several times per
 invocation, which might run the hooks more times than expected.
 invocation, which might run the hooks more times than expected.
-.RE
-.P
+.TP
 .BI \-\-path\-exclude= glob-pattern
 .BI \-\-path\-exclude= glob-pattern
-.br
+.TQ
 .BI \-\-path\-include= glob-pattern
 .BI \-\-path\-include= glob-pattern
-.RS
 Set \fIglob-pattern\fP as a path filter, either by excluding or re-including
 Set \fIglob-pattern\fP as a path filter, either by excluding or re-including
 previously excluded paths matching the specified patterns during install.
 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
 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
 each other. Both are processed in the given order, with the last rule that
 matches a file name making the decision.
 matches a file name making the decision.
-.RE
 .TP
 .TP
 \fB\-\-status\-fd \fR\fIn\fR
 \fB\-\-status\-fd \fR\fIn\fR
 Send machine-readable package status and progress information to file
 Send machine-readable package status and progress information to file