Adjust the index inclusion for the new index support.

diff --git a/Doc/api.tex b/Doc/api.tex
index fdc19b0bb905bffb893cc2278a7001063da6ca5f..7d998485fbde64a9171062cc1ea7a6ebf27c4f67 100644 (file)
--- a/Doc/api.tex
+++ b/Doc/api.tex
@@ -2906,6 +2906,6 @@ Py_None, _Py_NoneStruct
 XXX Explain Py_DEBUG, Py_TRACE_REFS, Py_REF_DEBUG.
 
 
-\input{api.ind}                        % Index -- must be last
+\inputindex{api.ind}                   % Index -- must be last
 
 \end{document}

diff --git a/Doc/api/api.tex b/Doc/api/api.tex
index fdc19b0bb905bffb893cc2278a7001063da6ca5f..7d998485fbde64a9171062cc1ea7a6ebf27c4f67 100644 (file)
--- a/Doc/api/api.tex
+++ b/Doc/api/api.tex
@@ -2906,6 +2906,6 @@ Py_None, _Py_NoneStruct
 XXX Explain Py_DEBUG, Py_TRACE_REFS, Py_REF_DEBUG.
 
 
-\input{api.ind}                        % Index -- must be last
+\inputindex{api.ind}                   % Index -- must be last
 
 \end{document}

diff --git a/Doc/ext.tex b/Doc/ext.tex
index 0c9f7790a5285fbd2624f5fe0e112014c4b21f02..d2d11ad93f9d259bc5fd7bf6cab9c7a4d8043224 100644 (file)
--- a/Doc/ext.tex
+++ b/Doc/ext.tex
@@ -1489,8 +1489,6 @@ whitespace-separated absolute pathnames of libraries (\samp{.a}
 files).  No \samp{-l} options can be used.
 
 
-%\input{extref}
-
-\input{ext.ind}
+\inputindex{ext.ind}
 
 \end{document}

diff --git a/Doc/ext/ext.tex b/Doc/ext/ext.tex
index 0c9f7790a5285fbd2624f5fe0e112014c4b21f02..d2d11ad93f9d259bc5fd7bf6cab9c7a4d8043224 100644 (file)
--- a/Doc/ext/ext.tex
+++ b/Doc/ext/ext.tex
@@ -1489,8 +1489,6 @@ whitespace-separated absolute pathnames of libraries (\samp{.a}
 files).  No \samp{-l} options can be used.
 
 
-%\input{extref}
-
-\input{ext.ind}
+\inputindex{ext.ind}
 
 \end{document}

diff --git a/Doc/lib.tex b/Doc/lib.tex
index 76fddcaaa1be00f44eeb89eef39e7628f44ded94..ca587ce335512cb77fde90dce1fd3067e62c224c 100644 (file)
--- a/Doc/lib.tex
+++ b/Doc/lib.tex
@@ -8,7 +8,9 @@
 
 \input{boilerplate}
 
-\makeindex                     % tell \index to actually write the .idx file
+\makeindex                     % tell \index to actually write the
+                               % .idx file
+\makemodindex                  % ... and the module index as well.
 
 
 \begin{document}
@@ -222,9 +224,11 @@ add new extensions to Python and how to embed it in other applications.
 \input{libundoc}
 
 \renewcommand{\indexname}{Module Index}
-\input{modlib.ind}             % Module Index
+\renewcommand{\indexlabel}{modindex}
+\inputindex{modlib.ind}                % Module Index
 
 \renewcommand{\indexname}{Index}
-\input{lib.ind}                        % Index
+\renewcommand{\indexlabel}{genindex}
+\inputindex{lib.ind}                   % Index
 
 \end{document}

diff --git a/Doc/lib/lib.tex b/Doc/lib/lib.tex
index 76fddcaaa1be00f44eeb89eef39e7628f44ded94..ca587ce335512cb77fde90dce1fd3067e62c224c 100644 (file)
--- a/Doc/lib/lib.tex
+++ b/Doc/lib/lib.tex
@@ -8,7 +8,9 @@
 
 \input{boilerplate}
 
-\makeindex                     % tell \index to actually write the .idx file
+\makeindex                     % tell \index to actually write the
+                               % .idx file
+\makemodindex                  % ... and the module index as well.
 
 
 \begin{document}
@@ -222,9 +224,11 @@ add new extensions to Python and how to embed it in other applications.
 \input{libundoc}
 
 \renewcommand{\indexname}{Module Index}
-\input{modlib.ind}             % Module Index
+\renewcommand{\indexlabel}{modindex}
+\inputindex{modlib.ind}                % Module Index
 
 \renewcommand{\indexname}{Index}
-\input{lib.ind}                        % Index
+\renewcommand{\indexlabel}{genindex}
+\inputindex{lib.ind}                   % Index
 
 \end{document}