man: Fix wording for ambiguous constructs

Mark in bold and add section to File::Glob reference. Avoid ending a
line with a closing parenthesis as po4a adds two spaces after that.
Use switched instead of converted uniformly when referring to dir to
symlink changes and vice-versa. Refer to the available database as the
available file and mark it in italics to conform to current usage.

Reported-by: Helge Kreutzmann <debian@helgefjell.de>

3 files changed, 15 insertions, 15 deletions

diff --git a/man/dpkg-gensymbols.1 b/man/dpkg-gensymbols.1
index 81d74c82a..c7882f2b9 100644
--- a/man/dpkg-gensymbols.1
+++ b/man/dpkg-gensymbols.1
@@ -402,9 +402,9 @@ debian/changelog. Required if called outside of a source package tree.
 .BI \-e library-file
 Only analyze libraries explicitly listed instead of finding all public
 libraries. You can use shell patterns used for pathname expansions (see
-the File::Glob manual page for details) in \fIlibrary-file\fR to match
-multiple libraries with a single argument (otherwise you need multiple
-\fB\-e\fR).
+the \fBFile::Glob\fP(3perl) manual page for details) in \fIlibrary-file\fR
+to match multiple libraries with a single argument (otherwise you need
+multiple \fB\-e\fR).
 .TP
 .BI \-I filename
 Use \fIfilename\fR as reference file to generate the symbols file
diff --git a/man/dpkg-maintscript-helper.1 b/man/dpkg-maintscript-helper.1
index dac4f8308..ec0591438 100644
--- a/man/dpkg-maintscript-helper.1
+++ b/man/dpkg-maintscript-helper.1
@@ -70,8 +70,8 @@ the conffile.
 .I package
 The package name. When the package is "Multi-Arch: same", this parameter
 must include the architecture qualifier. If empty or omitted, the
-\fBDPKG_MAINTSCRIPT_PACKAGE\fP environment variable (as set by \fBdpkg\fP)
-will be used.
+\fBDPKG_MAINTSCRIPT_PACKAGE\fP environment variable (as set by
+\fBdpkg\fP) will be used.
 .TP
 .B \-\-
 All the parameters of the maintainer scripts have to be forwarded to the
@@ -149,7 +149,7 @@ to a directory or vice-versa.
 .
 .SS Switching a symlink to directory
 .
-If a symlink is converted to a real directory, you need to make sure
+If a symlink is switched to a real directory, you need to make sure
 before unpacking that the symlink is removed. This may seem a simple
 change to the \fBpreinst\fP script at first, however that will result
 in some problems in case of admin local customization of the symlink
@@ -176,7 +176,7 @@ abort\-upgrade/abort\-install, the \fBpostrm\fP renames
 .
 .SS Switching a directory to symlink
 .
-If a real directory is converted to a symlink, you need to make sure
+If a real directory is switched to a symlink, you need to make sure
 before unpacking that the directory is removed. This may seem a simple
 change to the \fBpreinst\fP script at first, however that will result
 in some problems in case the directory contains conffiles, pathnames
diff --git a/man/dpkg.1 b/man/dpkg.1
index d9d2199f0..19692bf2f 100644
--- a/man/dpkg.1
+++ b/man/dpkg.1
@@ -248,8 +248,8 @@ working.
 .TP
 \fB\-\-get\-selections\fP [\fIpackage-name-pattern\fP...]
 Get list of package selections, and write it to stdout. Without a pattern,
-non-installed packages (i.e. those which have been previously purged)
-will not be shown.
+non-installed packages (i.e. those which have been previously purged) will
+not be shown.
 .TP
 .B \-\-set\-selections
 Set package selections using file read from stdin. This file should be
@@ -257,7 +257,7 @@ in the format '\fIpackage\fP \fIstate\fP', where state is one of
 \fBinstall\fP, \fBhold\fP, \fBdeinstall\fP or \fBpurge\fP. Blank lines
 and comment lines beginning with '#' are also permitted.
 
-The available database needs to be up-to-date for this command to be
+The \fIavailable\fP file needs to be up-to-date for this command to be
 useful, otherwise unknown packages will be ignored with a warning. See
 the \fB\-\-update\-avail\fP and \fB\-\-merge\-avail\fP commands for more
 information.
@@ -793,9 +793,9 @@ for more information about them:
 .
 .SH EXAMPLES
 To list installed packages related to the editor \fBvi\fP(1) (note that
-\fBdpkg\-query\fP does not load the available file anymore by default, and
-the \fBdpkg\-query\fP \fB\-\-load\-avail\fP option should be used instead
-for 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 \(aq*vi*\(aq\fP
 .br
@@ -816,7 +816,7 @@ To remove an installed elvis package:
 .br
 
 To install a package, you first need to find it in an archive or
-CDROM. The "available" file shows that the vim package is in section
+CDROM. The \fIavailable\fP file shows that the vim package is in section
 "editors":
 .br
 \fB     cd /media/cdrom/pool/main/v/vim\fP
@@ -829,7 +829,7 @@ To make a local copy of the package selection states:
 .br
 
 You might transfer this file to another computer, and after having updated
-the available database there with your package manager frontend of choice
+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     avail=`mktemp`\fP