Explorar el Código

man: Mark some words and commands as non-hyphenable

Guillem Jover hace 11 años
padre
commit
4c8db8e1b9
Se han modificado 6 ficheros con 16 adiciones y 15 borrados
  1. 1 0
      debian/changelog
  2. 3 3
      man/deb-control.5
  3. 1 1
      man/deb-src-control.5
  4. 6 6
      man/dpkg-architecture.1
  5. 3 3
      man/dpkg-buildflags.1
  6. 2 2
      man/dpkg-buildpackage.1

+ 1 - 0
debian/changelog

@@ -118,6 +118,7 @@ dpkg (1.18.0) UNRELEASED; urgency=low
     - Document dselect -? option.
     - Document in dpkg-buildflags(1) that DEB_VENDOR influences the execution.
     - Document that dpkg performs sanity checks on PATH.
+    - Mark some words and commands as non-hyphenable in man pages.
   * Output message fixes and improvements:
     - Remove trailing newline from string literal in warning calls.
     - Say “execute” instead of “exec” in Dpkg::Changelog::Parse error message.

+ 3 - 3
man/deb-control.5

@@ -109,14 +109,14 @@ The name of the distribution this package is originating from.
 .BI Bugs: " url"
 The \fIurl\fP of the bug tracking system for this package. The current
 used format is \fIbts-type\fP\fB://\fP\fIbts-address\fP, like
-\fBdebbugs://bugs.debian.org\fP.
+\fB\%debbugs://bugs.debian.org\fP.
 .TP
 .BI Homepage: " url"
 The upstream project home page \fIurl\fP.
 .TP
 .BI Tag: " tag-list"
 List of tags describing the qualities of the package. The description and
-list of supported tags can be found in the \fBdebtags\fP package.
+list of supported tags can be found in the \fB\%debtags\fP package.
 .TP
 .BR Multi\-Arch: " \fBsame\fP|\fBforeign\fP|\fBallowed\fP|\fBno\fP"
 This field is used to indicate how this package should behave on a multi-arch
@@ -216,7 +216,7 @@ Lists packages that conflict with this one, for example by containing
 files with the same names. The package maintenance software will not
 allow conflicting packages to be installed at the same time. Two
 conflicting packages should each include a
-.B Conflicts
+.B \%Conflicts
 line mentioning the other.
 .TP
 .BI Replaces: " package-list"

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

@@ -79,7 +79,7 @@ The upstream project home page URL.
 .BI Bugs: " url"
 The \fIurl\fP of the bug tracking system for this package. The current
 used format is \fIbts-type\fP\fB://\fP\fIbts-address\fP, like
-\fBdebbugs://bugs.debian.org\fP. This field is usually not needed.
+\fB\%debbugs://bugs.debian.org\fP. This field is usually not needed.
 
 .TP
 .BI Vcs\-Arch: " url"

+ 6 - 6
man/dpkg-architecture.1

@@ -43,7 +43,7 @@ or the same as the build architecture if \fBCC\fP or gcc are both not
 available. One out of \fB\-\-host\-arch\fR and \fB\-\-host\-type\fR is
 sufficient, the value of the
 other will be set to a usable default. Indeed, it is often better to only
-specify one, because \fBdpkg\-architecture\fP will warn you if your choice
+specify one, because \fB\%dpkg\-architecture\fP will warn you if your choice
 does not match the default.
 .
 .SH COMMANDS
@@ -124,10 +124,10 @@ specified endianness (since dpkg 1.17.14). Either \fBlittle\fP or \fBbig\fP.
 .TP
 .BR \-f ", " \-\-force
 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 \fB\%dpkg\-architecture\fP), except if
 this force flag is present. This allows the user
-to override a value even when the call to \fBdpkg\-architecture\fP is buried
-in some other script (for example \fBdpkg\-buildpackage\fP(1)).
+to override a value even when the call to \fB\%dpkg\-architecture\fP is buried
+in some other script (for example \fB\%dpkg\-buildpackage\fP(1)).
 .
 .SH TERMS
 .IP "build machine" 4
@@ -231,7 +231,7 @@ Makefile snippet that properly sets and exports all the variables that
 .
 .SH EXAMPLES
 \fBdpkg\-buildpackage\fP accepts the \fB\-a\fR option and passes it to
-\fBdpkg\-architecture\fP. Other examples:
+\fB\%dpkg\-architecture\fP. Other examples:
 .IP
 CC=i386\-gnu\-gcc dpkg\-architecture \-c debian/rules build
 .IP
@@ -255,7 +255,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 \fB\-q\fP option. Here are some examples,
+\fB\%dpkg\-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

+ 3 - 3
man/dpkg-buildflags.1

@@ -373,7 +373,7 @@ This setting (disabled by default) adds
 .B \-Wdate\-time
 to \fBCPPFLAGS\fP.
 This will cause warnings when the \fB__TIME__\fP, \fB__DATE__\fP and
-\fB__TIMESTAMP__\fP macros are used.
+\fB\%__TIMESTAMP__\fP macros are used.
 .
 .SH ENVIRONMENT
 There are 2 sets of environment variables doing the same operations, the
@@ -435,7 +435,7 @@ supported by \fBdpkg-buildflags\fP into variables (since dpkg 1.16.1).
 .TP
 .B DEB_VENDOR
 This setting defines the current vendor. If not set, it will discover the
-current vendor by reading \fB/etc/dpkg/origins/default\fP.
+current vendor by reading \fB\%/etc/dpkg/origins/default\fP.
 .
 .SH EXAMPLES
 To pass build flags to a build command in a makefile:
@@ -480,7 +480,7 @@ options to configure or \fBmake\fP(1) directly, as shown above.
 For other build systems, or when you need more fine-grained control
 about which flags are passed where, you can use \fB\-\-get\fP. Or you
 can include \fBbuildflags.mk\fP instead, which takes care of calling
-\fBdpkg\-buildflags\fP and storing the build flags in make variables.
+\fB\%dpkg\-buildflags\fP and storing the build flags in make variables.
 .PP
 If you want to export all buildflags into the environment (where they
 can be picked up by your build system):

+ 2 - 2
man/dpkg-buildpackage.1

@@ -184,12 +184,12 @@ the number of online processors if \fBauto\fP is specified
 equivalent to the
 .BR make (1)
 option of the same name (since dpkg 1.14.7).
-Will add itself to the \fBMAKEFLAGS\fP
+Will add itself to the \fB\%MAKEFLAGS\fP
 environment variable, which should cause all subsequent make
 invocations to inherit the option. Also adds \fBparallel=\fP\fIjobs\fP or
 \fBparallel=\fP 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 or \fBparallel=\fP option in
+The \fB\%parallel=\fP\fIjobs\fP or \fBparallel=\fP option in
 \fBDEB_BUILD_OPTIONS\fP environment variable will override the \fB\-j\fP
 value if this option is given.
 Note that the \fBauto\fP value will get replaced by the actual number of