Attritbutive phrases get hard hyphens; noun phrases do not.[1] We say "ice cream truck" and "vacuum cleaner salesman", not "ice cream-truck" or "ice-cream-truck", nor "vacuum-cleaner-salesman" or "vacuum-cleaner-salesman".
[1] https://miamioh.edu/howe-center/hwc/writing-resources/handouts/grammar-and-punctuation/hyphens-and-dashes.html --- Ada95/aclocal.m4 | 2 +- INSTALL | 4 ++-- NEWS | 36 ++++++++++++++++++------------------ aclocal.m4 | 22 +++++++++++----------- dist.mk | 2 +- man/curs_outopts.3x | 2 +- man/infocmp.1m | 2 +- man/make_sed.sh | 4 ++-- man/term_variables.3x | 2 +- misc/gen_edit.sh | 2 +- misc/terminfo.src | 6 +++--- ncurses/base/lib_set_term.c | 2 +- ncurses/base/resizeterm.c | 2 +- ncurses/tinfo/lib_termcap.c | 2 +- test/aclocal.m4 | 2 +- 15 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4 index a3fbef976..52b6881df 100644 --- a/Ada95/aclocal.m4 +++ b/Ada95/aclocal.m4 @@ -1282,7 +1282,7 @@ dnl $4 = code fragment to compile/link dnl $5 = corresponding function-name dnl $6 = flag, nonnull if failure should not cause an error-exit dnl -dnl Sets the variable "$cf_libdir" as a side-effect, so we can see if we had +dnl Sets the variable "$cf_libdir" as a side effect, so we can see if we had dnl to use a -L option. AC_DEFUN([CF_FIND_LIBRARY], [ diff --git a/INSTALL b/INSTALL index 6f062c34a..cc8d71186 100644 --- a/INSTALL +++ b/INSTALL @@ -1112,7 +1112,7 @@ CONFIGURE OPTIONS: the alias pages are created as stubs containing ".so" *roff requests. --with-manpage-format=XXX - Tell the configure script how you would like to install man-pages. The + Tell the configure script how you would like to install man pages. The option value must be one of these: "gzip", "compress", "BSDI", "normal", "formatted". If you do not specify this option, the configure script attempts to determine which is the case. @@ -1125,7 +1125,7 @@ CONFIGURE OPTIONS: --with-manpage-symlinks Tell the configure script that you wish to make symbolic links in the - man-directory for aliases to the man-pages. This is the default, but + man-directory for aliases to the man pages. This is the default, but can be disabled for systems that provide this service automatically. Doing this on systems that do not support symbolic links creates a copy of the target man page for each alias. diff --git a/NEWS b/NEWS index 62853787e..c5fcf6e81 100644 --- a/NEWS +++ b/NEWS @@ -747,7 +747,7 @@ it is not possible to add this information. modem (prompted by discussion with Werner Fink, Michal Suchanek, OpenSUSE #1201384, Debian #60377). + build-fixes for --with-caps variations. - + correct a couple of section-references in INSTALL. + + correct a couple of section references in INSTALL. 20231028 + move xterm focus mode 1004 from xterm+sm+1006 into xterm+focus as @@ -11101,7 +11101,7 @@ it is not possible to add this information. (adapted from a patch by Ilya Zakharevich). + correct parameter types of vidputs() and vidattr() to agree with header files (report by William P Setzer). - + fix typos in several man-pages (patch by William P Setzer). + + fix typos in several man pages (patch by William P Setzer). + remove unneeded ifdef for __GNUG__ in CF_CPP_VSCAN_FUNC configure macro, which made ncurses C++ binding fail to build with other C++ compilers such as HPUX 11.x (report by Albert Chin-A-Young). @@ -11633,7 +11633,7 @@ it is not possible to add this information. absolute pathname for the build tree's lib directory (prompted by discussion with Albert Chin-A-Young). + modify "make install.man" and "make uninstall.man" to include tack's - man-page. + man page. + various fixes for install scripts used to support configure --srcdir and --with-install-prefix (reported by Matthew Clarke <[email protected]>). @@ -11860,7 +11860,7 @@ it is not possible to add this information. 20000708 5.1 release for upload to ftp.gnu.org + document configure options in INSTALL. - + add man-page for ncurses trace functions. + + add man page for ncurses trace functions. + correct return value shown in curs_touch.3x for is_linetouched() and is_wintouched(), in curs_initscr.3x for isendwin(), and in curs_termattr.3x for has_ic() and has_il(). @@ -12989,7 +12989,7 @@ it is not possible to add this information. running screen built with ncurses. + check if tmp_fp is opened in tic.c before closing it (patch by Pavel Roskin <[email protected]>). - + correct several font specification typos in man-pages. + + correct several font specification typos in man pages. 981220 + correct default value for BUILD_CC (reported by Larry Virden). @@ -13338,7 +13338,7 @@ it is not possible to add this information. + modify init_pair so that if a color-pair is reinitialized, we will repaint the areas of the screen whose color changes, like SVr4 curses (reported by Christian Maurer <[email protected]>). - + modify getsyx/setsyx macros to comply with SVr4 man-page which + + modify getsyx/setsyx macros to comply with SVr4 man page which says that leaveok() affects their behavior (report by Darryl Miles, patch by Alexander V Lukyanov). @@ -13351,7 +13351,7 @@ it is not possible to add this information. + implement tparm dynamic variables (reported by Xiaodan Tang). 980613 - + update man-page for for wattr_set, wattr_get (cf: 980509) + + update man page for for wattr_set, wattr_get (cf: 980509) + correct limits in hashtest, which would cause nonprinting characters to be written to large screens. + correct configure script, when --without-cxx was specified: the @@ -13533,12 +13533,12 @@ it is not possible to add this information. option (patch by Jesse Thilo). + correct some places in configure script where $enableval was used rather than $withval (patch by Darryl Miles <[email protected]>). - + modify some man-pages so no '.' or '..' falls between TH and SH + + modify some man pages so no '.' or '..' falls between TH and SH macros, to accommodate man_db program (reported by Ian T. Zimmerman <[email protected]>). + terminfo.src 10.2.1 downloaded from ESR's webpage (ESR). > several changes by Juergen Pfeifer: - + add copyright notices (and rcs id's) on remaining man-pages. + + add copyright notices (and rcs id's) on remaining man pages. + corrected prototypes for slk_* functions, using chtype rather than attr_t. + implemented the wcolor_set() and slk_color() functions @@ -13688,7 +13688,7 @@ it is not possible to add this information. implemented. + correct _tracef calls in _tracedump(), which did not separate format from parameters. - + correct getopt string for tic "-o" option, and add it to man-page + + correct getopt string for tic "-o" option, and add it to man page synopsis (reported by Darren Hiebert <[email protected]>). + correct typo in panel/Makefile.in, reversed if-statement in scrolling optimization (Alexander V. Lukyanov). @@ -13775,7 +13775,7 @@ it is not possible to add this information. + resynchronizes the generated html manpages 971213 - + additional fixes for man-pages section-references + + additional fixes for man pages section references + add (for debugging) a check for ich/ich1 conflict with smir/rmir to tic, etc. + remove hpa/vpa from rxvt terminal description because they are not @@ -13787,7 +13787,7 @@ it is not possible to add this information. + modify protection when installing libraries to (normally) not executable. HP-UX shared libraries are an exception. + add configure check for 'tack'. - + implement script for renaming section-references in man-page install, + + implement script for renaming section references in man page install, for Debian configuration. + add validity-check for SP in trace code in baudrate() (reported by Daniel Weaver). @@ -14922,9 +14922,9 @@ it is not possible to add this information. 970104 + workaround defect in autoconf 2.12 (which terminates configuration if no C++ compiler is found) by adding an option --without-cxx. - + modify several man-pages to use tbl, where .nf/.fi was used (reported + + modify several man pages to use tbl, where .nf/.fi was used (reported by Jesse Thilo). - + correct font-codes in some man-pages (patch by Jesse Thilo + + correct font codes in some man pages (patch by Jesse Thilo <[email protected]>) + use configure script's knowledge of existence of g++ library for the c++ Makefile (reported by Paul Jackson). @@ -15190,7 +15190,7 @@ it is not possible to add this information. simpler to construct tests (for double-check of _nc_hash_map tests). + correct ifdef's for c++ in curses.h + change default xterm type to xterm-x11r6. - + correct quoting in configure that made man-pages installed with + + correct quoting in configure that made man pages installed with $datadir instead of actual terminfo path. + correct whitespace in include/Caps, which caused kf11, clr_eol and clr_end to be omitted from terminfo.5 @@ -15402,7 +15402,7 @@ it is not possible to add this information. 960707 + rollback ESR's #305 change to terminfo.src (it breaks existing applications, e.g., 'less 290'). - + correct path of edit_man.sh, and fix typo that made all man-pages + + correct path of edit_man.sh, and fix typo that made all man pages preformatted. + restore man/menu_requestname.3x omitted in Zeyd's resync (oops). + auto-configure the GCC_PRINTFLIKE/GCC_SCANFLIKE macros (reported by @@ -15414,7 +15414,7 @@ it is not possible to add this information. descriptions. + work around autoconf bug, force $INSTALL to absolute path (reported by Zeyd). - + modify man-page install for BSDI to install preformatted .0 files + + modify man page install for BSDI to install preformatted .0 files (reported by David MacKenzie). + add/use gcc __attribute__ for printf and scanf in curses.h + added SGR attributes test-case to ncurses @@ -15515,7 +15515,7 @@ it is not possible to add this information. + misc/ncurses-intro.html syntax fix (Kajiyama Tamito). 960601 - snapshot - + auto-configure man-page compression-format and renames for Debian. + + auto-configure man page compression format and renames for Debian. + corrected several typos in curses.h.in (i.e., the mvXXXX macros). + re-order curses.priv.h for lint. + added rules for lintlib, lint diff --git a/aclocal.m4 b/aclocal.m4 index fa59646b7..3d706cac8 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -5303,7 +5303,7 @@ echo creating headers.sh cat >headers.sh <<CF_EOF #! $SHELL # This shell script is generated by the 'configure' script. It is invoked in a -# subdirectory of the build tree. It generates a sed-script in the parent +# subdirectory of the build tree. It generates a sed script in the parent # directory that is used to adjust includes for header files that reside in a # subdirectory of /usr/include, etc. PRG="" @@ -5834,10 +5834,10 @@ dnl convention would not match our use). AC_DEFUN([CF_MANPAGE_FORMAT], [ AC_REQUIRE([CF_PATHSEP]) -AC_MSG_CHECKING(format of man-pages) +AC_MSG_CHECKING(format of man pages) AC_ARG_WITH(manpage-format, - [ --with-manpage-format specify man page-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], @@ -5854,7 +5854,7 @@ case "$MANPAGE_FORMAT" in MANPATH="/usr/man:/usr/share/man" fi - # look for the 'date' man-page (it is most likely to be installed!) + # look for the 'date' man page (it is most likely to be installed!) MANPAGE_FORMAT= cf_preform="no" cf_catonly="yes" @@ -5925,7 +5925,7 @@ esac AC_MSG_RESULT($MANPAGE_FORMAT) if test -n "$cf_unknown" ; then - AC_MSG_WARN(Unexpected man page-format $cf_unknown) + AC_MSG_WARN(Unexpected man page format $cf_unknown) fi cf_manpage_format=no @@ -5983,7 +5983,7 @@ AC_DEFUN([CF_MANPAGE_RENAMES], AC_MSG_CHECKING(for man page renaming) AC_ARG_WITH(manpage-renames, - [ --with-manpage-renames specify man page-renaming], + [ --with-manpage-renames specify man page renaming], [MANPAGE_RENAMES=$withval], [MANPAGE_RENAMES=yes]) @@ -6022,7 +6022,7 @@ AC_DEFUN([CF_MANPAGE_SYMLINKS], AC_MSG_CHECKING(if man page aliases will be installed) AC_ARG_WITH(manpage-aliases, - [ --with-manpage-aliases specify man page-aliases using .so], + [ --with-manpage-aliases specify man page aliases using .so], [MANPAGE_ALIASES=$withval], [MANPAGE_ALIASES=yes]) @@ -6042,7 +6042,7 @@ if test "$MANPAGE_ALIASES" = yes ; then AC_MSG_CHECKING(if man page symlinks should be used) AC_ARG_WITH(manpage-symlinks, - [ --with-manpage-symlinks specify man page-aliases using symlinks], + [ --with-manpage-symlinks specify man page aliases using symlinks], [MANPAGE_SYMLINKS=$withval], [MANPAGE_SYMLINKS=$cf_use_symlinks]) @@ -6076,9 +6076,9 @@ AC_MSG_RESULT($MANPAGE_TBL) dnl --------------------------------------------------------------------------- dnl CF_MAN_PAGES version: 63 updated: 2025/10/04 17:14:23 dnl ------------ -dnl Try to determine if the man-pages on the system are compressed, and if +dnl Try to determine if the man pages on the system are compressed, and if dnl so, what format is used. Use this information to construct a script that -dnl will install man-pages. +dnl will install man pages. AC_DEFUN([CF_MAN_PAGES], [ CF_HELP_MESSAGE(Options to Specify How Manpages are Installed:) @@ -6706,7 +6706,7 @@ AC_DEFUN([CF_OUTPUT_MANPAGE_RENAMES], [ AC_REQUIRE([CF_MANPAGE_RENAMES]) if test "$MANPAGE_RENAMES" != no ; then - # Construct a sed-script to perform renaming within man-pages + # Construct a sed script to perform renaming within man pages test -n "$verbose" && echo "creating edit_man.sed" test ! -d man && mkdir man FGREP="${FGREP-grep -F}" $SHELL "$srcdir/man/make_sed.sh" "$MANPAGE_RENAMES" >./edit_man.sed diff --git a/dist.mk b/dist.mk index f53bc4129..7c7a127ad 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 man pages. +# 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/curs_outopts.3x b/man/curs_outopts.3x index 9e541dc1e..28a991125 100644 --- a/man/curs_outopts.3x +++ b/man/curs_outopts.3x @@ -335,7 +335,7 @@ .SH PORTABILITY .IR \%wrefresh "." .PP X/Open Curses does not mention that the cursor should be -made invisible as a side-effect of +made invisible as a side effect of .IR \%leaveok "." SVr4 .I curses diff --git a/man/infocmp.1m b/man/infocmp.1m index 9c55b63ab..b3708f018 100644 --- a/man/infocmp.1m +++ b/man/infocmp.1m @@ -583,7 +583,7 @@ .SS "Other Options" .RS .TP 5 \fB\-C\fP -sets the \*(``BSD\*('' subset as a side-effect. +sets the \*(``BSD\*('' subset as a side effect. .TP 5 \fB\-I\fP sets the subset to all capabilities. diff --git a/man/make_sed.sh b/man/make_sed.sh index 62823c12e..a586e7806 100755 --- a/man/make_sed.sh +++ b/man/make_sed.sh @@ -31,9 +31,9 @@ # # Author: Thomas E. Dickey 1997 # -# Construct a sed-script to perform renaming within man-pages. Originally +# Construct a sed script to perform renaming within man pages. Originally # written in much simpler form, this one accounts for the common cases of -# section-names in man-pages. +# section names in man pages. if test $# != 1 ; then echo '? expected a single filename' diff --git a/man/term_variables.3x b/man/term_variables.3x index 62aefc81a..09d76a9c4 100644 --- a/man/term_variables.3x +++ b/man/term_variables.3x @@ -128,7 +128,7 @@ .SS "Current Terminal Data" interfaces, .B cur_term contains data describing the current terminal. -It is also updated as a side-effect of \fBset_term\fP(3X) and +It is also updated as a side effect of \fBset_term\fP(3X) and \fBdelscreen\fP(3X). .PP It is possible to save a value of diff --git a/misc/gen_edit.sh b/misc/gen_edit.sh index e8bbcb404..a48ce8425 100755 --- a/misc/gen_edit.sh +++ b/misc/gen_edit.sh @@ -31,7 +31,7 @@ # Author: Thomas E. Dickey # # $Id: gen_edit.sh,v 1.8 2025/06/14 15:10:44 tom Exp $ -# Generate a sed-script for converting the terminfo.src to the form which will +# Generate a sed script for converting the terminfo.src to the form which will # be installed. # # Assumes: diff --git a/misc/terminfo.src b/misc/terminfo.src index 584d798fa..7abc39d4d 100644 --- a/misc/terminfo.src +++ b/misc/terminfo.src @@ -1655,7 +1655,7 @@ iris-ansi|iris-ansi-net|IRIS emulating 40 line ANSI terminal (almost VT100), iris-ansi-ap|IRIS ANSI in application-keypad mode, is2=\E[?1l\E=\E[?7h, kent=\EOM, use=iris-ansi, -# From the man-page, this is a quasi-vt100 emulator that runs on SGI's IRIX +# From the man page, this is a quasi-vt100 emulator that runs on SGI's IRIX # (T.Dickey 98/1/24) iris-color|xwsh|IRIX ANSI with color, ncv#33, @@ -14120,7 +14120,7 @@ vt320-k311|DEC VT320 series as defined by kermit 3.11, # ^V^K%p1%c%p2%c%p3%c%p4%c%p5%c -- scroll (p2,p3) to (p4,p5) down by p1 lines # ^V^L%p1%c%p2%c%p3%c -- clear p2 lines and p3 cols w/attr %p1 # ^V^M%p1%c%p2%c%p3%c%p4%c -- fill p3 lines & p4 cols w/char p2+attr %p1 -# (^V^L and ^V^M set the current attribute as a side-effect.) +# (^V^L and ^V^M set the current attribute as a side effect.) # ^V ^Y <a> [...] <c> -- repeat pattern. <a> specifies the number of bytes # in the pattern, <c> the number of times the pattern # should be repeated. If either value is 0, no-op. @@ -26497,7 +26497,7 @@ v3220|LANPAR Vision II model 3220/3221/3222, # * rename cygwin to cygwinB19, adapt newer entry from Earnie Boyd -TD # # 2000-12-16 -# * improved scoansi, based on SCO man-page, and testing console, +# * improved scoansi, based on SCO man page, and testing console, # scoterm with tack -TD # # 2001-01-27 diff --git a/ncurses/base/lib_set_term.c b/ncurses/base/lib_set_term.c index 39346b32c..a13d9c498 100644 --- a/ncurses/base/lib_set_term.c +++ b/ncurses/base/lib_set_term.c @@ -457,7 +457,7 @@ NCURSES_SP_NAME(_nc_setupscreen) ( /* * Set our assumption of the terminal's default foreground and background - * colors. The curs_color man-page states that we can assume that the + * colors. The curs_color man page states that we can assume that the * background is black. The origin of this assumption appears to be * terminals that displayed colored text, but no colored backgrounds, e.g., * the first colored terminals around 1980. More recent ones with better diff --git a/ncurses/base/resizeterm.c b/ncurses/base/resizeterm.c index 041401aac..d857e456d 100644 --- a/ncurses/base/resizeterm.c +++ b/ncurses/base/resizeterm.c @@ -344,7 +344,7 @@ increase_size(NCURSES_SP_DCLx int ToLines, int ToCols, int stolen EXTRA_DCLS) } /* - * This function reallocates NCURSES window structures, with no side-effects + * This function reallocates NCURSES window structures, with no side effects * such as ungetch(). */ NCURSES_EXPORT(int) diff --git a/ncurses/tinfo/lib_termcap.c b/ncurses/tinfo/lib_termcap.c index 2bfd8a1fa..9b53f6ad0 100644 --- a/ncurses/tinfo/lib_termcap.c +++ b/ncurses/tinfo/lib_termcap.c @@ -192,7 +192,7 @@ NCURSES_SP_NAME(tgetent) (NCURSES_SP_DCLx char *bufp, const char *name) LAST_USE = TRUE; SetNoPadding(SP_PARM); - (void) NCURSES_SP_NAME(baudrate) (NCURSES_SP_ARG); /* sets ospeed as a side-effect */ + (void) NCURSES_SP_NAME(baudrate) (NCURSES_SP_ARG); /* sets ospeed as a side effect */ /* LINT_PREPRO #if 0*/ diff --git a/test/aclocal.m4 b/test/aclocal.m4 index 83392c2bf..ad4042a96 100644 --- a/test/aclocal.m4 +++ b/test/aclocal.m4 @@ -1492,7 +1492,7 @@ dnl $4 = code fragment to compile/link dnl $5 = corresponding function-name dnl $6 = flag, nonnull if failure should not cause an error-exit dnl -dnl Sets the variable "$cf_libdir" as a side-effect, so we can see if we had +dnl Sets the variable "$cf_libdir" as a side effect, so we can see if we had dnl to use a -L option. AC_DEFUN([CF_FIND_LIBRARY], [ -- 2.30.2
signature.asc
Description: PGP signature
