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=bc628ec488b0fb11b629eb0143101bcf04e759b0 commit bc628ec488b0fb11b629eb0143101bcf04e759b0 Author: Guillem Jover <[email protected]> AuthorDate: Wed May 6 07:44:05 2020 +0200 man: Markup examples explicitly with .EX/.EE Use .EX/.EE to markup examples. Remove font markup within examples as that cannot be easily done in POD. --- debian/changelog | 1 + man/deb-changelog.man | 4 +- man/deb-conffiles.man | 4 +- man/deb-control.man | 4 +- man/deb-origin.man | 4 +- man/deb-shlibs.man | 2 + man/deb-src-control.man | 4 +- man/deb-src-symbols.man | 26 ++++++++++++ man/deb-substvars.man | 4 ++ man/deb-symbols.man | 6 ++- man/deb822.man | 4 +- man/dpkg-architecture.man | 24 +++++++---- man/dpkg-buildflags.man | 36 +++++++++-------- man/dpkg-divert.man | 20 ++++++--- man/dpkg-maintscript-helper.man | 6 ++- man/dpkg-mergechangelogs.man | 2 + man/dpkg-query.man | 21 ++++++---- man/dpkg-source.man | 2 + man/dpkg.man | 90 ++++++++++++++++++++++++----------------- man/start-stop-daemon.man | 12 +++--- man/update-alternatives.man | 16 +++++--- 21 files changed, 192 insertions(+), 100 deletions(-) diff --git a/debian/changelog b/debian/changelog index adcf521d8..7ced9d768 100644 --- a/debian/changelog +++ b/debian/changelog @@ -52,6 +52,7 @@ dpkg (1.20.1) UNRELEASED; urgency=medium - man: Clarify POSIX shell eval command usage in dpkg-architecture(1). - man: Use item lists instead of verbatim or hand-crafted formatting. - man: Do not use verbatim formatting for text that is not an example. + - man: Markup examples explicitly with .EX/.EE. * Build system: - Handle .git being a plain file when getting the dpkg tree version. - Add debian/changelog as a Changes file to the CPAN distribution. diff --git a/man/deb-changelog.man b/man/deb-changelog.man index 2f449305a..f407f99d2 100644 --- a/man/deb-changelog.man +++ b/man/deb-changelog.man @@ -162,7 +162,7 @@ The entire changelog must be encoded in UTF-8. .TP .I debian/changelog .SH EXAMPLES -.nf +.EX dpkg (1.17.18) unstable; urgency=low [ Guillem Jover ] @@ -178,7 +178,7 @@ dpkg (1.17.18) unstable; urgency=low * German (Sven Joachim). \-\- Guillem Jover <[email protected]> Sun, 12 Oct 2014 15:47:44 +0200 -.fi +.EE . .SH SEE ALSO .BR deb822 (5), diff --git a/man/deb-conffiles.man b/man/deb-conffiles.man index 6aa94eb5b..49675f1b0 100644 --- a/man/deb-conffiles.man +++ b/man/deb-conffiles.man @@ -35,12 +35,12 @@ package, otherwise \fBdpkg\fP(1) will ignore them (although by default Trailing whitespace will be trimmed, and empty lines will be ignored. . .SH EXAMPLE -.nf +.EX %CONFDIR%/alternatives/README %CONFDIR%/cron.daily/dpkg %PKGCONFDIR%/dpkg.cfg %CONFDIR%/logrotate.d/dpkg -.fi +.EE . .SH SEE ALSO .BR dpkg\-deb (1), diff --git a/man/deb-control.man b/man/deb-control.man index cfc9d9ef6..2b4e1ec57 100644 --- a/man/deb-control.man +++ b/man/deb-control.man @@ -354,7 +354,7 @@ of these within the package. The format or the way to compute each build-id is not defined by design. . .SH EXAMPLE -.nf +.EX Package: grep Essential: yes Priority: required @@ -374,7 +374,7 @@ Description: GNU grep, egrep and fgrep. look at every character. The result is typically many times faster than Unix grep or egrep. (Regular expressions containing backreferencing will run more slowly, however). -.fi +.EE . .SH BUGS The \fBBuild\-Ids\fP field uses a rather generic name out of its original diff --git a/man/deb-origin.man b/man/deb-origin.man index 5f63b224d..63d20bdf0 100644 --- a/man/deb-origin.man +++ b/man/deb-origin.man @@ -58,10 +58,10 @@ debbugs URL (e.g., debbugs://bugs.debian.org/). The value of this field determines the vendor name of the vendor that this vendor derives from. .SH EXAMPLE -.nf +.EX Vendor: Debian Vendor\-URL: https://www.debian.org/ Bugs: debbugs://bugs.debian.org -.fi +.EE .SH SEE ALSO .BR dpkg\-vendor (1) diff --git a/man/deb-shlibs.man b/man/deb-shlibs.man index 03d0be6a1..1e6617405 100644 --- a/man/deb-shlibs.man +++ b/man/deb-shlibs.man @@ -67,7 +67,9 @@ that provides one library whose SONAME is .IR libcrunch.so.1 , might read .IP +.EX libcrunch 1 libcrunch1 (>= 1.2-1) +.EE .PP The \fIdependencies\fP must mention the most recent version of the package that added new diff --git a/man/deb-src-control.man b/man/deb-src-control.man index a96c6697d..6af048b53 100644 --- a/man/deb-src-control.man +++ b/man/deb-src-control.man @@ -447,7 +447,7 @@ recognized fields. To avoid such potential situation you can prefix those fields with \fBPrivate\-\fP, such as \fBXB\-Private\-New\-Field\fP. .SH EXAMPLE -.nf +.EX # Comment Source: dpkg Section: admin @@ -480,7 +480,7 @@ Description: Debian package development tools . Most Debian source packages will require additional tools to build; for example, most packages need make and the C compiler gcc. -.fi +.EE .SH SEE ALSO .BR deb\-control (5), diff --git a/man/deb-src-symbols.man b/man/deb-src-symbols.man index ff88dc030..2f94010ba 100644 --- a/man/deb-src-symbols.man +++ b/man/deb-src-symbols.man @@ -66,9 +66,11 @@ whitespaces in them. However, if there are no tags specified for the symbol, quotes are treated as part of the symbol name which continues up until the first space. .P +.EX (tag1=i am marked|tag name with space)"tagged quoted symbol"@Base 1.0 (optional)tagged_unquoted_symbol@Base 1.0 1 untagged_symbol@Base 1.0 +.EE .P The first symbol in the example is named \fItagged quoted symbol\fR and has two tags: \fItag1\fR with value \fIi am marked\fR and \fItag name with space\fR @@ -137,23 +139,31 @@ will be considered only on alpha, any\-amd64 and ia64 architectures, the second only on linux architectures, while the third one anywhere except on armel. +.EX (arch=alpha any\-amd64 ia64)64bit_specific_symbol@Base 1.0 (arch=linux\-any)linux_specific_symbol@Base 1.0 (arch=!armel)symbol_armel_does_not_have@Base 1.0 +.EE The \fIarchitecture-bits\fP is either \fB32\fP or \fB64\fP. +.EX (arch-bits=32)32bit_specific_symbol@Base 1.0 (arch-bits=64)64bit_specific_symbol@Base 1.0 +.EE The \fIarchitecture-endianness\fP is either \fBlittle\fP or \fBbig\fP. +.EX (arch-endian=little)little_endian_specific_symbol@Base 1.0 (arch-endian=big)big_endian_specific_symbol@Base 1.0 +.EE Multiple restrictions can be chained. +.EX (arch-bits=32|arch-endian=little)32bit_le_symbol@Base 1.0 +.EE .TP .B ignore\-blacklist dpkg\-gensymbols has an internal blacklist of symbols that should not @@ -212,14 +222,18 @@ non-virtual thunk symbol. For example, even if _ZThn8_N3NSB6ClassDD1Ev@Base on 32bit architectures will probably be _ZThn16_N3NSB6ClassDD1Ev@Base on 64bit ones, it can be matched with a single \fIc++\fR pattern: +.EX libdummy.so.1 libdummy1 #MINVER# [...] (c++)"non\-virtual thunk to NSB::ClassD::~ClassD()@Base" 1.0 [...] +.EE The demangled name above can be obtained by executing the following command: +.EX $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt +.EE Please note that while mangled name is unique in the library by definition, this is not necessarily true for demangled names. A couple of distinct real @@ -235,11 +249,13 @@ versioned symbols where each version corresponds to the upstream version where the symbol got added. If that's the case, you can use a \fIsymver\fR pattern to match any symbol associated to the specific version. For example: +.EX libc.so.6 libc6 #MINVER# (symver)GLIBC_2.0 2.0 [...] (symver)GLIBC_2.7 2.7 access@GLIBC_2.0 2.2 +.EE All symbols associated with versions GLIBC_2.0 and GLIBC_2.7 will lead to minimal version of 2.0 and 2.7 respectively with the exception of the symbol @@ -259,9 +275,11 @@ expression is matched as it is, therefore do not forget to start it with the \fI^\fR character or it may match any part of the real symbol \fIname@version\fR string. For example: +.EX libdummy.so.1 libdummy1 #MINVER# (regex)"^mystack_.*@Base$" 1.0 (regex|optional)"private" 1.0 +.EE Symbols like "mystack_new@Base", "mystack_push@Base", "mystack_pop@Base" etc. will be matched by the first pattern while e.g. "ng_mystack_new@Base" won't. @@ -272,8 +290,10 @@ Basic patterns listed above can be combined where it makes sense. In that case, they are processed in the order in which the tags are specified. For example, both +.EX (c++|regex)"^NSA::ClassA::Private::privmethod\\d\\(int\\)@Base" 1.0 (regex|c++)N3NSA6ClassA7Private11privmethod\\dEi@Base 1.0 +.EE will match symbols "_ZN3NSA6ClassA7Private11privmethod1Ei@Base" and "_ZN3NSA6ClassA7Private11privmethod2Ei@Base". When matching the first pattern, @@ -311,17 +331,21 @@ using an include directive like this: .IP • 4 The include directive may also be tagged like any symbol: +.EX (tag|...|tagN)#include "file-to-include" +.EE As a result, all symbols included from \fIfile-to-include\fR will be considered to be tagged with \fItag\fR ... \fItagN\fR by default. You can use this feature to create a common \fIpackage\fR.symbols file which includes architecture specific symbol files: +.EX common_symbol1@Base 1.0 (arch=amd64 ia64 alpha)#include "package.symbols.64bit" (arch=!amd64 !ia64 !alpha)#include "package.symbols.32bit" common_symbol2@Base 1.0 +.EE .P The symbols files are read line by line, and include directives are processed as soon as they are encountered. This means that the content of the included @@ -337,8 +361,10 @@ library. In that case, it overrides any header line previously read. However, in general it's best to avoid duplicating header lines. One way to do it is the following: .PP +.EX #include "libsomething1.symbols.common" arch_specific_symbol@Base 1.0 +.EE .SH SEE ALSO .BR deb\-symbols (5), .BR dpkg\-shlibdeps (1), diff --git a/man/deb-substvars.man b/man/deb-substvars.man index 3b354e5cf..7fffc17d8 100644 --- a/man/deb-substvars.man +++ b/man/deb-substvars.man @@ -66,18 +66,22 @@ when the field is output. For example, if the variable \fB${Description}\fP is set to "foo is bar.${Newline}foo is great." and if you have the following field: +.EX Description: foo application ${Description} . More text. +.EE It will result in: +.EX Description: foo application foo is bar. foo is great. . More text. +.EE Variables can be set using the .B \-V diff --git a/man/deb-symbols.man b/man/deb-symbols.man index a7e019b6d..67a57be11 100644 --- a/man/deb-symbols.man +++ b/man/deb-symbols.man @@ -86,21 +86,23 @@ and \fBgomp\fP. .SH EXAMPLES .SS Simple symbols file .PP +.EX libftp.so.3 libftp3 #MINVER# DefaultNetbuf@Base 3.1-1-6 FtpAccess@Base 3.1-1-6 [...] +.EE .SS Advanced symbols file .PP +.EX libGL.so.1 libgl1 -.br | libgl1\-mesa\-glx #MINVER# -.br * Build\-Depends\-Package: libgl1\-mesa\-dev publicGlSymbol@Base 6.3-1 [...] implementationSpecificSymbol@Base 6.5.2-7 1 [...] +.EE .SH SEE ALSO .B https://wiki.debian.org/Projects/ImprovedDpkgShlibdeps .br diff --git a/man/deb822.man b/man/deb822.man index a33d68263..eb7be29e7 100644 --- a/man/deb822.man +++ b/man/deb822.man @@ -61,9 +61,9 @@ immediately before or after the value and is ignored there; it is conventional to put a single space after the colon. For example, a field might be: .RS -.nf +.EX Package: dpkg -.fi +.EE .RE the field name is \fBPackage\fP and the field value \fBdpkg\fP. diff --git a/man/dpkg-architecture.man b/man/dpkg-architecture.man index b48adb578..506b2f561 100644 --- a/man/dpkg-architecture.man +++ b/man/dpkg-architecture.man @@ -288,22 +288,30 @@ Makefile snippet that properly sets and exports all the variables that \fBdpkg\-buildpackage\fP accepts the \fB\-a\fR option and passes it to \fBdpkg\-architecture\fP. Other examples: .IP +.EX CC=i386\-gnu\-gcc dpkg\-architecture \-c debian/rules build +.EE .IP +.EX eval \`dpkg\-architecture \-u\` +.EE .PP Check if the current or specified host architecture is equal to an architecture: .IP +.EX dpkg\-architecture \-elinux\-alpha -.IP + dpkg\-architecture \-amips \-elinux\-mips +.EE .PP Check if the current or specified host architecture is a Linux system: .IP +.EX dpkg\-architecture \-ilinux\-any -.IP + dpkg\-architecture \-ai386 \-ilinux\-any +.EE . .SS Usage in debian/rules The environment variables set by \fBdpkg\-architecture\fP are passed to @@ -317,7 +325,7 @@ package: Retrieving the GNU system type and forwarding it to ./configure: .PP .RS 4 -.nf +.EX DEB_BUILD_GNU_TYPE ?= $(shell dpkg\-architecture \-qDEB_BUILD_GNU_TYPE) DEB_HOST_GNU_TYPE ?= $(shell dpkg\-architecture \-qDEB_HOST_GNU_TYPE) [...] @@ -329,19 +337,19 @@ else endif [...] \&./configure $(confflags) -.fi +.EE .RE .PP Doing something only for a specific architecture: .PP .RS 4 -.nf +.EX DEB_HOST_ARCH ?= $(shell dpkg\-architecture \-qDEB_HOST_ARCH) ifeq ($(DEB_HOST_ARCH),alpha) [...] endif -.fi +.EE .RE .PP or if you only need to check the CPU or OS type, use the @@ -351,13 +359,13 @@ Note that you can also rely on an external Makefile snippet to properly set all the variables that \fBdpkg\-architecture\fP can provide: .PP .RS 4 -.nf +.EX include %PKGDATADIR%/architecture.mk ifeq ($(DEB_HOST_ARCH),alpha) [...] endif -.fi +.EE .RE .PP In any case, you should never use \fBdpkg \-\-print\-architecture\fP to get diff --git a/man/dpkg-buildflags.man b/man/dpkg-buildflags.man index fd93b9ac8..6683ec607 100644 --- a/man/dpkg-buildflags.man +++ b/man/dpkg-buildflags.man @@ -142,7 +142,7 @@ state of all feature flags, and the compiler flags with their origin (since dpkg 1.19.0). .IP For example: -.nf +.EX Vendor: Debian Environment: DEB_CFLAGS_SET=-O0 -Wall @@ -163,7 +163,7 @@ For example: Flag: CPPFLAGS Value: -D_FORTIFY_SOURCE=2 Origin: vendor -.fi +.EE .TP .BI \-\-query\-features " area" Print the features enabled for a given area (since dpkg 1.16.2). @@ -176,13 +176,13 @@ Exits with 0 if the area is known otherwise exits with 1. The output is in RFC822 format, with one section per feature. For example: .IP -.nf +.EX Feature: pie Enabled: yes Feature: stackprotector Enabled: yes -.fi +.EE .TP .B \-\-help Show the usage message and exit. @@ -238,14 +238,18 @@ and \fBDEB_BUILD_MAINT_OPTIONS\fP environment variable's area value with the For example, to enable the \fBhardening\fP “pie” feature and disable the “fortify” feature you can do this in \fBdebian/rules\fP: .P +.EX export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,\-fortify +.EE .P The special feature \fBall\fP (valid in any area) can be used to enable or disable all area features at the same time. Thus disabling everything in the \fBhardening\fP area and enabling only “format” and “fortify” can be achieved with: .P +.EX export DEB_BUILD_MAINT_OPTIONS=hardening=\-all,+format,+fortify +.EE . .SS future Several compile-time options (detailed below) can be used to enable features @@ -579,29 +583,29 @@ supported by \fBdpkg-buildflags\fP into variables (since dpkg 1.16.1). To pass build flags to a build command in a Makefile: .PP .RS 4 -.nf +.EX $(MAKE) $(shell dpkg\-buildflags \-\-export=cmdline) \&./configure $(shell dpkg\-buildflags \-\-export=cmdline) -.fi +.EE .RE .PP To set build flags in a shell script or shell fragment, \fBeval\fP can be used to interpret the output and to export the flags in the environment: .PP .RS 4 -.nf +.EX eval "$(dpkg\-buildflags \-\-export=sh)" && make -.fi +.EE .RE .PP or to set the positional parameters to pass to a command: .PP .RS 4 -.nf +.EX eval "set \-\- $(dpkg\-buildflags \-\-export=cmdline)" for dir in a b c; do (cd $dir && ./configure "$@" && make); done -.fi +.EE .RE . .SS Usage in debian/rules @@ -624,28 +628,28 @@ If you want to export all buildflags into the environment (where they can be picked up by your build system): .PP .RS 4 -.nf +.EX DPKG_EXPORT_BUILDFLAGS = 1 include %PKGDATADIR%/buildflags.mk -.fi +.EE .RE .PP For some extra control over what is exported, you can manually export the variables (as none are exported by default): .PP .RS 4 -.nf +.EX include %PKGDATADIR%/buildflags.mk export CPPFLAGS CFLAGS LDFLAGS -.fi +.EE .RE .PP And you can of course pass the flags to commands manually: .PP .RS 4 -.nf +.EX include %PKGDATADIR%/buildflags.mk build\-arch: \& $(CC) \-o hello hello.c $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -.fi +.EE .RE diff --git a/man/dpkg-divert.man b/man/dpkg-divert.man index cacba7908..fe061e2e9 100644 --- a/man/dpkg-divert.man +++ b/man/dpkg-divert.man @@ -177,22 +177,30 @@ library has the same SONAME as the undiverted one. To divert all copies of a \fI/usr/bin/example\fR to \fI/usr/bin/example.foo\fR, i.e. directs all packages providing \fI/usr/bin/example\fR to install it as \fI/usr/bin/example.foo\fR, performing the rename if required: -.HP +.PP +.EX dpkg\-divert \-\-divert /usr/bin/example.foo \-\-rename /usr/bin/example +.EE .PP To remove that diversion: -.HP +.PP +.EX dpkg\-divert \-\-rename \-\-remove /usr/bin/example - +.EE .PP To divert any package trying to install \fI/usr/bin/example\fR to \fI/usr/bin/example.foo\fR, except your own \fIwibble\fR package: -.HP -dpkg\-divert \-\-package wibble \-\-divert /usr/bin/example.foo \-\-rename /usr/bin/example +.PP +.EX +dpkg\-divert \-\-package wibble \-\-divert /usr/bin/example.foo \\ + \-\-rename /usr/bin/example +.EE .PP To remove that diversion: -.HP +.PP +.EX dpkg\-divert \-\-package wibble \-\-rename \-\-remove /usr/bin/example +.EE . .SH SEE ALSO .BR dpkg (1). diff --git a/man/dpkg-maintscript-helper.man b/man/dpkg-maintscript-helper.man index 66f3c713c..9606d29be 100644 --- a/man/dpkg-maintscript-helper.man +++ b/man/dpkg-maintscript-helper.man @@ -240,7 +240,11 @@ depends on the command used, for \fBrm_conffile\fP and \fBmv_conffile\fP it is 1.15.7.2, for \fBsymlink_to_dir\fP and \fBdir_to_symlink\fP it is 1.17.14: .P - \fBPre\-Depends:\fP dpkg (>= 1.17.14) +.RS 4 +.EX +Pre\-Depends: dpkg (>= 1.17.14) +.EE +.RE .P 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 diff --git a/man/dpkg-mergechangelogs.man b/man/dpkg-mergechangelogs.man index 6ff993e05..259e563a3 100644 --- a/man/dpkg-mergechangelogs.man +++ b/man/dpkg-mergechangelogs.man @@ -85,9 +85,11 @@ If you want to use this program to merge Debian changelog files in a git repository, you have first to register a new merge driver in \fB.git/config\fP or \fB~/.gitconfig\fP: .P +.EX [merge "dpkg\-mergechangelogs"] name = debian/changelog merge driver driver = dpkg\-mergechangelogs \-m %O %A %B %A +.EE .P Then you have to setup the merge attribute for the debian/changelog file either in \fB.gitattributes\fP in the repository itself, or in diff --git a/man/dpkg-query.man b/man/dpkg-query.man index 2f1dee95f..ea71c521c 100644 --- a/man/dpkg-query.man +++ b/man/dpkg-query.man @@ -45,11 +45,13 @@ Normal shell wildcard characters are allowed in \fIpackage-name-pattern\fP. Please note you will probably have to quote \fIpackage-name-pattern\fP to prevent the shell from performing filename expansion. For example this will list all package names starting with “libc6”: - -.nf - \fBdpkg\-query \-l 'libc6*'\fP -.fi - +.IP +.RS 9 +.EX +dpkg\-query \-l 'libc6*' +.EE +.RE +.IP The first three columns of the output show the desired action, the package status, and errors, in that order. .IP @@ -362,9 +364,12 @@ fields) can be requested, too. They will be printed as-is, though, no conversion nor error checking is done on them. To get the name of the \fBdpkg\fP maintainer and the installed version, you could run: -.nf - \fBdpkg\-query \-W \-f='${binary:Package} ${Version}\\t${Maintainer}\\n' dpkg\fP -.fi +.RS +.EX +dpkg\-query \-f='${binary:Package} ${Version}\\t${Maintainer}\\n' \\ + \-W dpkg +.EE +.RE . .SH EXIT STATUS .TP diff --git a/man/dpkg-source.man b/man/dpkg-source.man index 67c00dc8f..aa768020a 100644 --- a/man/dpkg-source.man +++ b/man/dpkg-source.man @@ -845,6 +845,7 @@ Optional spaces are allowed around the ‘\fB=\fP’ symbol and optional quotes are allowed around the value. Here's an example of such a file: .P +.EX # let dpkg\-source create a debian.tar.bz2 with maximal compression compression = "bzip2" compression\-level = 9 @@ -852,6 +853,7 @@ Here's an example of such a file: single\-debian\-patch # ignore changes on config.{sub,guess} extend-diff-ignore = "(^|/)(config\.sub|config\.guess)$" +.EE .P \fBNote:\fP \fBformat\fR options are not accepted in this file, you should use \fBdebian/source/format\fR instead. diff --git a/man/dpkg.man b/man/dpkg.man index 89489a290..561775fa8 100644 --- a/man/dpkg.man +++ b/man/dpkg.man @@ -792,10 +792,10 @@ failures; future work might fix this. This can be used to remove all paths except some particular ones; a typical case is: -.nf -.B \-\-path\-exclude=/usr/share/doc/* -.B \-\-path\-include=/usr/share/doc/*/copyright -.fi +.EX +\-\-path\-exclude=/usr/share/doc/* +\-\-path\-include=/usr/share/doc/*/copyright +.EE to remove all documentation files except the copyright files. @@ -1081,56 +1081,74 @@ To list installed packages related to the editor \fBvi\fP(1) (note that \fBdpkg\-query\fP does not load the \fIavailable\fP file anymore by default, and the \fBdpkg\-query\fP \fB\-\-load\-avail\fP option should be used instead for that): -.br -\fB dpkg \-l '*vi*'\fP -.br +.RS +.EX +dpkg \-l '*vi*' +.EE +.RE To see the entries in \fI%ADMINDIR%/available\fP of two packages: -.br -\fB dpkg \-\-print\-avail elvis vim | less\fP -.br +.RS +.EX +dpkg \-\-print\-avail elvis vim | less +.EE +.RE To search the listing of packages yourself: -.br -\fB less %ADMINDIR%/available\fP -.br +.RS +.EX +less %ADMINDIR%/available +.EE +.RE To remove an installed elvis package: -.br -\fB dpkg \-r elvis\fP -.br +.RS +.EX +dpkg \-r elvis +.EE +.RE To install a package, you first need to find it in an archive or CDROM. The \fIavailable\fP file shows that the vim package is in section \fBeditors\fP: -.br -\fB cd /media/cdrom/pool/main/v/vim\fP -\fB dpkg \-i vim_4.5\-3.deb\fP -.br +.RS +.EX +cd /media/cdrom/pool/main/v/vim +dpkg \-i vim_4.5\-3.deb +.EE +.RE To make a local copy of the package selection states: -.br -\fB dpkg \-\-get\-selections >myselections\fP -.br +.RS +.EX +dpkg \-\-get\-selections >myselections +.EE +.RE You might transfer this file to another computer, and after having updated the \fIavailable\fP file there with your package manager frontend of choice (see https://wiki.debian.org/Teams/Dpkg/FAQ for more details), for example: -.br -\fB apt\-cache dumpavail | dpkg \-\-merge\-avail\fP -.br +.RS +.EX +apt\-cache dumpavail | dpkg \-\-merge\-avail +.EE +.RE or with dpkg 1.17.6 and earlier: -.br -\fB avail=`mktemp`\fP -\fB apt\-cache dumpavail >"$avail"\fP -\fB dpkg \-\-merge\-avail "$avail"\fP -\fB rm "$avail"\fP -.br +.RS +.EX +avail=`mktemp` +apt\-cache dumpavail >"$avail" +dpkg \-\-merge\-avail "$avail" +rm "$avail" +.EE +.RE you can install it with: -.br -\fB dpkg \-\-clear\-selections\fP -\fB dpkg \-\-set\-selections <myselections\fP -.br +.RS +.EX +dpkg \-\-clear\-selections +dpkg \-\-set\-selections <myselections +.EE +.RE Note that this will not actually install or remove anything, but just set the selection state on the requested packages. You will need some diff --git a/man/start-stop-daemon.man b/man/start-stop-daemon.man index 753423cb6..a540cec55 100644 --- a/man/start-stop-daemon.man +++ b/man/start-stop-daemon.man @@ -408,22 +408,22 @@ Unable to determine program status. Start the \fBfood\fP daemon, unless one is already running (a process named food, running as user food, with pid in food.pid): .IP -.nf +.EX start\-stop\-daemon \-\-start \-\-oknodo \-\-user food \-\-name food \\ \-\-pidfile /run/food.pid \-\-startas /usr/sbin/food \\ \-\-chuid food \-\- \-\-daemon -.fi +.EE .PP Send \fBSIGTERM\fP to \fBfood\fP and wait up to 5 seconds for it to stop: .IP -.nf +.EX start\-stop\-daemon \-\-stop \-\-oknodo \-\-user food \-\-name food \\ \-\-pidfile /run/food.pid \-\-retry 5 -.fi +.EE .PP Demonstration of a custom schedule for stopping \fBfood\fP: .IP -.nf +.EX start\-stop\-daemon \-\-stop \-\-oknodo \-\-user food \-\-name food \\ \-\-pidfile /run/food.pid \-\-retry=TERM/30/KILL/5 -.fi +.EE diff --git a/man/update-alternatives.man b/man/update-alternatives.man index 1f90afd9c..3de3861dc 100644 --- a/man/update-alternatives.man +++ b/man/update-alternatives.man @@ -448,7 +448,7 @@ line. Each line contains one space, the generic name of the slave alternative, another space, and the path to the slave alternative. . .SS Example -.nf +.EX $ update\-alternatives \-\-query editor Name: editor Link: /usr/bin/editor @@ -475,7 +475,7 @@ Slaves: editor.it.1.gz /usr/share/man/it/man1/vim.1.gz editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz -.fi +.EE . .SH DIAGNOSTICS With \fB\-\-verbose\fR @@ -498,21 +498,27 @@ To display the available packages which provide \fBvi\fP and the current setting for it, use the \fB\-\-display\fP action: .PP .RS -.B update\-alternatives \-\-display vi +.EX +update\-alternatives \-\-display vi +.EE .RE .PP To choose a particular \fBvi\fP implementation, use this command as root and then select a number from the list: .PP .RS -.B update\-alternatives \-\-config vi +.EX +update\-alternatives \-\-config vi +.EE .RE .PP To go back to having the \fBvi\fP implementation chosen automatically, do this as root: .PP .RS -.B update\-alternatives \-\-auto vi +.EX +update\-alternatives \-\-auto vi +.EE .RE . .SH SEE ALSO -- Dpkg.Org's dpkg
