diff --git a/Doc/lib/libsys.tex b/Doc/lib/libsys.tex
index 1490de4..08f49c7 100644
--- a/Doc/lib/libsys.tex
+++ b/Doc/lib/libsys.tex
@@ -13,8 +13,8 @@
   The list of command line arguments passed to a Python script.
   \code{argv[0]} is the script name (it is operating system
   dependent whether this is a full pathname or not).
-  If the command was executed using the \samp{-c} command line option
-  to the interpreter, \code{argv[0]} is set to the string
+  If the command was executed using the \programopt{-c} command line
+  option to the interpreter, \code{argv[0]} is set to the string
   \code{'-c'}.
   If no script name was passed to the Python interpreter,
   \code{argv} has zero length.
@@ -81,16 +81,16 @@
 \end{datadesc}
 
 \begin{datadesc}{exec_prefix}
-A string giving the site-specific
-directory prefix where the platform-dependent Python files are
-installed; by default, this is also \code{'/usr/local'}.  This can be
-set at build time with the \code{-}\code{-exec-prefix} argument to the
+A string giving the site-specific directory prefix where the
+platform-dependent Python files are installed; by default, this is
+also \code{'/usr/local'}.  This can be set at build time with the
+\programopt{-}\programopt{-exec-prefix} argument to the
 \program{configure} script.  Specifically, all configuration files
 (e.g. the \file{config.h} header file) are installed in the directory
-\code{exec_prefix + '/lib/python\var{version}/config'}, and shared library
-modules are installed in
-\code{exec_prefix + '/lib/python\var{version}/lib-dynload'},
-where \var{version} is equal to \code{version[:3]}.
+\code{exec_prefix + '/lib/python\var{version}/config'}, and shared
+library modules are installed in \code{exec_prefix +
+'/lib/python\var{version}/lib-dynload'}, where \var{version} is equal
+to \code{version[:3]}.
 \end{datadesc}
 
 \begin{datadesc}{executable}
@@ -194,13 +194,13 @@
 A string giving the site-specific directory prefix where the platform
 independent Python files are installed; by default, this is the string
 \code{'/usr/local'}.  This can be set at build time with the
-\code{-}\code{-prefix} argument to the \program{configure} script.  The main
-collection of Python library modules is installed in the directory
-\code{prefix + '/lib/python\var{version}'} while the platform
-independent header files (all except \file{config.h}) are stored in
-\code{prefix + '/include/python\var{version}'},
-where \var{version} is equal to \code{version[:3]}.
-
+\programopt{-}\programopt{-prefix} argument to the
+\program{configure} script.  The main collection of Python library
+modules is installed in the directory \code{prefix +
+'/lib/python\var{version}'} while the platform independent header
+files (all except \file{config.h}) are stored in \code{prefix +
+'/include/python\var{version}'}, where \var{version} is equal to
+\code{version[:3]}.
 \end{datadesc}
 
 \begin{datadesc}{ps1}