diff --git a/Doc/lib/libquopri.tex b/Doc/lib/libquopri.tex
index e379e4a..abe07df 100644
--- a/Doc/lib/libquopri.tex
+++ b/Doc/lib/libquopri.tex
@@ -1,17 +1,16 @@
-\section{Standard Module \sectcode{quopri}}
+\section{Standard Module \module{quopri}}
 \label{module-quopri}
 \stmodindex{quopri}
 
 This module performs quoted-printable transport encoding and decoding,
 as defined in \rfc{1521}: ``MIME (Multipurpose Internet Mail Extensions)
 Part One''.  The quoted-printable encoding is designed for data where
-there are relatively few nonprintable characters; the base-64 encoding
-scheme available via the \code{base64} module is more compact if there
+there are relatively few nonprintable characters; the base64 encoding
+scheme available via the \module{base64} module is more compact if there
 are many such characters, as when sending a graphics file.
-\indexii{quoted printable}{encoding}
+\indexii{quoted-printable}{encoding}
 \index{MIME!quoted-printable encoding}
 
-\setindexsubitem{(in module quopri)}
 
 \begin{funcdesc}{decode}{input, output}
 Decode the contents of the \var{input} file and write the resulting
diff --git a/Doc/libquopri.tex b/Doc/libquopri.tex
index e379e4a..abe07df 100644
--- a/Doc/libquopri.tex
+++ b/Doc/libquopri.tex
@@ -1,17 +1,16 @@
-\section{Standard Module \sectcode{quopri}}
+\section{Standard Module \module{quopri}}
 \label{module-quopri}
 \stmodindex{quopri}
 
 This module performs quoted-printable transport encoding and decoding,
 as defined in \rfc{1521}: ``MIME (Multipurpose Internet Mail Extensions)
 Part One''.  The quoted-printable encoding is designed for data where
-there are relatively few nonprintable characters; the base-64 encoding
-scheme available via the \code{base64} module is more compact if there
+there are relatively few nonprintable characters; the base64 encoding
+scheme available via the \module{base64} module is more compact if there
 are many such characters, as when sending a graphics file.
-\indexii{quoted printable}{encoding}
+\indexii{quoted-printable}{encoding}
 \index{MIME!quoted-printable encoding}
 
-\setindexsubitem{(in module quopri)}
 
 \begin{funcdesc}{decode}{input, output}
 Decode the contents of the \var{input} file and write the resulting