This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=013efc0843cb776f16ab5aa325e690f42842d3ec commit 013efc0843cb776f16ab5aa325e690f42842d3ec Author: Guillem Jover <[email protected]> AuthorDate: Sun Sep 17 04:07:22 2023 +0200 doc, man: Use manual page instead of manpage --- TODO | 2 +- debian/README.bug-usertags | 2 +- man/deb-src-control.pod | 2 +- man/dsc.pod | 2 +- man/dselect.pod | 2 +- man/update-alternatives.pod | 2 +- utils/start-stop-daemon.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/TODO b/TODO index 1b789389b..8f4647964 100644 --- a/TODO +++ b/TODO @@ -61,7 +61,7 @@ Tasks - Add fnmatch, IRIX5 doesn't have it. * Man pages: - - Add example to dpkg-scanfoo manpages? + - Add example to dpkg-scanfoo manual pages? - Merge synopsis lines in dpkg-triggers. - Check all command vs action. - Check usage of '|' instead of ', '. diff --git a/debian/README.bug-usertags b/debian/README.bug-usertags index eee63cf30..68ea1efdc 100644 --- a/debian/README.bug-usertags +++ b/debian/README.bug-usertags @@ -39,7 +39,7 @@ l10n New or updated translations and bugs affecting translation. Include the language code in the tag, e.g. [INTL:cy_GB]. doc Documentation bugs, including --help, program output - and manpages. + and manual pages. Program tags ============ diff --git a/man/deb-src-control.pod b/man/deb-src-control.pod index b68273ad1..7e1d69f6a 100644 --- a/man/deb-src-control.pod +++ b/man/deb-src-control.pod @@ -411,7 +411,7 @@ package. These fields declare relationships between packages. They are discussed in the B<deb-control>(5) -manpage. +manual page. When these fields are found in I<debian/control> they can also end with a trailing comma (since dpkg 1.10.14), have architecture specifications and restriction formulas which will all get reduced when generating the fields diff --git a/man/dsc.pod b/man/dsc.pod index 03c417565..9faf33569 100644 --- a/man/dsc.pod +++ b/man/dsc.pod @@ -201,7 +201,7 @@ test dependencies, each source package would need to be unpacked. These fields declare relationships between the source package and packages used to build it. -They are discussed in the B<deb-src-control>(5) manpage. +They are discussed in the B<deb-src-control>(5) manual page. =item B<Package-List:> diff --git a/man/dselect.pod b/man/dselect.pod index e704a1bbe..425864265 100644 --- a/man/dselect.pod +++ b/man/dselect.pod @@ -303,7 +303,7 @@ at easing package management and administration, it is only instrumental in doing so and cannot be assumed to be a sufficient substitute for administrator skill and understanding. The user is required to be familiar with the concepts underlying the Debian packaging system. -In case of doubt, consult the B<dpkg>(1) manpage and the distribution +In case of doubt, consult the B<dpkg>(1) manual page and the distribution policy. Unless B<dselect> is run in expert diff --git a/man/update-alternatives.pod b/man/update-alternatives.pod index 47a36df2c..c30bdad28 100644 --- a/man/update-alternatives.pod +++ b/man/update-alternatives.pod @@ -602,7 +602,7 @@ if you do not find them so, please report this as a bug. There are several packages which provide a text editor compatible with B<vi>, for example B<nvi> and B<vim>. Which one is used is controlled by the link group B<vi>, which includes links for the -program itself and the associated manpage. +program itself and the associated manual page. To display the available packages which provide B<vi> and the current setting for it, use the B<--display> action: diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c index 2fd41ebcb..743afeee9 100644 --- a/utils/start-stop-daemon.c +++ b/utils/start-stop-daemon.c @@ -1872,7 +1872,7 @@ pid_is_exec(pid_t pid, const struct stat *esb) else { /* Tests indicate that this never happens, since * kvm_getargv itself cuts of tailing stuff. This is - * not what the manpage says, however. */ + * not what the manual page says, however. */ strncpy(buf, *pid_argv_p, (end_argv_0_p - start_argv_0_p)); buf[(end_argv_0_p - start_argv_0_p) + 1] = '\0'; start_argv_0_p = buf; -- Dpkg.Org's dpkg
