This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=1c6c7ecec252f3d448fb43dc8defc3ad83121a72 commit 1c6c7ecec252f3d448fb43dc8defc3ad83121a72 Author: Guillem Jover <[email protected]> AuthorDate: Tue May 12 04:53:38 2020 +0200 man: Do not nest font markup This makes the conversion from roff to POD easier. --- debian/changelog | 1 + man/deb-changes.man | 2 +- man/deb-shlibs.man | 2 +- man/deb-src-control.man | 2 +- man/deb-src-symbols.man | 6 +++--- man/deb-substvars.man | 4 ++-- man/dpkg-name.man | 2 +- man/dpkg-query.man | 2 +- man/dpkg-shlibdeps.man | 10 +++++----- man/dpkg-source.man | 5 +++-- man/dpkg-split.man | 2 +- man/dpkg-statoverride.man | 4 ++-- man/dpkg.man | 12 ++++++------ man/dsc.man | 2 +- 14 files changed, 29 insertions(+), 27 deletions(-) diff --git a/debian/changelog b/debian/changelog index 589268106..9a67a3410 100644 --- a/debian/changelog +++ b/debian/changelog @@ -80,6 +80,7 @@ dpkg (1.20.1) UNRELEASED; urgency=medium - man: Place description of override value column on its own paragraph. - man: Surround markup within verbatim blocks with .nf/.fi. - man: Balance font markup. + - man: Do not nest font markup. * Code internals: - Use $() in shell or qx() in perl instead of ``. - dpkg-split: Switch part number variables from unsigned int to int. diff --git a/man/deb-changes.man b/man/deb-changes.man index 9f28fd5ba..bf1012d77 100644 --- a/man/deb-changes.man +++ b/man/deb-changes.man @@ -111,7 +111,7 @@ typically the person who prepared the package changes for this release. .TP .BR Description: " (recommended)" .TQ -.RB " \fIbinary-package-name\fP " \fB\-\fP " \fIbinary-package-summary\fP" +.RB " \fIbinary-package-name\fP " \- " \fIbinary-package-summary\fP" This multiline field contains a list of binary package names followed by a space, a dash (‘\fB\-\fP’) and their possibly truncated short descriptions. diff --git a/man/deb-shlibs.man b/man/deb-shlibs.man index 9f89baf34..ce8788641 100644 --- a/man/deb-shlibs.man +++ b/man/deb-shlibs.man @@ -35,7 +35,7 @@ entry per line. Blank lines are \fBnot\fP allowed. Lines beginning with an \fB#\fP character are considered commentary, and are ignored. All other lines must have the format: .IP -.RI [ type\fB:\fP ] +.RI [ type \fB:\fP] .I library .I version .I dependencies diff --git a/man/deb-src-control.man b/man/deb-src-control.man index 6af048b53..413727693 100644 --- a/man/deb-src-control.man +++ b/man/deb-src-control.man @@ -76,7 +76,7 @@ This documents the most recent version of the distribution policy standards this package complies with. .TP -.BI Description " \fIshort-description\fP" +.BR Description " \fIshort-description\fP" .TQ .BI " " "long-description" The format for the source package description is a short brief summary on the diff --git a/man/deb-src-symbols.man b/man/deb-src-symbols.man index 6cccc37eb..a73e06e99 100644 --- a/man/deb-src-symbols.man +++ b/man/deb-src-symbols.man @@ -106,11 +106,11 @@ not cause ABI breakage. For example, most of C++ template instantiations fall into this category. Like any other tag, this one may also have an arbitrary value: it could be used to indicate why the symbol is considered optional. .TP -.B arch=\fIarchitecture-list\fR +.BI arch= architecture-list .TQ -.B arch\-bits=\fIarchitecture-bits\fR +.BI arch\-bits= architecture-bits .TQ -.B arch\-endian=\fIarchitecture-endianness\fR +.BI arch\-endian= architecture-endianness These tags allow one to restrict the set of architectures where the symbol is supposed to exist. The \fBarch\-bits\fP and \fBarch\-endian\fP tags are supported since dpkg 1.18.0. When the symbols list is updated with diff --git a/man/deb-substvars.man b/man/deb-substvars.man index 7fffc17d8..5fbb80dcd 100644 --- a/man/deb-substvars.man +++ b/man/deb-substvars.man @@ -39,7 +39,7 @@ and to standard output for they perform some variable substitutions on the output file. A variable substitution has the form -.BI ${ variable-name }\fR. +.BR ${ \fIvariable-name\fP } . Variable names consist of alphanumerics (a-zA-Z0-9), hyphens (-) and colons (:) and start with an alphanumeric, and are case-sensitive, even though they might refer to other entities which are case-preserving. @@ -90,7 +90,7 @@ common option. They can be also specified in the file (or whatever other file is specified using the .B \-T option). This file consists of lines of the form -.IB name = value\fR. +.IR name \fB=\fP value . Trailing whitespace on each line, blank lines, and lines starting with a .B # diff --git a/man/dpkg-name.man b/man/dpkg-name.man index f17bcc693..513152606 100644 --- a/man/dpkg-name.man +++ b/man/dpkg-name.man @@ -96,7 +96,7 @@ The accepted values are: \fB0\fP and \fB1\fP (default). . .SH BUGS Some packages don't follow the name structure -.IB package _ version _ architecture .deb\fR.\fP +.IR package \fB_\fP version \fB_\fP architecture \fB.deb\fP. Packages renamed by \fBdpkg\-name\fP will follow this structure. Generally this will have no impact on how packages are installed by diff --git a/man/dpkg-query.man b/man/dpkg-query.man index ea71c521c..168cfad16 100644 --- a/man/dpkg-query.man +++ b/man/dpkg-query.man @@ -205,7 +205,7 @@ commands, which now default to only querying the status file .B \-\-no\-pager Disables the use of any pager when showing information (since dpkg 1.19.2). .TP -.BR \-f ", " \-\-showformat=\fIformat\fR +.BR \-f ", " \-\-showformat= \fIformat\fR This option is used to specify the format of the output \fB\-\-show\fP will produce (short option since dpkg 1.13.1). The format is a string that will be output for each package listed. diff --git a/man/dpkg-shlibdeps.man b/man/dpkg-shlibdeps.man index 8c3fae2a3..2e9a719df 100644 --- a/man/dpkg-shlibdeps.man +++ b/man/dpkg-shlibdeps.man @@ -27,7 +27,7 @@ dpkg\-shlibdeps \- generate shared library substvar dependencies . .SH SYNOPSIS .B dpkg\-shlibdeps -.RI [ option "...] [" \fB\-e\fP ] executable " [" option ...] +.RI [ option "...] [\fB\-e\fP] " executable " [" option ...] . .SH DESCRIPTION .B dpkg\-shlibdeps @@ -132,7 +132,7 @@ than another dependency). .B dpkg\-shlibdeps interprets non-option arguments as executable names, just as if they'd been supplied as -.BI \-e executable\fR. +.BR \-e \fIexecutable\fP. .TP .BI \-e executable Include dependencies appropriate for the shared libraries required by @@ -154,13 +154,13 @@ problematic when cross-compiling for example. Add dependencies to be added to the control file dependency field .IR dependency-field . (The dependencies for this field are placed in the variable -.BI shlibs: dependency-field\fR.) +.BR shlibs: \fIdependency-field\fR.) The .BI \-d dependency-field option takes effect for all executables after the option, until the next -.BI \-d dependency-field\fR. +.BR \-d \fIdependency-field\fR. The default .I dependency-field is @@ -363,7 +363,7 @@ in \fIlibrary-file\fR but 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 package with the help of -.BI "dpkg \-S " library-file\fR. +.BR "dpkg \-S " \fIlibrary-file\fP. Then it checked the corresponding shlibs and symbols files in %ADMINDIR%/info/, and in the various package's build trees (debian/*/DEBIAN/). diff --git a/man/dpkg-source.man b/man/dpkg-source.man index 30e6a94de..e87f6a1cb 100644 --- a/man/dpkg-source.man +++ b/man/dpkg-source.man @@ -340,7 +340,7 @@ should be used instead. .TP .B \-sk Specifies to expect the original source as a tarfile, by default -.IB package _ upstream-version .orig.tar. extension \fR. +.IR package \fB_\fP upstream-version \fB.orig.tar.\fP extension . It will leave this original source in place as a tarfile, or copy it to the current directory if it isn't already there. The tarball will be unpacked into @@ -862,7 +862,8 @@ Exactly like \fBdebian/source/options\fP except that the file is not included in the generated source package. It can be useful to store a preference tied to the maintainer or to the VCS repository where the source package is maintained. -.SS debian/source/local\-patch\-header \fRand\fP 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 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. diff --git a/man/dpkg-split.man b/man/dpkg-split.man index e08cfb3a3..244c95ace 100644 --- a/man/dpkg-split.man +++ b/man/dpkg-split.man @@ -84,7 +84,7 @@ been generated by the same invocation of The parts' filenames are not significant for the reassembly process. By default the output file is called -.IB package _ version _ arch .deb\fR. +.IR package \fB_\fP version \fB_\fP arch \fB.deb\fP. .TP .BR \-I ", " \-\-info " \fIpart\fP..." diff --git a/man/dpkg-statoverride.man b/man/dpkg-statoverride.man index 984b2898e..bd7592c56 100644 --- a/man/dpkg-statoverride.man +++ b/man/dpkg-statoverride.man @@ -88,9 +88,9 @@ Set the root directory to \fBdirectory\fP, which sets the installation directory to «\fIdirectory\fP» and the administrative directory to «\fIdirectory\fP\fB%ADMINDIR%\fP» (since dpkg 1.19.2). .TP -.B \-\-force\-\fIthings\fP +.BI \-\-force\- things .TQ -.BR \-\-no\-force\-\fIthings\fP ", " \-\-refuse\-\fIthings\fP +.BR \-\-no\-force\- "\fIthings\fP, " \-\-refuse\- \fIthings\fP Force or refuse (\fBno\-force\fP and \fBrefuse\fP mean the same thing) to do some things (since dpkg 1.19.5). \fIthings\fP is a comma separated list of things specified below. diff --git a/man/dpkg.man b/man/dpkg.man index 5401cf39c..4e1dcccc9 100644 --- a/man/dpkg.man +++ b/man/dpkg.man @@ -343,14 +343,14 @@ selections. Returns 0 when a package is printed, 1 when no suitable package is available and 2 on error. .TP -.B \-\-add\-architecture \fIarchitecture\fP +.BR \-\-add\-architecture " \fIarchitecture\fP" Add \fIarchitecture\fP to the list of architectures for which packages can be installed without using \fB\-\-force\-architecture\fP (since dpkg 1.16.2). The architecture \fBdpkg\fP is built for (i.e. the output of \fB\-\-print\-architecture\fP) is always part of that list. .TP -.B \-\-remove\-architecture \fIarchitecture\fP +.BR \-\-remove\-architecture " \fIarchitecture\fP" Remove \fIarchitecture\fP from the list of architectures for which packages can be installed without using \fB\-\-force\-architecture\fP (since dpkg 1.16.2). If the @@ -413,7 +413,7 @@ Validates the given architecture name (since dpkg 1.18.16). Validates the given version (since dpkg 1.18.16). .RE .TP -.B \-\-compare\-versions \fIver1 op ver2\fP +.BR \-\-compare\-versions " \fIver1\fP \fIop\fP \fIver2\fP" Compare version numbers, where \fIop\fP is a binary operator. \fBdpkg\fP returns true (\fB0\fP) if the specified condition is satisfied, and false (\fB1\fP) otherwise. There are @@ -426,7 +426,7 @@ only for compatibility with control file syntax: \fB< << <= = >= >> be used, due to confusing semantics. To illustrate: \fB0.1 < 0.1\fP evaluates to true. .\" .TP -.\" .B \-\-command\-fd \fIn\fP +.\" .BR \-\-command\-fd " \fIn\fP" .\" Accept a series of commands on input file descriptor \fIn\fP. .\" .IP .\" \fBNote:\fP Additional options set on the command line, and through this @@ -543,9 +543,9 @@ debugging values. 1000 Lots of drivel about e.g. the dpkg/info dir 2000 Insane amounts of drivel .TP -.B \-\-force\-\fIthings\fP +.BI \-\-force\- things .TQ -.BR \-\-no\-force\-\fIthings\fP ", " \-\-refuse\-\fIthings\fP +.BR \-\-no\-force\- "\fIthings\fP, " \-\-refuse\- \fIthings\fP Force or refuse (\fBno\-force\fP and \fBrefuse\fP mean the same thing) to do some things. \fIthings\fP is a comma separated list of things specified below. \fB\-\-force\-help\fP displays a message describing them. diff --git a/man/dsc.man b/man/dsc.man index ec59c4485..643d35a19 100644 --- a/man/dsc.man +++ b/man/dsc.man @@ -109,7 +109,7 @@ Lists all the names and email addresses of co-maintainers of the package, in the same format as the \fBMaintainer\fP field. Multiple co-maintainers should be separated by a comma. .TP -.BI Description " \fIshort-description\fP" +.BR Description " \fIshort-description\fP" .TQ .BI " " "long-description" The format for the source package description is a short brief summary on the -- Dpkg.Org's dpkg
