groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 02/04: Stop spelling "Unix" as "UNIX".


From: G. Branden Robinson
Subject: [groff] 02/04: Stop spelling "Unix" as "UNIX".
Date: Sun, 11 Nov 2018 18:44:10 -0500 (EST)

gbranden pushed a commit to branch master
in repository groff.

commit 2d7749c311ab5ace131c61ece776131e99f242c8
Author: G. Branden Robinson <address@hidden>
Date:   Sun Nov 11 17:29:25 2018 -0500

    Stop spelling "Unix" as "UNIX".
    
        Per AT&T Bell Labs veterans Doug McIlroy and Meg McRoberts,
        spelling "Unix" in full caps was a contrivance insisted upon by
        AT&T lawyers, and not a practice used in the Unix manuals
        themselves or the Bell Labs Technical Journal.  See
          https://lists.gnu.org/archive/html/groff/2015-01/msg00026.html
        and
          https://lists.gnu.org/archive/html/groff/2015-01/msg00029.html
        for support.
    
        There are instances I did _not_ change; they may require further
        review.
                ChangeLog.*
                        People don't often look for model usage here.
                NEWS
                        One reference relevant to mdoc; see below.
                doc/meintro.me
                doc/meintro_fr.me
                        These documents also give the small caps
                        treatment to groff, troff, and nroff, suggesting
                        a separate changeset.
                src/preproc/pic/pic.ypp
                        Contains a comment referring to "Compaq Tru64
                        UNIX"; not worth the candle IMO.
                tmac/s.tmac:
                        {ms macro package} Leaving UX macro definition
                        alone until/unless it can be established that
                        this doesn't change the rendering of historical
                        documents in an objectionable way.
                tmac/doc-syms-u:
                tmac/doc-old.tmac-u:
                tmac/doc-common-u:
                tmac/groff_mdoc.7.man:
                        {mdoc macro package} Similar; mdoc defines many
                        strings that spit out "UNIX" (albeit not with a
                        font size change).
    
        * MORE.STUFF:
        * NEWS:
        * README.MinGW:
        * contrib/groffer/README:
        * contrib/pdfmark/pdfmark.ms:
        * contrib/pdfmark/pdfroff.1.man:
        * doc/groff.texi:
        * doc/webpage.ms:
        * m4/groff.m4:
        * man/groff_diff.7.man:
        * man/groff_tmac.5.man:
        * man/roff.7.man:
        * src/preproc/html/pre-html.cpp:
        * src/roff/troff/troff.1.man: Change "UNIX" to "Unix",
        discarding markup as necessary.
    
    Signed-off-by: G. Branden Robinson <address@hidden>
---
 ChangeLog                     |  54 +++++++++++++
 MORE.STUFF                    |   2 +-
 NEWS                          |   4 +-
 README.MinGW                  |  16 ++--
 contrib/groffer/README        |   2 +-
 contrib/pdfmark/pdfmark.ms    |  16 ++--
 contrib/pdfmark/pdfroff.1.man |   2 +-
 doc/groff.texi                | 174 +++++++++++++++++++++---------------------
 doc/webpage.ms                |   6 +-
 m4/groff.m4                   |   4 +-
 man/groff_diff.7.man          |  20 +++--
 man/groff_tmac.5.man          |   2 +-
 man/roff.7.man                |  10 +--
 src/preproc/html/pre-html.cpp |   8 +-
 src/roff/troff/troff.1.man    |   2 +-
 15 files changed, 183 insertions(+), 139 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3c7f4eb..a8a649f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,57 @@
+2018-11-11  G. Branden Robinson <address@hidden>
+
+       Stop spelling "Unix" as "UNIX".
+
+       Per AT&T Bell Labs veterans Doug McIlroy and Meg McRoberts,
+       spelling "Unix" in full caps was a contrivance insisted upon by
+       AT&T lawyers, and not a practice used in the Unix manuals
+       themselves or the Bell Labs Technical Journal.  See
+         https://lists.gnu.org/archive/html/groff/2015-01/msg00026.html
+       and
+         https://lists.gnu.org/archive/html/groff/2015-01/msg00029.html
+       for support.
+
+       There are instances I did _not_ change; they may require further
+       review.
+               ChangeLog.*
+               NEWS
+                       One reference relevant to mdoc; see below.
+               doc/meintro{,_fr}.me
+                       These documents also give the small caps
+                       treatment to groff, troff, and nroff, suggesting
+                       a separate changeset.
+               src/preproc/pic/pic.ypp
+                       Contains a comment referring to "Compaq Tru64
+                       UNIX"; not worth the candle IMO.
+               tmac/s.tmac:
+                       {ms macro package} Leaving UX macro definition
+                       alone until/unless it can be established that
+                       this doesn't change the rendering of historical
+                       documents in an objectionable way.
+               tmac/doc-syms-u:
+               tmac/doc-old.tmac-u:
+               tmac/doc-common-u:
+               tmac/groff_mdoc.7.man:
+                       {mdoc macro package} Similar; mdoc defines many
+                       strings that spit out "UNIX" (albeit not with a
+                       font size change).
+
+       * MORE.STUFF:
+       * NEWS:
+       * README.MinGW:
+       * contrib/groffer/README:
+       * contrib/pdfmark/pdfmark.ms:
+       * contrib/pdfmark/pdfroff.1.man:
+       * doc/groff.texi:
+       * doc/webpage.ms:
+       * m4/groff.m4:
+       * man/groff_diff.7.man:
+       * man/groff_tmac.5.man:
+       * man/roff.7.man:
+       * src/preproc/html/pre-html.cpp:
+       * src/roff/troff/troff.1.man: Change "UNIX" to "Unix",
+       discarding markup as necessary.
+
 2018-11-10  G. Branden Robinson <address@hidden>
 
        man pages: Escape interpolated Make variables.
