diff --git a/Doc/lib/liballos.tex b/Doc/lib/liballos.tex
index cc889f3..cfd7e46 100644
--- a/Doc/lib/liballos.tex
+++ b/Doc/lib/liballos.tex
@@ -24,10 +24,10 @@
 --- Standard errno system symbols.
 
 \item[glob]
---- Unix shell style pathname pattern expansion.
+--- \UNIX{} shell style pathname pattern expansion.
 
 \item[fnmatch]
---- Unix shell style pathname pattern matching.
+--- \UNIX{} shell style pathname pattern matching.
 
 \item[locale]
 --- Internationalization services.
diff --git a/Doc/lib/libcgi.tex b/Doc/lib/libcgi.tex
index a414096..6b50ec8 100644
--- a/Doc/lib/libcgi.tex
+++ b/Doc/lib/libcgi.tex
@@ -263,7 +263,7 @@
 installed; usually this is in a directory \file{cgi-bin} in the server tree.
 
 Make sure that your script is readable and executable by ``others''; the
-Unix file mode should be 755 (use \code{chmod 755 filename}).  Make sure
+\UNIX{} file mode should be 755 (use \code{chmod 755 filename}).  Make sure
 that the first line of the script contains \code{\#!} starting in column 1
 followed by the pathname of the Python interpreter, for instance:
 
@@ -297,7 +297,7 @@
 %
 (This way, the directory inserted last will be searched first!)
 
-Instructions for non-Unix systems will vary; check your HTTP server's
+Instructions for non-\UNIX{} systems will vary; check your HTTP server's
 documentation (it will usually have a section on CGI scripts).
 
 
diff --git a/Doc/lib/libfcntl.tex b/Doc/lib/libfcntl.tex
index 21f2514..15aeec2 100644
--- a/Doc/lib/libfcntl.tex
+++ b/Doc/lib/libfcntl.tex
@@ -38,13 +38,13 @@
 
 \begin{funcdesc}{flock}{fd\, op}
 Perform the lock operation \var{op} on file descriptor \var{fd}.
-See the Unix manual for details.  (On some systems, this function is
-emulated using \code{fcntl}.)
+See the \UNIX{} manual for details.  (On some systems, this function is
+emulated using \code{fcntl()}.)
 \end{funcdesc}
 
 \begin{funcdesc}{lockf}{fd\, code\, \optional{len\, \optional{start\, \optional{whence}}}}
 This is a wrapper around the \code{F_SETLK} and \code{F_SETLKW}
-\code{fcntl()} calls.  See the Unix manual for details.
+\code{fcntl()} calls.  See the \UNIX{} manual for details.
 \end{funcdesc}
 
 If the library modules \code{FCNTL} or \code{IOCTL} are missing, you
diff --git a/Doc/liballos.tex b/Doc/liballos.tex
index cc889f3..cfd7e46 100644
--- a/Doc/liballos.tex
+++ b/Doc/liballos.tex
@@ -24,10 +24,10 @@
 --- Standard errno system symbols.
 
 \item[glob]
---- Unix shell style pathname pattern expansion.
+--- \UNIX{} shell style pathname pattern expansion.
 
 \item[fnmatch]
---- Unix shell style pathname pattern matching.
+--- \UNIX{} shell style pathname pattern matching.
 
 \item[locale]
 --- Internationalization services.
diff --git a/Doc/libcgi.tex b/Doc/libcgi.tex
index a414096..6b50ec8 100644
--- a/Doc/libcgi.tex
+++ b/Doc/libcgi.tex
@@ -263,7 +263,7 @@
 installed; usually this is in a directory \file{cgi-bin} in the server tree.
 
 Make sure that your script is readable and executable by ``others''; the
-Unix file mode should be 755 (use \code{chmod 755 filename}).  Make sure
+\UNIX{} file mode should be 755 (use \code{chmod 755 filename}).  Make sure
 that the first line of the script contains \code{\#!} starting in column 1
 followed by the pathname of the Python interpreter, for instance:
 
@@ -297,7 +297,7 @@
 %
 (This way, the directory inserted last will be searched first!)
 
-Instructions for non-Unix systems will vary; check your HTTP server's
+Instructions for non-\UNIX{} systems will vary; check your HTTP server's
 documentation (it will usually have a section on CGI scripts).
 
 
diff --git a/Doc/libfcntl.tex b/Doc/libfcntl.tex
index 21f2514..15aeec2 100644
--- a/Doc/libfcntl.tex
+++ b/Doc/libfcntl.tex
@@ -38,13 +38,13 @@
 
 \begin{funcdesc}{flock}{fd\, op}
 Perform the lock operation \var{op} on file descriptor \var{fd}.
-See the Unix manual for details.  (On some systems, this function is
-emulated using \code{fcntl}.)
+See the \UNIX{} manual for details.  (On some systems, this function is
+emulated using \code{fcntl()}.)
 \end{funcdesc}
 
 \begin{funcdesc}{lockf}{fd\, code\, \optional{len\, \optional{start\, \optional{whence}}}}
 This is a wrapper around the \code{F_SETLK} and \code{F_SETLKW}
-\code{fcntl()} calls.  See the Unix manual for details.
+\code{fcntl()} calls.  See the \UNIX{} manual for details.
 \end{funcdesc}
 
 If the library modules \code{FCNTL} or \code{IOCTL} are missing, you