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=1148848ff0e7cd17dbfff1b12d29f23e28e19b77 commit 1148848ff0e7cd17dbfff1b12d29f23e28e19b77 Author: Guillem Jover <guil...@debian.org> AuthorDate: Wed May 6 06:19:44 2020 +0200 man: Fix apt and aptitude references Use apt instead of apt-get when appropriate. Add section numbers to apt references. Correct apt and aptitude section numbers to match their man pages. Reported-by: Helge Kreutzmann <deb...@helgefjell.de> --- debian/changelog | 2 ++ man/dpkg-query.man | 2 +- man/dpkg-scanpackages.man | 7 ++++--- man/dpkg-scansources.man | 5 +++-- man/dpkg.man | 8 ++++---- man/dselect.man | 8 ++++---- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index afcf2723c..1b4a55253 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,8 @@ dpkg (1.20.1) UNRELEASED; urgency=medium - man: Use .TP macros instead of hand-crafted formatting. - man: Fix font markup for some variable and literal strings. - dpkg-maintscript-helper: Add -?, --help and --version to --help output. + - man: Fix apt and aptitude references. + Reported by Helge Kreutzmann <deb...@helgefjell.de>. * 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/dpkg-query.man b/man/dpkg-query.man index 09261ab78..c6eb744c2 100644 --- a/man/dpkg-query.man +++ b/man/dpkg-query.man @@ -163,7 +163,7 @@ entries are separated by an empty line, with the same order as specified on the argument list. Users of APT-based frontends -should use \fBapt\-cache show\fP \fIpackage-name\fP instead +should use \fBapt show\fP \fIpackage-name\fP instead as the \fIavailable\fP file is only kept up-to-date when using \fBdselect\fP. .TP diff --git a/man/dpkg-scanpackages.man b/man/dpkg-scanpackages.man index c31916ba4..2e12a5ded 100644 --- a/man/dpkg-scanpackages.man +++ b/man/dpkg-scanpackages.man @@ -47,15 +47,16 @@ of machines. .PP .B Note: If you want to access the generated Packages file with -.B apt +.BR apt (8) you will probably need to compress the file with .BR xz (1) (generating a Packages.xz file), .BR bzip2 (1) (generating a Packages.bz2 file) or .BR gzip (1) -(generating a Packages.gz file). apt ignores uncompressed Packages -files except on local access (i.e. +(generating a Packages.gz file). +.BR apt (8) +ignores uncompressed Packages files except on local access (i.e. .B file:// sources). .PP diff --git a/man/dpkg-scansources.man b/man/dpkg-scansources.man index dda59facb..5e7f02fb0 100644 --- a/man/dpkg-scansources.man +++ b/man/dpkg-scansources.man @@ -61,8 +61,9 @@ If you want to access the generated Sources file with .BR apt (8) you will probably need to compress the file with .BR gzip (1) -(generating a Sources.gz file). apt ignores uncompressed Sources files -except on local access (i.e. +(generating a Sources.gz file). +.BR apt (8) +ignores uncompressed Sources files except on local access (i.e. .B file:// sources). . diff --git a/man/dpkg.man b/man/dpkg.man index f35756e92..9c20b110d 100644 --- a/man/dpkg.man +++ b/man/dpkg.man @@ -46,7 +46,7 @@ packages are particularly inadequate. .SH DESCRIPTION \fBdpkg\fP is a tool to install, build, remove and manage Debian packages. The primary and more user-friendly -front-end for \fBdpkg\fP is \fBaptitude\fP(1). \fBdpkg\fP itself is +front-end for \fBdpkg\fP is \fBaptitude\fP(8). \fBdpkg\fP itself is controlled entirely via command line parameters, which consist of exactly one action and zero or more options. The action-parameter tells \fBdpkg\fP what to do and options control the behavior of the action in some way. @@ -501,7 +501,7 @@ Search for a filename from installed packages. \fB\-p\fP, \fB\-\-print\-avail\fP \fIpackage-name\fP... Display details about \fIpackage-name\fP, as found in \fI%ADMINDIR%/available\fP. Users of APT-based frontends -should use \fBapt\-cache show\fP \fIpackage-name\fP instead. +should use \fBapt show\fP \fIpackage-name\fP instead. .RE . .SH OPTIONS @@ -1146,8 +1146,8 @@ Additional functionality can be gained by installing any of the following packages: \fBapt\fR, \fBaptitude\fR and \fBdebsums\fR. . .SH SEE ALSO -\fBaptitude\fP(1), -\fBapt\fP(1), +\fBaptitude\fP(8), +\fBapt\fP(8), \fBdselect\fP(1), \fBdpkg\-deb\fP(1), \fBdpkg\-query\fP(1), diff --git a/man/dselect.man b/man/dselect.man index 0d87f34dc..bfc6dc0cd 100644 --- a/man/dselect.man +++ b/man/dselect.man @@ -48,7 +48,7 @@ information and installable packages from package repositories. Depending on the used access method, these repositories can be public archive servers on the internet, local archive servers or CD-ROMs. The recommended access method is \fIapt\fP, which is provided by the -package \fBapt\fP. +package \fBapt\fP(8). .PP Normally \fBdselect\fP is invoked without parameters. An interactive menu is presented, offering the user a list of commands. If a command @@ -157,7 +157,7 @@ By default, \fBdselect\fP provides several methods such as \fIcdrom\fP, \fImulti_cd\fP, \fInfs\fP, \fImulti_nfs\fP, \fIharddisk\fP, \fImounted\fP, \fImulti_mount\fP or \fIftp\fP, but other packages may provide additional methods, eg. the \fIapt\fP access method -provided by the \fBapt\fP package. +provided by the \fBapt\fP(8) package. .sp The use of the \fIapt\fP access method is strongly recommended. .sp @@ -479,11 +479,11 @@ There is no help option in the main menu. The visible list of available packages cannot be reduced. .sp The built in access methods can no longer stand up to current quality -standards. Use the access method provided by apt, it is not only not +standards. Use the access method provided by \fBapt\fP(8), it is not only not broken, it is also much more flexible than the built in access methods. . .SH SEE ALSO .BR dpkg (1), -.BR apt\-get (8), +.BR apt (8), .BR sources.list (5), .BR deb (5). -- Dpkg.Org's dpkg