diff --git a/MORE.STUFF b/MORE.STUFF
index 198108f..506dd0a 100644
--- a/MORE.STUFF
+++ b/MORE.STUFF
@@ -219,7 +219,7 @@ miscellaneous
 
   o `AJM Header' is a set of troff macros used in production of the
     Australian Journal of Management.  They use the Memorandum Macros (mm)
-    of AT&T, and so should be invoked with the UNIX troff -mm flag; they
+    of AT&T, and so should be invoked with the Unix troff -mm flag; they
     should also work with the GNU troff -mm flag.
 
 . Various contributed stuff like additional font files, macro packages, and
diff --git a/NEWS b/NEWS
index 04ea33d..912e81a 100644
--- a/NEWS
+++ b/NEWS
@@ -1326,7 +1326,7 @@ o The escapes `\%', `\&', `\)', and `\:' no longer cause 
an error in \X;
   single space characters.
 
 o The default tab distance in nroff mode is now 0.8i to be compatible
-  with UNIX troff.
+  with Unix troff.
 
 o Using the latin-1 input character 0xAD (soft hyphen) for the `shc'
   request was a bad idea.  Instead, it is now translated to `\%', and
@@ -1366,7 +1366,7 @@ o The PSPIC macro has been extended to work with DVI 
output (`pspic.tmac' is
 o The trace.tmac package now traces calls to `am' also.  Additionally, it
   works in compatibility mode.
 
-o `troff.1' has been split.  Differences to UNIX troff are now documented
+o `troff.1' has been split.  Differences to Unix troff are now documented
   in the new man page `groff_diff.7'.
 
 o `groff_mwww.7' has been renamed to `groff_www.7'.  The file mwww.tmac
diff --git a/README.MinGW b/README.MinGW
index cc10516..2cbc35e 100644
--- a/README.MinGW
+++ b/README.MinGW
@@ -115,7 +115,7 @@
   In the case of building with MinGW, the default behaviour of configure is
   not appropriate for the following reasons.
 
-  o The MSYS environment creates a virtual UNIX-like file system, with its
+  o The MSYS environment creates a virtual Unix-like file system, with its
     root mapped to the actual MS-Windows directory where MSYS itself is
     installed; /usr is also mapped to this MSYS installation directory.
 
@@ -131,7 +131,7 @@
 
   o Knowledge of the MSYS virtual file system is not imparted to groff; it
     expects the compiled-in path to its components to be a fully qualified
-    MS-Windows path name (although UNIX-style slashes are permitted, and
+    MS-Windows path name (although Unix-style slashes are permitted, and
     preferred to the MS-Windows style backslashes, to demarcate the directory
     hierarchy).  Thus, when configuring groff, if
     --prefix=<win32-install-path> is not correctly specified, then the
@@ -161,7 +161,7 @@
     ./configure --prefix=D:/MSYS/1.0/local ...
 
   Note that the backslash characters, which appear in the native MS-Windows
-  form of the path name, are replaced by UNIX-style slashes in the argument to
+  form of the path name, are replaced by Unix-style slashes in the argument to
   configure; this is the preferred syntax.
 
   Also note that the MS-Windows device designator (D: in this instance) is
@@ -238,9 +238,9 @@
   -------------------------
 
   The runtime environment, provided to groff by MSYS, is essentially the same
-  as would be provided under a UNIX or GNU/Linux operating system; thus, any
+  as would be provided under a Unix or GNU/Linux operating system; thus, any
   environment variables which may be used to customize the groff runtime
-  environment have similar effects under MSYS, as they would in UNIX or
+  environment have similar effects under MSYS, as they would in Unix or
   GNU/Linux, with the exception that any variable specifying a path should
   adopt the same syntax as a native MS-Windows PATH specification.
 
@@ -254,7 +254,7 @@
   creating temporary files.  When these conditions arise, groff fails with a
   `permission denied' error, as soon as it tries to create any temporary file.
 
-  To specify the location for creating temporary files, the standard UNIX or
+  To specify the location for creating temporary files, the standard Unix or
   GNU/Linux implementation of groff provides the GROFF_TMPDIR or TMPDIR
   environment variables, whereas MS-Windows applications generally use TMP or
   TEMP; furthermore, the MS-Windows implementations of Ghostscript apparently
@@ -271,7 +271,7 @@
   ----------------
 
   There are two known issues, observed when running groff in the MinGW/MSYS
-  environment, which would not affect groff in its native UNIX environment:
+  environment, which would not affect groff in its native Unix environment:
 
   o Running groff with the working directory set to a subdirectory of a
     network share, where the user does not have write permission in the root
@@ -295,7 +295,7 @@
       cat | groff ...
 
     in which case <Ctrl-D> terminates the standard input stream, in just the
-    same way it does on a UNIX system; the cat executable provided with MSYS
+    same way it does on a Unix system; the cat executable provided with MSYS
     does seem to trap the end-of-file condition, and properly signals groff
     that the input stream has terminated.
 
diff --git a/contrib/groffer/README b/contrib/groffer/README
index 3128e71..2d638f3 100644
--- a/contrib/groffer/README
+++ b/contrib/groffer/README
@@ -15,7 +15,7 @@ that is decompressible by 'gzip' or 'bzip2', including '.gz', 
'bz2',
 and '.Z'.
 
 'groffer' has many built-in 'man' functionalities to find and read the
-manual pages on UNIX and similar operating systems.  It accepts the
+manual pages on Unix and similar operating systems.  It accepts the
 information from an installed 'man' program, but tries to find a man
 path by itself.
 
diff --git a/contrib/pdfmark/pdfmark.ms b/contrib/pdfmark/pdfmark.ms
index bb7debc..62e0df8 100644
--- a/contrib/pdfmark/pdfmark.ms
+++ b/contrib/pdfmark/pdfmark.ms
@@ -245,8 +245,7 @@ for information and availability.
 .FE
 Other tools employed, which should be readily available on
 .EM any
-.SM
-UNIX\(tm
+Unix\(tm
 .LG
 or GNU/Linux system, are
 .CW sed ,
@@ -274,8 +273,7 @@ but comprehensive
 POSIX
 .LG
 emulation environment and
-.SM
-UNIX\(tm
+Unix\(tm
 .LG
 toolkit for 32\(hybit Microsoft\*(rg Windows\(tm platforms; see
 .pdfhref W http://cygwin.com
@@ -284,8 +282,7 @@ for information and download.
 or MSYS.\**
 .FS
 Another free, but minimal suite of common
-.SM
-UNIX\(tm
+Unix\(tm
 .LG
 tools for 32\(hybit Microsoft\*(rg Windows\(tm, available for download from
 .pdfhref W -A ; http://www.mingw.org
@@ -1198,8 +1195,7 @@ be separated from the preceding option flag by one or more
 be used).
 It may be noted that this paradigm for specifying options
 is reminiscent of most
-.SM
-UNIX\(tm
+Unix\(tm
 .LG
 shells; however, in the case of the
 .CW pdfhref
@@ -1489,7 +1485,7 @@ option.
 .IP \*[= -UF\0 unix\(hyfile > <]
 Specifies the name of the file in which a link destination is defined,
 using the file naming semantics of the
-.CW UNIX \(tm
+.CW Unix \(tm
 operating system.
 When the PDF document is read on a machine
 where the operating system uses
@@ -2032,7 +2028,7 @@ for each of the
 .CW MS\(hyDOS \*(rg,
 .CW Apple \*(rg
 .CW Macintosh \*(rg,
-.CW UNIX \(tm
+.CW Unix \(tm
 and
 .CW MS\(hyWindows \*(rg
 operating systems, respectively; see the
diff --git a/contrib/pdfmark/pdfroff.1.man b/contrib/pdfmark/pdfroff.1.man
index 89f59d8..f27b59b 100644
--- a/contrib/pdfmark/pdfroff.1.man
+++ b/contrib/pdfmark/pdfroff.1.man
@@ -624,7 +624,7 @@ to search for external helper programs.
 If set,
 .I \%PATH_SEPARATOR
 overrides the default separator character,
-(\[oq]:\[cq] on POSIX/UNIX systems,
+(\[oq]:\[cq] on POSIX/Unix systems,
 inferred from
 .I \%OSTYPE
 on Microsoft Win32/MS-DOS),
diff --git a/doc/groff.texi b/doc/groff.texi
index 6158c4d..662ede0 100644
--- a/doc/groff.texi
+++ b/doc/groff.texi
@@ -599,8 +599,7 @@ developing GNU and promoting software freedom.''
 
 GNU @code{troff} (or @code{groff}) is a system for typesetting
 documents.  @code{troff} is very flexible and has been used extensively
-for some thirty years.  It is well entrenched in the @acronym{UNIX}
-community.
+for some thirty years.  It is well entrenched in the Unix community.
 
 @menu
 * What Is groff?::
@@ -645,7 +644,7 @@ Most of the @acronym{WYSIWYG} systems are either non-free 
or are not
 very portable.
 
 @item
address@hidden is firmly entrenched in all @acronym{UNIX} systems.
address@hidden is firmly entrenched in all Unix systems.
 
 @item
 It is difficult to have a wide range of capabilities within the confines
@@ -691,12 +690,12 @@ document'', meaning to print it out.
 @c
 Bob Morris ported it to the 635 architecture and called the program
 @code{roff} (an abbreviation of @code{runoff}).  It was rewritten as
address@hidden for the @w{PDP-7} (before having @acronym{UNIX}), and at the
address@hidden for the @w{PDP-7} (before having Unix), and at the
 same time (1969), Doug McIlroy rewrote an extended and simplified
 version of @code{roff} in the @acronym{BCPL} programming language.
 
 @cindex @code{roff}, the program
-In 1971, the UNIX developers wanted to get a @w{PDP-11}, and to justify
+In 1971, the Unix developers wanted to get a @w{PDP-11}, and to justify
 the cost, proposed the development of a document formatting system for
 the @acronym{AT&T} patents division.  This first formatting program was
 a reimplementation of McIlroy's @code{roff}, written by address@hidden@:
@@ -722,7 +721,7 @@ changes).
 Since there are several things that cannot be done easily in
 @code{troff}, work on several preprocessors began.  These programs would
 transform certain parts of a document into @code{troff}, which made a
-very natural use of pipes in @acronym{UNIX}.
+very natural use of pipes in Unix.
 
 The @code{eqn} preprocessor allowed mathematical formulae to be specified
 in a much simpler and more intuitive manner.  @code{tbl} is a
@@ -896,12 +895,12 @@ understand their own language and produce the necessary 
@code{groff}
 operations.  These preprocessors are able to differentiate their own
 input from the rest of the document via markers.
 
-To use a preprocessor, @acronym{UNIX} pipes are used to feed the output
-from the preprocessor into @code{groff}.  Any number of preprocessors
-may be used on a given document; in this case, the preprocessors are
-linked together into one pipeline.  However, with @code{groff}, the user
-does not need to construct the pipe, but only tell @code{groff} what
-preprocessors to use.
+To use a preprocessor, Unix pipes are used to feed the output from the
+preprocessor into @code{groff}.  Any number of preprocessors may be used
+on a given document; in this case, the preprocessors are linked together
+into one pipeline.  However, with @code{groff}, the user does not need
+to construct the pipe, but only tell @code{groff} what preprocessors to
+use.
 
 @code{groff} currently has preprocessors for producing tables
 (@code{tbl}), typesetting equations (@code{eqn}), drawing pictures
@@ -1676,11 +1675,11 @@ Preview @file{file} with @code{gxditview}, using the 
@file{me} macro
 package.  Since no @option{-T} option is specified, use the default
 device (@samp{ps}).  Note that you can either say @address@hidden me}} or
 @address@hidden; the latter is an anachronism from the early days of
address@hidden@footnote{The same is true for the other main macro
-packages that come with @code{groff}: @file{man}, @file{mdoc},
address@hidden, @file{mm}, and @file{mandoc}.  This won't work in general;
-for example, to load @file{trace.tmac}, either @samp{-mtrace} or
address@hidden@samp{-m trace}} must be used.}
address@hidden same is true for the other main macro packages that
+come with @code{groff}: @file{man}, @file{mdoc}, @file{ms}, @file{mm},
+and @file{mandoc}.  This won't work in general; for example, to load
address@hidden, either @samp{-mtrace} or @address@hidden trace}} must be
+used.}
 
 @Example
 groff -man -rD1 -z file
@@ -1726,7 +1725,7 @@ grog -Tdvi paper.ms
 guesses the appropriate command to print @file{paper.ms} and then prints
 it to the command line after adding the @option{-Tdvi} option.  For
 direct execution, enclose the call to @code{grog} in backquotes at the
address@hidden shell prompt:
+Unix shell prompt:
 
 @Example
 `grog -Tdvi paper.ms` > paper.dvi
@@ -4440,10 +4439,10 @@ Multiple line spacing is not supported.  Use a larger 
vertical spacing
 instead.
 
 @item
-Some @acronym{UNIX} @code{ms} documentation says that the @code{CW} and
address@hidden number registers can be used to control the column width and
-gutter width, respectively.  These number registers are not used in
address@hidden -ms}.
+Some Unix @code{ms} documentation says that the @code{CW} and @code{GW}
+number registers can be used to control the column width and gutter
+width, respectively.  These number registers are not used in @code{groff
+-ms}.
 
 @item
 Macros that cause a reset (paragraphs, headings, etc.@:) may change the
@@ -5739,8 +5738,8 @@ Use the double quote glyph @code{\(dq}.  This works with 
and without
 compatibility mode enabled since @code{gtroff} doesn't convert
 @code{\(dq} back to a double quote input character.
 
-Note that this method won't work with @acronym{UNIX} @code{troff} in
-general since the glyph `dq' isn't defined normally.
+Note that this method won't work with Unix @code{troff} in general since
+the glyph `dq' isn't defined normally.
 @end itemize
 
 @cindex @code{ds} request, and double quotes
@@ -6435,8 +6434,8 @@ The following example produces @samp{10, X, j, 010}:
 @cindex maximum values of Roman numerals
 @cindex minimum values of Roman numerals
 The largest number representable for the @samp{i} and @samp{I} formats
-is 39999 (or @minus{}39999); @acronym{UNIX} @code{troff} uses @samp{z}
-and @samp{w} to represent 10000 and 5000 in Roman numerals, and so does
+is 39999 (or @minus{}39999); Unix @code{troff} uses @samp{z} and
address@hidden to represent 10000 and 5000 in Roman numerals, and so does
 @code{gtroff}.  Currently, the correct glyphs of Roman numeral five
 thousand and Roman numeral ten thousand (Unicode code points
 @code{U+2182} and @code{U+2181}, respectively) are not available.
@@ -6564,9 +6563,9 @@ The current year.
 @item \n[yr]
 @vindex yr
 The current year address@hidden  Unfortunately, the documentation of
address@hidden address@hidden's @code{troff} had a address@hidden bug:
-It incorrectly claimed that @code{yr} contains the last two digits of
-the year.  That claim has never been true of either @acronym{AT&T}
+Unix address@hidden's @code{troff} had a address@hidden bug: It
+incorrectly claimed that @code{yr} contains the last two digits of the
+year.  That claim has never been true of either @acronym{AT&T}
 @code{troff} or GNU @code{troff}.  Old @code{troff} input that looks
 like this:
 
@@ -6898,9 +6897,9 @@ the end of a line in fill mode, then both an inter-word 
space and a
 sentence space are added; if two spaces follow the end of a sentence in
 the middle of a line, then the second space is a sentence space.  If a
 second argument is never given to the @code{ss} request, the behaviour
-of @acronym{UNIX} @code{troff} is the same as that exhibited by GNU
address@hidden  In GNU @code{troff}, as in @acronym{UNIX} @code{troff}, a
-sentence should always be followed by either a newline or two spaces.
+of Unix @code{troff} is the same as that exhibited by GNU @code{troff}.
+In GNU @code{troff}, as in Unix @code{troff}, a sentence should always
+be followed by either a newline or two spaces.
 
 The read-only number registers @code{.ss} and @code{.sss} hold the
 values of the parameters set by the first and second arguments of the
@@ -8294,8 +8293,8 @@ the former for TTY output, the latter for everything 
else.  With GNU
 @code{troff}, both programs are merged into one executable, sending its
 output to a device driver (@code{grotty} for TTY devices, @code{grops}
 for @sc{PostScript}, etc.)@: which interprets the intermediate output of
address@hidden  For @acronym{UNIX} @code{troff} it makes sense to talk
-about @dfn{Nroff mode} and @dfn{Troff mode} since the differences are
address@hidden  For Unix @code{troff} it makes sense to talk about
address@hidden mode} and @dfn{Troff mode} since the differences are
 hardcoded.  For GNU @code{troff}, this distinction is not appropriate
 because @code{gtroff} simply takes the information given in the font
 files for a particular device without handling requests specially if a
@@ -8420,8 +8419,7 @@ cause a break, so changing the page offset in the middle 
of text being
 filled may not yield the expected result.  The initial value is
 address@hidden  For TTY output devices, it is set to 0 in the startup file
 @file{troffrc}; the default scaling indicator is @samp{m} (and not
address@hidden as incorrectly documented in the original @acronym{UNIX} troff
-manual).
address@hidden as incorrectly documented in the original Unix troff manual).
 
 The current page offset can be found in the read-only number register
 @samp{.o}.
@@ -10062,8 +10060,8 @@ a single character as an argument) to change the font 
on the fly:
 .mc \S'20'x\S'0'
 @endExample
 
-This request is incorrectly documented in the original @acronym{UNIX}
-troff manual; the slant is always set to an absolute value.
+This request is incorrectly documented in the original Unix troff
+manual; the slant is always set to an absolute value.
 @endDefesc
 
 @Defreq {ul, address@hidden
@@ -10780,7 +10778,7 @@ This means that comments on a line with such a request 
can introduce
 unwanted space into a string.
 
 @Example
-.ds UX \s-1UNIX\s0\u\s-3tm\s0\d \" UNIX trademark
+.ds TeX T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X \" Knuth's TeX
 @endExample
 
 @noindent
@@ -10788,7 +10786,7 @@ Instead the comment should be put on another line or 
have the comment
 escape adjacent with the end of the string.
 
 @Example
-.ds UX \s-1UNIX\s0\u\s-3tm\s0\d\"  UNIX trademark
+.ds TeX T\h'-.1667m'\v'.224m'E\v'-.224m'\h'-.125m'X\" Knuth's TeX
 @endExample
 
 @cindex trailing quotes
@@ -10918,7 +10916,7 @@ test
 @endExample
 
 Usually, it is not predictable whether a diversion contains one or more
-output lines, so this mechanism should be avoided.  With @acronym{UNIX}
+output lines, so this mechanism should be avoided.  With Unix
 @code{troff}, this was the only solution to strip off a final newline
 from a diversion.  Another disadvantage is that the spaces in the copied
 string are already formatted, making them unstretchable.  This can cause
@@ -11254,7 +11252,7 @@ false
 @endExample
 
 A whitespace after @samp{!} always evaluates to zero (this bizarre
-behaviour is due to compatibility with @acronym{UNIX} @code{troff}).
+behaviour is due to compatibility with Unix @code{troff}).
 
 @Example
 .nr xxx 1
@@ -11394,9 +11392,9 @@ parsed and stored again as a temporary macro.
 @cindex recursive macros
 @cindex macros, recursive
 @noindent
-The traditional and often better solution (@acronym{UNIX} @code{troff}
-doesn't have the @code{while} request) is to use a recursive macro
-instead that is parsed only once during its definition.
+The traditional and often better solution (Unix @code{troff} doesn't
+have the @code{while} request) is to use a recursive macro instead that
+is parsed only once during its definition.
 
 @Example
 .de yyy
@@ -13685,8 +13683,8 @@ becomes part of the diversion.
 Both @code{trf} and @code{cf}, when used in a diversion, embeds an
 object in the diversion which, when reread, causes the contents of
 @var{file} to be transparently copied through to the output.  In
address@hidden @code{troff}, the contents of @var{file} is immediately
-copied through to the output regardless of whether there is a current
+Unix @code{troff}, the contents of @var{file} is immediately copied
+through to the output regardless of whether there is a current
 diversion; this behaviour is so anomalous that it must be considered a
 bug.
 
@@ -14010,9 +14008,9 @@ However, the contents of the string or macro @var{name} 
are not
 interpreted; also it is permitted for @var{name} to have been defined as
 a macro and thus contain newlines (it is not permitted for the argument
 to @code{\X} to contain newlines).  The inclusion of newlines requires
-an extension to the @acronym{UNIX} @code{troff} output format, and
-confuses drivers that do not know about this extension (@pxref{Device
-Control Commands}).
+an extension to the Unix @code{troff} output format, and confuses
+drivers that do not know about this extension (@pxref{Device Control
+Commands}).
 @endDefesc
 
 @xref{Output Devices}.
@@ -14440,10 +14438,10 @@ macros, strings, and diversions are print together 
with their size in
 bytes.  Since @code{gtroff} sometimes adds nodes by itself, the returned
 size can be larger than expected.
 
-This request differs from @acronym{UNIX} @code{troff}: @code{gtroff}
-reports the sizes of diversions, ignores an additional argument to print
-only the total of the sizes, and the size isn't returned in blocks of
-128 characters.
+This request differs from Unix @code{troff}: @code{gtroff} reports the
+sizes of diversions, ignores an additional argument to print only the
+total of the sizes, and the size isn't returned in blocks of 128
+characters.
 @endDefreq
 
 @Defreq {pnr, }
@@ -14469,9 +14467,9 @@ subsequently planted traps.
 @cindex @code{gtroff}, interactive use
 Instruct @code{gtroff} to flush its output immediately.  The intent is
 for interactive use, but this behaviour is currently not implemented in
address@hidden  Contrary to @acronym{UNIX} @code{troff}, TTY output is
-sent to a device driver also (@code{grotty}), making it non-trivial to
-communicate interactively.
address@hidden  Contrary to Unix @code{troff}, TTY output is sent to a
+device driver also (@code{grotty}), making it non-trivial to communicate
+interactively.
 
 This request causes a line break.
 @endDefreq
@@ -14731,8 +14729,7 @@ with documents written with old versions of 
@code{troff}.
 
 @cindex long names
 @cindex names, long
-Long names cause some incompatibilities.  @acronym{UNIX} @code{troff}
-interprets
+Long names cause some incompatibilities.  Unix @code{troff} interprets
 
 @Example
 .dsabcd
@@ -14743,12 +14740,11 @@ interprets
 @noindent
 as defining a string @samp{ab} with contents @samp{cd}.  Normally, GNU
 @code{troff} interprets this as a call of a macro named @code{dsabcd}.
-Also @acronym{UNIX} @code{troff} interprets @code{\*[} or @code{\n[} as
-references to a string or number register called @samp{[}.  In GNU
address@hidden, however, this is normally interpreted as the start of a
-long name.  In compatibility mode GNU @code{troff} interprets long names
-in the traditional way (which means that they are not recognized as
-names).
+Also Unix @code{troff} interprets @code{\*[} or @code{\n[} as references
+to a string or number register called @samp{[}.  In GNU @code{troff},
+however, this is normally interpreted as the start of a long name.  In
+compatibility mode GNU @code{troff} interprets long names in the
+traditional way (which means that they are not recognized as names).
 
 @DefreqList {cp, address@hidden
 @DefreqItemx {do, cmd}
@@ -14833,9 +14829,9 @@ GNU @code{troff} does not allow the use of the escape 
sequences
 @code{\|}, @code{\^}, @code{\&}, @address@hidden, @address@hidden,
 @address@hidden, @code{\'}, @code{\`}, @code{\-}, @code{\_}, @code{\!},
 @code{\%}, and @code{\c} in names of strings, macros, diversions, number
-registers, fonts or environments; @acronym{UNIX} @code{troff} does.  The
address@hidden escape sequence (@pxref{Identifiers}) may be helpful in
-avoiding use of these escape sequences in names.
+registers, fonts or environments; Unix @code{troff} does.  The @code{\A}
+escape sequence (@pxref{Identifiers}) may be helpful in avoiding use of
+these escape sequences in names.
 
 @cindex fractional point sizes
 @cindex fractional type sizes
@@ -14844,8 +14840,8 @@ avoiding use of these escape sequences in names.
 @cindex sizes, fractional
 @cindex @code{ps} request, incompatibilities with @acronym{AT&T} @code{troff}
 Fractional point sizes cause one noteworthy incompatibility.  In
address@hidden @code{troff} the @code{ps} request ignores scale
-indicators and thus
+Unix @code{troff} the @code{ps} request ignores scale indicators and
+thus
 
 @Example
 .ps 10u
@@ -14897,18 +14893,18 @@ character from which it was constructed might have 
had.  For example,
 prints @samp{\\} in GNU @code{troff}; each pair of input backslashes is
 turned into one output backslash and the resulting output backslashes
 are not interpreted as escape characters when they are reread.
address@hidden @code{troff} would interpret them as escape characters
-when they were reread and would end up printing one @samp{\}.  The
-correct way to obtain a printable backslash is to use the @code{\e}
-escape sequence: This always prints a single instance of the current
-escape character, regardless of whether or not it is used in a
-diversion; it also works in both GNU @code{troff} and @acronym{UNIX}
address@hidden@footnote{To be completely independent of the current
-escape character, use @code{\(rs}, which represents a reverse solidus
-(backslash) glyph.}  To store, for some reason, an escape sequence in a
-diversion that is interpreted when the diversion is reread, either use
-the traditional @code{\!} transparent output facility, or, if this is
-unsuitable, the new @code{\?} escape sequence.
+Unix @code{troff} would interpret them as escape characters when they
+were reread and would end up printing one @samp{\}.  The correct way to
+obtain a printable backslash is to use the @code{\e} escape sequence:
+This always prints a single instance of the current escape character,
+regardless of whether or not it is used in a diversion; it also works in
+both GNU @code{troff} and Unix @address@hidden be completely
+independent of the current escape character, use @code{\(rs}, which
+represents a reverse solidus (backslash) glyph.}  To store, for some
+reason, an escape sequence in a diversion that is interpreted when the
+diversion is reread, either use the traditional @code{\!} transparent
+output facility, or, if this is unsuitable, the new @code{\?} escape
+sequence.
 
 @xref{Diversions}, and @ref{Gtroff Internals}, for more information.
 
@@ -16071,7 +16067,7 @@ current page.
 
 @item h @var{n}
 Move @var{n} (a non-negative integer) basic units @samp{u} horizontally
-to the right.  The original @acronym{UNIX} troff manual allows negative
+to the right.  The original Unix troff manual allows negative
 values for @var{n} also, but @code{gtroff} doesn't use this.
 
 @item m @var{color-scheme} @address@hidden @address@hidden
@@ -16161,8 +16157,8 @@ integer in basic units @samp{u}) relative to upper edge 
of current page.
 
 @item v @var{n}
 Move @address@hidden units @samp{u} down (@var{n} is a non-negative
-integer).  The original @acronym{UNIX} troff manual allows negative
-values for @var{n} also, but @code{gtroff} doesn't use this.
+integer).  The original Unix troff manual allows negative values for
address@hidden also, but @code{gtroff} doesn't use this.
 
 @item w
 Informs about a paddable white space to increase readability.  The
@@ -16403,7 +16399,7 @@ Initialize device.  This is the third command of the 
prologue.
 @item address@hidden break}
 The @samp{p} stands for @var{pause}.
 
-Parsed but ignored.  The original @acronym{UNIX} troff manual writes
+Parsed but ignored.  The original Unix troff manual writes
 
 @display
 pause device, can be restarted
@@ -16625,9 +16621,9 @@ Due to the obsolete jump-and-write command, the text 
clusters in the
 @subsection Output Language Compatibility
 
 The intermediate output language of @acronym{AT&T} @code{troff} was
-first documented in the @acronym{UNIX} troff manual, with later
-additions documented in @cite{A Typesetter-independent TROFF}, written
-by Brian Kernighan.
+first documented in the Unix troff manual, with later additions
+documented in @cite{A Typesetter-independent TROFF}, written by Brian
+Kernighan.
 
 The @code{gtroff} intermediate output format is compatible with this
 specification except for the following features.
diff --git a/doc/webpage.ms b/doc/webpage.ms
index 60f5414..ee4f440 100644
--- a/doc/webpage.ms
+++ b/doc/webpage.ms
@@ -2114,7 +2114,7 @@ Additionally `\e\ ' and `\e~' are converted to single 
space characters.
 
 .LI
 The default tab distance in nroff mode is now 0.8i to be compatible
-with UNIX troff.
+with Unix troff.
 
 .LI
 Using the latin-1 input character 0xAD (soft hyphen) for the `shc'
@@ -2158,7 +2158,7 @@ exit status.
 
 .LI
 `troff.man' has been split.
-Differences to UNIX troff are now documented in the new man page
+Differences to Unix troff are now documented in the new man page
 `groff_diff.man'.
 
 .LI
@@ -2172,7 +2172,7 @@ Additionally, it works in compatibility mode.
 
 .LI
 `troff.1' has been split.
-Differences to UNIX troff are now documented in the new man page
+Differences to Unix troff are now documented in the new man page
 `groff_diff.7'.
 
 .LI
diff --git a/m4/groff.m4 b/m4/groff.m4
index aba0c9b..79aa095 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -1023,7 +1023,7 @@ AC_DEFUN([GROFF_G],
 #     groff implementation of the 'an' macro set.
 #
 #     With groff being the principal (but not the only) full-featured *roff
-#     implementation in use today, and most FLOSS UNIX-like Operating Systems
+#     implementation in use today, and most FLOSS Unix-like Operating Systems
 #     using groff as their *roff implementation, the automatic implementation
 #     of compatibility wrappers on systems having their own macro sets needs to
 #     be revisited. Most FLOSS software is now developed on systems having no
@@ -1153,7 +1153,7 @@ AC_DEFUN([GROFF_INSTALL_INFO],
    fi])
 
 
-# At least one UNIX system, Apple Macintosh Rhapsody 5.5,
+# At least one Unix system, Apple Macintosh Rhapsody 5.5,
 # does not have -lm ...
 
 AC_DEFUN([GROFF_LIBM],
diff --git a/man/groff_diff.7.man b/man/groff_diff.7.man
index 88f1e6f..a6e15d4 100644
--- a/man/groff_diff.7.man
+++ b/man/groff_diff.7.man
@@ -339,9 +339,8 @@ Normally it is more convenient to use
 .BI \[rs][ xxx ]\f[R].
 But
 .B \[rs]C
-has the advantage that it is compatible with recent versions of
-UNIX
-and is available in compatibility mode.
+has the advantage that it is compatible with recent versions of Unix and
+is available in compatibility mode.
 .
 .TP
 .B \[rs]E
@@ -613,9 +612,8 @@ permitted for the argument to
 .B \[rs]X
 to contain newlines).
 .
-The inclusion of newlines requires an extension to the UNIX troff
-output format, and confuses drivers that do not know about this
-extension.
+The inclusion of newlines requires an extension to the Unix troff output
+format, and confuses drivers that do not know about this extension.
 .
 .TP
 .BI \[rs]Z' anything '
@@ -2557,7 +2555,7 @@ which, when reread, will cause the contents of
 .I filename
 to be transparently copied through to the output.
 .
-In UNIX troff, the contents of
+In Unix troff, the contents of
 .I filename
 is immediately copied through to the output regardless of whether
 there is a current diversion; this behaviour is so anomalous that it
@@ -2615,7 +2613,7 @@ one twelfth of the spacewidth parameter for the current 
font.
 Initially both the word space size and the sentence
 space size are\~12.
 .
-Contrary to UNIX troff, GNU troff handles this request in nroff mode
+Contrary to Unix troff, GNU troff handles this request in nroff mode
 also; a given value is then rounded down to the nearest multiple
 of\~12.
 .
@@ -2626,12 +2624,12 @@ then both an inter-word space and a sentence space are 
added; if
 two spaces follow the end of a sentence in the middle of a line, then
 the second space is a sentence space.
 .
-Note that the behaviour of UNIX troff is exactly that exhibited
+Note that the behaviour of Unix troff is exactly that exhibited
 by GNU troff if a second argument is never given to the
 .B ss
 request.
 .
-In GNU troff, as in UNIX troff, you should always follow a sentence
+In GNU troff, as in Unix troff, you should always follow a sentence
 with either a newline or two spaces.
 .
 .TP
@@ -3130,7 +3128,7 @@ is called with the
 .B \-T
 command-line option, and zero otherwise.
 .
-This behaviour is different to UNIX troff.
+This behaviour is different to Unix troff.
 .
 .P
 Fonts not listed in the
diff --git a/man/groff_tmac.5.man b/man/groff_tmac.5.man
index 939bb4a..fcf4cd1 100644
--- a/man/groff_tmac.5.man
+++ b/man/groff_tmac.5.man
@@ -106,7 +106,7 @@ file.
 .
 .TP
 .B man
-This is the classical macro package for UNIX manual pages
+This is the classical macro package for Unix manual pages
 (man\~pages); it is quite handy and easy to use; see
 .BR groff_man (@MAN7EXT@).
 .
diff --git a/man/roff.7.man b/man/roff.7.man
index 0bf443f..06fbd8f 100644
--- a/man/roff.7.man
+++ b/man/roff.7.man
@@ -92,13 +92,13 @@ In this document, the term
 .I roff
 always refers to the general class of roff programs, not to the
 .B roff
-command provided in early UNIX systems.
+command provided in early Unix systems.
 .
 .
 .P
 In spite of its age,
 .I roff
-is in wide use today, for example, the manual pages on UNIX systems
+is in wide use today, for example, the manual pages on Unix systems
 .RI ( man\~pages ),
 many software books, system documentation, standards, and corporate
 documents are written in roff.
@@ -112,11 +112,11 @@ than some of the commercial systems.
 .
 .P
 .I roff
-is used to format UNIX
+is used to format Unix
 .IR "manual pages" ,
 (or
 .IR "man pages" ),
-the standard documentation system on many UNIX-derived operating
+the standard documentation system on many Unix-derived operating
 systems.
 .
 .
@@ -1212,7 +1212,7 @@ are documented in great detail.
 .\" ====================================================================
 .
 .TP
-History of UNIX Manpages
+History of Unix Manpages
 .UR http://\:manpages.bsd.lv/\:history.html
 The history page
 .UE
diff --git a/src/preproc/html/pre-html.cpp b/src/preproc/html/pre-html.cpp
index 877fde5..46defda 100644
--- a/src/preproc/html/pre-html.cpp
+++ b/src/preproc/html/pre-html.cpp
@@ -97,7 +97,7 @@
    where to put intermediate files (the DEBUGGING version will preserve
    these on exit).
 
-   On a UNIX host, we might simply use '/tmp', but MS-DOS and Win32 will
+   On a Unix host, we might simply use '/tmp', but MS-DOS and Win32 will
    probably not have this on all disk drives, so default to using
    'c:/temp' instead.  (Note that user may choose to override this by
    supplying a definition such as
@@ -111,13 +111,13 @@
 
 #else /* not __MSDOS__ or _WIN32 */
 
-// For non-Microsoft environments assume UNIX conventions,
+// For non-Microsoft environments assume Unix conventions,
 // so 'fork' is required and child processes are asynchronous.
 # define MAY_FORK_CHILD_PROCESS 1
 # define MAY_SPAWN_ASYNCHRONOUS_CHILD 1
 
 # if defined(DEBUGGING) && !defined(DEBUG_FILE_DIR)
-/* For a DEBUGGING version, on the UNIX host, we can also usually rely
+/* For a DEBUGGING version, on the Unix host, we can also usually rely
    on being able to use '/tmp' for temporary file storage.  (Note that,
    as in the __MSDOS__ or _WIN32 case above, the user may override this
    by defining
@@ -1312,7 +1312,7 @@ int char_buffer::run_output_filter(int filter, int argc, 
char **argv)
     sys_fatal("pipe");
 
 #if MAY_FORK_CHILD_PROCESS
-  // This is the UNIX process model.  To invoke our post-processor,
+  // This is the Unix process model.  To invoke our post-processor,
   // we must 'fork' the current process.
 
   if ((child_pid = fork()) < 0)
diff --git a/src/roff/troff/troff.1.man b/src/roff/troff/troff.1.man
index 05024c8..987e7f8 100644
--- a/src/roff/troff/troff.1.man
+++ b/src/roff/troff/troff.1.man
@@ -56,7 +56,7 @@ This manual page describes the GNU version of
 .
 It is part of the groff document formatting system.
 .
-It is functionally compatible with UNIX troff, but has many
+It is functionally compatible with Unix troff, but has many
 extensions, see
 .BR \%groff_diff (@MAN7EXT@).
 .



reply via email to

[Prev in Thread] Current Thread [Next in Thread]