lots of markup nits, most commonly Unix/unix --> \UNIX
diff --git a/Doc/lib/emailgenerator.tex b/Doc/lib/emailgenerator.tex
index 3415442..b236673 100644
--- a/Doc/lib/emailgenerator.tex
+++ b/Doc/lib/emailgenerator.tex
@@ -31,11 +31,11 @@
\samp{>} character in front of any line in the body that starts exactly as
\samp{From }, i.e. \code{From} followed by a space at the beginning of the
line. This is the only guaranteed portable way to avoid having such
-lines be mistaken for a Unix mailbox format envelope header separator (see
+lines be mistaken for a \UNIX{} mailbox format envelope header separator (see
\ulink{WHY THE CONTENT-LENGTH FORMAT IS BAD}
{http://home.netscape.com/eng/mozilla/2.0/relnotes/demo/content-length.html}
for details). \var{mangle_from_} defaults to \code{True}, but you
-might want to set this to \code{False} if you are not writing Unix
+might want to set this to \code{False} if you are not writing \UNIX{}
mailbox format files.
Optional \var{maxheaderlen} specifies the longest length for a
diff --git a/Doc/lib/libbsddb.tex b/Doc/lib/libbsddb.tex
index b33cf36..44b9168 100644
--- a/Doc/lib/libbsddb.tex
+++ b/Doc/lib/libbsddb.tex
@@ -94,7 +94,7 @@
\begin{notice}
-Beginning in 2.3 some Unix versions of Python may have a \module{bsddb185}
+Beginning in 2.3 some \UNIX{} versions of Python may have a \module{bsddb185}
module. This is present \emph{only} to allow backwards compatibility with
systems which ship with the old Berkeley DB 1.85 database library. The
\module{bsddb185} module should never be used directly in new code.
diff --git a/Doc/lib/libfuncs.tex b/Doc/lib/libfuncs.tex
index c7dc68a..0a187e2 100644
--- a/Doc/lib/libfuncs.tex
+++ b/Doc/lib/libfuncs.tex
@@ -724,7 +724,7 @@
In addition to the standard \cfunction{fopen()} values \var{mode}
may be \code{'U'} or \code{'rU'}. Python is usually built with universal
newline support; supplying \code{'U'} opens the file as a text file, but
- lines may be terminated by any of the following: the Unix end-of-line
+ lines may be terminated by any of the following: the \UNIX{} end-of-line
convention \code{'\e n'},
the Macintosh convention \code{'\e r'}, or the Windows
convention \code{'\e r\e n'}. All of these external representations are seen as
diff --git a/Doc/lib/libossaudiodev.tex b/Doc/lib/libossaudiodev.tex
index 223cf28..4c19aaf 100644
--- a/Doc/lib/libossaudiodev.tex
+++ b/Doc/lib/libossaudiodev.tex
@@ -68,7 +68,7 @@
Open an audio device and return an OSS audio device object. This
object supports many file-like methods, such as \method{read()},
\method{write()}, and \method{fileno()} (although there are subtle
-differences between conventional Unix read/write semantics and those of
+differences between conventional \UNIX{} read/write semantics and those of
OSS audio devices). It also supports a number of audio-specific
methods; see below for the complete list of methods.
diff --git a/Doc/lib/libsocksvr.tex b/Doc/lib/libsocksvr.tex
index b21e804..c7b28ea 100644
--- a/Doc/lib/libsocksvr.tex
+++ b/Doc/lib/libsocksvr.tex
@@ -74,9 +74,9 @@
\end{verbatim}
Note that \class{UnixDatagramServer} derives from \class{UDPServer}, not
-from \class{UnixStreamServer} -- the only difference between an IP and a
-Unix stream server is the address family, which is simply repeated in both
-unix server classes.
+from \class{UnixStreamServer} --- the only difference between an IP and a
+\UNIX{} stream server is the address family, which is simply repeated in both
+\UNIX{} server classes.
Forking and threading versions of each type of server can be created using
the \class{ForkingMixIn} and \class{ThreadingMixIn} mix-in classes. For
diff --git a/Doc/lib/libsqlite3.tex b/Doc/lib/libsqlite3.tex
index bd75901..d87e064 100644
--- a/Doc/lib/libsqlite3.tex
+++ b/Doc/lib/libsqlite3.tex
@@ -512,10 +512,10 @@
\class{object} as one of its bases.
\end{notice}
-The \module{sqlite3} module has two default adapters for Python's builtin
-\class{datetime.date} and \class{datetime.datetime} types. Now let's suppose we
-want to store \class{datetime.datetime} objects not in ISO representation, but
-as Unix timestamp.
+The \module{sqlite3} module has two default adapters for Python's built-in
+\class{datetime.date} and \class{datetime.datetime} types. Now let's suppose
+we want to store \class{datetime.datetime} objects not in ISO representation,
+but as a \UNIX{} timestamp.
\verbatiminput{sqlite3/adapter_datetime.py}
diff --git a/Doc/lib/libsubprocess.tex b/Doc/lib/libsubprocess.tex
index 9ea44dc..03072f7 100644
--- a/Doc/lib/libsubprocess.tex
+++ b/Doc/lib/libsubprocess.tex
@@ -107,7 +107,7 @@
If \var{universal_newlines} is \constant{True}, the file objects stdout
and stderr are opened as text files, but lines may be terminated by
-any of \code{'\e n'}, the Unix end-of-line convention, \code{'\e r'},
+any of \code{'\e n'}, the \UNIX{} end-of-line convention, \code{'\e r'},
the Macintosh convention or \code{'\e r\e n'}, the Windows convention.
All of these external representations are seen as \code{'\e n'} by the
Python program. \note{This feature is only available if Python is built
diff --git a/Doc/lib/libsys.tex b/Doc/lib/libsys.tex
index bd496fe..c0aa238 100644
--- a/Doc/lib/libsys.tex
+++ b/Doc/lib/libsys.tex
@@ -258,14 +258,14 @@
\begin{itemize}
\item On Windows 9x, the encoding is ``mbcs''.
\item On Mac OS X, the encoding is ``utf-8''.
-\item On Unix, the encoding is the user's preference
- according to the result of nl_langinfo(CODESET), or None if
- the nl_langinfo(CODESET) failed.
+\item On \UNIX, the encoding is the user's preference
+ according to the result of nl_langinfo(CODESET), or \constant{None}
+ if the \code{nl_langinfo(CODESET)} failed.
\item On Windows NT+, file names are Unicode natively, so no conversion
- is performed. \code{getfilesystemencoding} still returns ``mbcs'',
- as this is the encoding that applications should use when they
- explicitly want to convert Unicode strings to byte strings that
- are equivalent when used as file names.
+ is performed. \function{getfilesystemencoding()} still returns
+ \code{'mbcs'}, as this is the encoding that applications should use
+ when they explicitly want to convert Unicode strings to byte strings
+ that are equivalent when used as file names.
\end{itemize}
\versionadded{2.3}
\end{funcdesc}
diff --git a/Doc/lib/libtime.tex b/Doc/lib/libtime.tex
index 0e83400..f40838a 100644
--- a/Doc/lib/libtime.tex
+++ b/Doc/lib/libtime.tex
@@ -427,7 +427,7 @@
'16:08:12 05/08/03 AEST'
\end{verbatim}
-On many Unix systems (including *BSD, Linux, Solaris, and Darwin), it
+On many \UNIX{} systems (including *BSD, Linux, Solaris, and Darwin), it
is more convenient to use the system's zoneinfo (\manpage{tzfile}{5})
database to specify the timezone rules. To do this, set the
\envvar{TZ} environment variable to the path of the required timezone
diff --git a/Doc/lib/libundoc.tex b/Doc/lib/libundoc.tex
index df78152..e7d388f 100644
--- a/Doc/lib/libundoc.tex
+++ b/Doc/lib/libundoc.tex
@@ -49,7 +49,7 @@
\item[\module{bsddb185}]
--- Backwards compatibility module for systems which still use the Berkeley
- DB 1.85 module. It is normally only available on certain BSD Unix-based
+ DB 1.85 module. It is normally only available on certain BSD \UNIX-based
systems. It should never be used directly.
\end{description}
diff --git a/Doc/lib/libzipfile.tex b/Doc/lib/libzipfile.tex
index 47d1e5a..3d81e50 100644
--- a/Doc/lib/libzipfile.tex
+++ b/Doc/lib/libzipfile.tex
@@ -106,12 +106,12 @@
is specified but the \refmodule{zlib} module is not available,
\exception{RuntimeError} is also raised. The default is
\constant{ZIP_STORED}.
- If \var{allowZip64} is \code{True} zipfile will create zipfiles that use
- the ZIP64 extensions when the zipfile is larger than 2GBytes. If it is
- false (the default) zipfile will raise an exception when the zipfile would
- require ZIP64 extensions. ZIP64 extensions are disabled by default because
- the default zip and unzip commands on Unix (the InfoZIP utilities) don't
- support these extensions.
+ If \var{allowZip64} is \code{True} zipfile will create ZIP files that use
+ the ZIP64 extensions when the zipfile is larger than 2 GB. If it is
+ false (the default) \module{zipfile} will raise an exception when the
+ ZIP file would require ZIP64 extensions. ZIP64 extensions are disabled by
+ default because the default \program{zip} and \program{unzip} commands on
+ \UNIX{} (the InfoZIP utilities) don't support these extensions.
\end{classdesc}
\begin{methoddesc}{close}{}