...in code comments, diagnostic messages, "configure" script option descriptions, but not variable names, configuration option names, change log entries, or announcement text.
Also:
* Refer to most(1) as a "man pager", not "manpages".
---
Ada95/gen/gen.c | 2 +-
aclocal.m4 | 44 +++++++++++++++++++++---------------------
dist.mk | 2 +-
man/manhtml.aliases | 2 +-
man/manlinks.sed | 6 +++---
man/tic.1m | 2 +-
misc/ncurses-config.in | 2 +-
misc/terminfo.src | 30 ++++++++++++++--------------
progs/infocmp.c | 2 +-
9 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/Ada95/gen/gen.c b/Ada95/gen/gen.c
index b5d855552..0478759c1 100644
--- a/Ada95/gen/gen.c
+++ b/Ada95/gen/gen.c
@@ -305,7 +305,7 @@ main(int argc, const char *argv[])
PRINT_NAMED_CONSTANT(E_INVALID_FIELD);
PRINT_NAMED_CONSTANT(E_CURRENT);
- print_comment(fp, "Input key codes not defined in any ncurses manpage");
+ print_comment(fp, "Input key codes not defined in any ncurses man page");
PRINT_NAMED_CONSTANT(KEY_MIN);
PRINT_NAMED_CONSTANT(KEY_MAX);
#ifdef KEY_CODE_YES
diff --git a/aclocal.m4 b/aclocal.m4
index 2ed8ac204..fa59646b7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -4477,21 +4477,21 @@ if test "$GCC" = yes ; then
esac
else
case "$cf_cv_system_name" in
- (aix[[4-7]]*) # from ld manpage
+ (aix[[4-7]]*) # from ld man page
LDFLAGS_STATIC=-bstatic
LDFLAGS_SHARED=-bdynamic
;;
- (hpux*) # from ld manpage for hpux10.20, hpux11.11
+ (hpux*) # from ld man page for hpux10.20, hpux11.11
# We could also use just "archive" and "shared".
LDFLAGS_STATIC=-Wl,-a,archive_shared
LDFLAGS_SHARED=-Wl,-a,shared_archive
;;
- (irix*) # from ld manpage IRIX64
+ (irix*) # from ld man page IRIX64
LDFLAGS_STATIC=-Bstatic
LDFLAGS_SHARED=-Bdynamic
;;
- (osf[[45]]*) # from ld manpage osf4.0d, osf5.1
- # alternative "-oldstyle_liblookup" (not in cc manpage)
+ (osf[[45]]*) # from ld man page osf4.0d, osf5.1
+ # alternative "-oldstyle_liblookup" (not in cc man page)
LDFLAGS_STATIC=-noso
LDFLAGS_SHARED=-so_archive
;;
@@ -5369,7 +5369,7 @@ test "\$NAME" = "curses.h" && NAME=ncurses.h
CF_EOF
fi
cat >>headers.sh <<CF_EOF
-# Just in case someone gzip'd manpages, remove the conflicting copy.
+# Just in case someone gzip'd man pages, remove the conflicting copy.
test -f \$DST/\$NAME.gz && rm -f \$DST/\$NAME.gz
eval \$PRG \$TMPSRC \$DST/\$NAME
@@ -5816,7 +5816,7 @@ AC_SUBST(MAKE_LOWER_TAGS)
dnl ---------------------------------------------------------------------------
dnl CF_MANPAGE_FORMAT version: 19 updated: 2024/03/30 08:27:40
dnl -----------------
-dnl Option to allow user to override automatic configuration of manpage format.
+dnl Option to allow user to override automatic configuration of man page
format.
dnl There are several special cases:
dnl
dnl compress - man checks for, can display compressed files
@@ -5829,7 +5829,7 @@ dnl formatted - installer should format (put files
in cat-directory)
dnl catonly - installer should only format, e.g., for a turnkey system.
dnl
dnl There are other configurations which this macro does not test, e.g., HPUX's
-dnl compressed manpages (but uncompressed manpages are fine, and HPUX's naming
+dnl compressed man pages (but uncompressed man pages are fine, and HPUX's
naming
dnl convention would not match our use).
AC_DEFUN([CF_MANPAGE_FORMAT],
[
@@ -5837,7 +5837,7 @@ AC_REQUIRE([CF_PATHSEP])
AC_MSG_CHECKING(format of man-pages)
AC_ARG_WITH(manpage-format,
- [ --with-manpage-format specify manpage-format:
gzip/compress/bzip2/xz,
+ [ --with-manpage-format specify man page-format:
gzip/compress/bzip2/xz,
BSDI/normal and optionally formatted/catonly,
e.g., gzip,formatted],
[MANPAGE_FORMAT=$withval],
@@ -5901,7 +5901,7 @@ case "$MANPAGE_FORMAT" in
test "$cf_found" = yes && break
fi
done
- # only check the first directory in $MANPATH where we find
manpages
+ # only check the first directory in $MANPATH where we find man
pages
if test -n "$MANPAGE_FORMAT" ; then
break
fi
@@ -5925,7 +5925,7 @@ esac
AC_MSG_RESULT($MANPAGE_FORMAT)
if test -n "$cf_unknown" ; then
- AC_MSG_WARN(Unexpected manpage-format $cf_unknown)
+ AC_MSG_WARN(Unexpected man page-format $cf_unknown)
fi
cf_manpage_format=no
@@ -5975,15 +5975,15 @@ AC_SUBST(cf_manpage_coptions)
dnl ---------------------------------------------------------------------------
dnl CF_MANPAGE_RENAMES version: 17 updated: 2022/10/23 07:46:29
dnl ------------------
-dnl The Debian people have their own naming convention for manpages. This
+dnl The Debian people have their own naming convention for man pages. This
dnl option lets us override the name of the file containing renaming, or
dnl disable it altogether.
AC_DEFUN([CF_MANPAGE_RENAMES],
[
-AC_MSG_CHECKING(for manpage renaming)
+AC_MSG_CHECKING(for man page renaming)
AC_ARG_WITH(manpage-renames,
- [ --with-manpage-renames specify manpage-renaming],
+ [ --with-manpage-renames specify man page-renaming],
[MANPAGE_RENAMES=$withval],
[MANPAGE_RENAMES=yes])
@@ -6014,15 +6014,15 @@ AC_SUBST(MANPAGE_RENAMES)
dnl ---------------------------------------------------------------------------
dnl CF_MANPAGE_SYMLINKS version: 7 updated: 2023/01/21 16:37:17
dnl -------------------
-dnl Some people expect each tool to make all aliases for manpages in the
+dnl Some people expect each tool to make all aliases for man pages in the
dnl man-directory. This accommodates the older, less-capable implementations
dnl of 'man', and is optional.
AC_DEFUN([CF_MANPAGE_SYMLINKS],
[
-AC_MSG_CHECKING(if manpage aliases will be installed)
+AC_MSG_CHECKING(if man page aliases will be installed)
AC_ARG_WITH(manpage-aliases,
- [ --with-manpage-aliases specify manpage-aliases using .so],
+ [ --with-manpage-aliases specify man page-aliases using .so],
[MANPAGE_ALIASES=$withval],
[MANPAGE_ALIASES=yes])
@@ -6039,10 +6039,10 @@ esac
MANPAGE_SYMLINKS=no
if test "$MANPAGE_ALIASES" = yes ; then
-AC_MSG_CHECKING(if manpage symlinks should be used)
+AC_MSG_CHECKING(if man page symlinks should be used)
AC_ARG_WITH(manpage-symlinks,
- [ --with-manpage-symlinks specify manpage-aliases using symlinks],
+ [ --with-manpage-symlinks specify man page-aliases using symlinks],
[MANPAGE_SYMLINKS=$withval],
[MANPAGE_SYMLINKS=$cf_use_symlinks])
@@ -6060,14 +6060,14 @@ fi
dnl ---------------------------------------------------------------------------
dnl CF_MANPAGE_TBL version: 3 updated: 2002/01/19 22:51:32
dnl --------------
-dnl This option causes manpages to be run through tbl(1) to generate tables
+dnl This option causes man pages to be run through tbl(1) to generate tables
dnl correctly.
AC_DEFUN([CF_MANPAGE_TBL],
[
-AC_MSG_CHECKING(for manpage tbl)
+AC_MSG_CHECKING(for man page tbl)
AC_ARG_WITH(manpage-tbl,
- [ --with-manpage-tbl specify manpage processing with tbl],
+ [ --with-manpage-tbl specify man page processing with tbl],
[MANPAGE_TBL=$withval],
[MANPAGE_TBL=no])
diff --git a/dist.mk b/dist.mk
index 5b95b90b1..f53bc4129 100644
--- a/dist.mk
+++ b/dist.mk
@@ -93,7 +93,7 @@ doc/hackguide.doc: doc/html/hackguide.html
# The distributed html files are formatted using
# configure --without-manpage-renames
#
-# The edit_man.sed script is built as a side-effect of installing the manpages.
+# The edit_man.sed script is built as a side-effect of installing the man
pages.
# If that conflicts with the --without-manpage-renames, you can install those
# in a different location using the --with-install-prefix option of the
# configure script.
diff --git a/man/manhtml.aliases b/man/manhtml.aliases
index 5088d289e..b93e1cfdc 100644
--- a/man/manhtml.aliases
+++ b/man/manhtml.aliases
@@ -27,7 +27,7 @@
# sale, use or other dealings in this Software without prior written *
# authorization. *
#***************************************************************************
-# Items in this list will be linked to the corresponding manpages by man2html
+# Items in this list will be linked to the corresponding man pages by man2html
add_wch(3X) curs_add_wch(3X)
addch(3X) curs_addch(3X)
assume_default_colors(3X) default_colors(3X)
diff --git a/man/manlinks.sed b/man/manlinks.sed
index 573665ae2..9f04dbf8f 100644
--- a/man/manlinks.sed
+++ b/man/manlinks.sed
@@ -27,11 +27,11 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
-# Given a manpage (nroff) as input, writes a list of the names that are
+# Given a man page (nroff) as input, writes a list of the names that are
# listed in the "NAME" section, i.e., the names that we would like to use
-# as aliases for the manpage -T.Dickey
+# as aliases for the man page. -T.Dickey
#
-# workaround for manpages without a SYNOPSIS
+# workaround for man pages without a SYNOPSIS
s/^\.\\"SH/.SH/
#
# eliminate formatting controls that get in the way
diff --git a/man/tic.1m b/man/tic.1m
index 83659e2de..66dc710d5 100644
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -231,7 +231,7 @@ .SH OPTIONS
.\" two characters long, and is used by older (version 6) systems (which
.\" store the terminal type in a 16-bit word in a system-wide database).
.\" Version 6 sounds like Unix version 6, but termcap was introduced a few
-.\" years later. The SunOS manpage was based on material in 4.2BSD
+.\" years later. The SunOS man page was based on material in 4.2BSD.
Otherwise these are ignored.
.TP
\fB\-C\fP
diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in
index 88464fa02..6e71bcb48 100644
--- a/misc/ncurses-config.in
+++ b/misc/ncurses-config.in
@@ -364,7 +364,7 @@ Options:
--datadir echos the directory containing ${CURSES_LIB} data
--includedir echos the directory containing ${CURSES_LIB} header files
--libdir echos the directory containing ${CURSES_LIB} libraries
- --mandir echos the directory containing ${CURSES_LIB} manpages
+ --mandir echos the directory containing ${CURSES_LIB} man pages
--terminfo echos the \$TERMINFO terminfo database path
--terminfo-dirs echos the \$TERMINFO_DIRS directory list
--termpath echos the \$TERMPATH termcap list
diff --git a/misc/terminfo.src b/misc/terminfo.src
index 1f31a52ae..584d798fa 100644
--- a/misc/terminfo.src
+++ b/misc/terminfo.src
@@ -1534,8 +1534,8 @@ qansi-w|QNX ANSI for windows,
#
# klone+sgr-dumb is an error since the acsc does not match -TD
#
-# In this description based on SCO's keyboard(HW) manpage list of default
-# function key values:
+# In this description based on SCO's keyboard(HW) man page list of
+# default function key values:
# F13-F24 are shifted F1-F12
# F25-F36 are control F1-F12
# F37-F48 are shift+control F1-F12
@@ -6101,7 +6101,7 @@ xterm-pcolor|xterm with color used for highlights and
status line,
#
https://web.archive.org/web/20070921042430/http://nion.modprobe.de/mostlike.txt
# The comment hints where it started, but there are differences:
# Reconstructed via infocmp from file: /usr/share/terminfo/x/xterm-pcolor
-mostlike|manpages with color looking like most,
+mostlike|man pager with color looking like most,
OTbs@,
bold=\E[1m\E[31m,
is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>, kbs=^H,
@@ -8409,7 +8409,7 @@ contour-direct|Contour terminal with direct colors,
#### Ghostty
# https://github.com/ghostty-org/ghostty
#
-# Its readme and manpage begin with a lot of hype, concluding with
+# Its readme and man page begin with a lot of hype, concluding with
#
# While aiming for this ambitious goal, our first step is to make Ghostty
# one of the best fully standards compliant terminal emulator, remaining
@@ -8797,7 +8797,7 @@ screen.mlterm-256color|GNU Screen with mlterm using 256
colors,
# ======================================================================
-# Read the fine manpage:
+# Read the fine man page:
# When screen tries to figure out a terminal name for
# itself, it first looks for an entry named "screen.<term>",
# where <term> is the contents of your $TERM variable. If
@@ -8805,7 +8805,7 @@ screen.mlterm-256color|GNU Screen with mlterm using 256
colors,
# if the terminal is wide (132 cols or more)). If even this
# entry cannot be found, "vt100" is used as a substitute.
#
-# Notwithstanding the manpage, screen uses its own notion of the termcap
+# Notwithstanding the man page, screen uses its own notion of the termcap
# and some keys from "screen.<term>" are ignored. Here is an entry which
# covers those (tested with screen 4.00.02) -TD
screen+fkeys|function-keys according to screen,
@@ -9008,7 +9008,7 @@ tmux-direct|tmux with direct-color indexing,
# "xterm-256color" (hard-coded), which in its pretense that it is xterm, is
# several years out of date.
#
-# There is little documentation; the existing manpages amount to a quarter of
+# There is little documentation; the existing man pages amount to a quarter of
# the length of mosh.org's heavily promotional website. This entry is based
# on testing, and reading the source-code. For the latter, analysis is aided
# by the developer's extensive use of hard-coded strings.
@@ -9341,11 +9341,11 @@ sun-type4|Sun Workstation console with type 4 keyboard,
kcuu1=\E[215z, use=sun-il,
# Most of the current references to sun-color are from users wondering why this
-# is the default on install. Details from reading the wscons manpage, adding
+# is the default on install. Details from reading the wscons man page, adding
# cub, etc., here (rather than in the base sun-il entry) since it is not clear
# when those were added -TD (2005-05-28)
#
-# According to wscons manpage, color is supported only on IA systems.
+# According to wscons man page, color is supported only on IA systems.
# Sun's terminfo entry documents bold and smul/rmul capabilities, but wscons
# does not list these. It also sets ncv#3, however that corresponds to
# underline and standout.
@@ -14215,7 +14215,7 @@ rbcomm-w|IBM PC with RBcomm in 132 column mode,
# This line:
# cup=\376G%p2%c%p1%c
# LOOKS like it will work, but sometimes only one of the two numbers is sent.
-# See the terminfo (5) manpage commented regarding 'Terminals which use "%c"'.
+# See the terminfo(5) man page commented regarding 'Terminals which use "%c"'.
#
# Alas, there is no cursor upline capability on this display.
#
@@ -18569,8 +18569,8 @@ ibm8514-c|IBM 8514 color display with standout and
underline,
#
# AIX entries. IBM ships these with AIX 3.2.5.
-# -- added rc, sc based on manpage -TD
-# -- added rmacs, smacs based on manpage -TD
+# -- added rc, sc based on man page -TD
+# -- added rmacs, smacs based on man page -TD
# Note that we could use ibm+16color, but that is not how IBM defines this one.
aixterm|IBM Aixterm Terminal Emulator,
acsc=jjkkllmmnnqqttuuvvwwxx, bold=\E[1m, rc=\E8, ri@,
@@ -24073,7 +24073,7 @@ pc6300plus|AT&T 6300 plus,
# programs expecting VT100 graphics will usually be disappointed. For this
# reason I have disabled the smacs/rmacs sequences, but they could easily be
# re-enabled. Here are the relevant control sequences (from the ESCAPE(7)
-# manpage), should you wish to do so:
+# man page), should you wish to do so:
#
# SGR10 - Select font 0 - ESC [ 10 m or SO
# SGR11 - Select font 1 - ESC [ 11 m or SI
@@ -25518,7 +25518,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
# SGR 39/49 reset the terminal's foreground and background colors to their
# "default".
#
-# XT is harder, since screen's manpage does not give more details. For that,
+# XT is harder, since screen's man page does not give more details. For that,
# we must read screen's source-code. For example, when XT is set, screen
# assumes
#
@@ -26458,7 +26458,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
# * add mgterm, from NetBSD -TD
# * add alias sun-cgsix for sun-ss5 as per NetBSD
# * change cons25w to use rs2 for reset rather than rs1 -TD
-# * add rc/sc to aixterm based on manpage -TD
+# * add rc/sc to aixterm based on man page -TD
#
# 2000/5/13
# * remove ncv from xterm-16color, xterm-256color
diff --git a/progs/infocmp.c b/progs/infocmp.c
index 56e7758c0..f192d81b2 100644
--- a/progs/infocmp.c
+++ b/progs/infocmp.c
@@ -1241,7 +1241,7 @@ usage(void)
," -I use terminfo-names"
," -K use termcap-names and BSD syntax"
," -L use long names"
- ," -R subset (see manpage)"
+ ," -R subset (see man page)"
," -T eliminate size limits (test)"
," -U do not post-process entries"
," -V print version"
--
2.30.2
signature.asc
Description: PGP signature
