diff --git a/Doc/lib/libsocksvr.tex b/Doc/lib/libsocksvr.tex
index 0cee090..98ffec6 100644
--- a/Doc/lib/libsocksvr.tex
+++ b/Doc/lib/libsocksvr.tex
@@ -11,8 +11,8 @@
 are discrete packets of information that may arrive out of order or be
 lost while in transit.  The more infrequently used
 \code{UnixStreamServer} and \code{UnixDatagramServer} classes are
-similar, but use Unix domain sockets; they're not available on
-non-Unix platforms.  For more details on network programming, consult
+similar, but use \UNIX{} domain sockets; they're not available on
+non-\UNIX{} platforms.  For more details on network programming, consult
 a book such as W. Richard Steven's \emph{UNIX Network Programming}
 or Ralph Davis's \emph{Win32 Network Programming}.
 
diff --git a/Doc/lib/libstdwin.tex b/Doc/lib/libstdwin.tex
index 514252f..91dc1af 100644
--- a/Doc/lib/libstdwin.tex
+++ b/Doc/lib/libstdwin.tex
@@ -20,7 +20,7 @@
 This module defines several new object types and functions that
 provide access to the functionality of STDWIN.
 
-On Unix running X11, it can only be used if the \code{DISPLAY}
+On \UNIX{} running X11, it can only be used if the \code{DISPLAY}
 environment variable is set or an explicit \samp{-display
 \var{displayname}} argument is passed to the Python interpreter.
 
diff --git a/Doc/lib/libwww.tex b/Doc/lib/libwww.tex
index f341ea7..8cfc09d 100644
--- a/Doc/lib/libwww.tex
+++ b/Doc/lib/libwww.tex
@@ -8,8 +8,8 @@
 World-Wide Web (WWW) clients and/or services, and a few modules
 related to news and email.  They are all implemented in Python.  Some
 of these modules require the presence of the system-dependent module
-\code{sockets}, which is currently only fully supported on Unix and
-Windows NT.  Here is an overview:
+\code{sockets}\refbimodindex{socket}, which is currently only fully
+supported on \UNIX{} and Windows NT.  Here is an overview:
 
 \begin{description}
 
diff --git a/Doc/libsocksvr.tex b/Doc/libsocksvr.tex
index 0cee090..98ffec6 100644
--- a/Doc/libsocksvr.tex
+++ b/Doc/libsocksvr.tex
@@ -11,8 +11,8 @@
 are discrete packets of information that may arrive out of order or be
 lost while in transit.  The more infrequently used
 \code{UnixStreamServer} and \code{UnixDatagramServer} classes are
-similar, but use Unix domain sockets; they're not available on
-non-Unix platforms.  For more details on network programming, consult
+similar, but use \UNIX{} domain sockets; they're not available on
+non-\UNIX{} platforms.  For more details on network programming, consult
 a book such as W. Richard Steven's \emph{UNIX Network Programming}
 or Ralph Davis's \emph{Win32 Network Programming}.
 
diff --git a/Doc/libstdwin.tex b/Doc/libstdwin.tex
index 514252f..91dc1af 100644
--- a/Doc/libstdwin.tex
+++ b/Doc/libstdwin.tex
@@ -20,7 +20,7 @@
 This module defines several new object types and functions that
 provide access to the functionality of STDWIN.
 
-On Unix running X11, it can only be used if the \code{DISPLAY}
+On \UNIX{} running X11, it can only be used if the \code{DISPLAY}
 environment variable is set or an explicit \samp{-display
 \var{displayname}} argument is passed to the Python interpreter.
 
diff --git a/Doc/libwww.tex b/Doc/libwww.tex
index f341ea7..8cfc09d 100644
--- a/Doc/libwww.tex
+++ b/Doc/libwww.tex
@@ -8,8 +8,8 @@
 World-Wide Web (WWW) clients and/or services, and a few modules
 related to news and email.  They are all implemented in Python.  Some
 of these modules require the presence of the system-dependent module
-\code{sockets}, which is currently only fully supported on Unix and
-Windows NT.  Here is an overview:
+\code{sockets}\refbimodindex{socket}, which is currently only fully
+supported on \UNIX{} and Windows NT.  Here is an overview:
 
 \begin{description}