From 7d20ffe245663ff824de544f574470d2b759059f Mon Sep 17 00:00:00 2001
From: Fred Drake <fdrake@acm.org>
Date: Mon, 9 Mar 1998 16:39:22 +0000
Subject: Adjust the index inclusion for the new index support.

---
 Doc/api.tex     |  2 +-
 Doc/api/api.tex |  2 +-
 Doc/ext.tex     |  4 +---
 Doc/ext/ext.tex |  4 +---
 Doc/lib.tex     | 10 +++++++---
 Doc/lib/lib.tex | 10 +++++++---
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/Doc/api.tex b/Doc/api.tex
index fdc19b0..7d99848 100644
--- 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 fdc19b0..7d99848 100644
--- 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 0c9f779..d2d11ad 100644
--- 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 0c9f779..d2d11ad 100644
--- 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 76fddca..ca587ce 100644
--- 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 76fddca..ca587ce 100644
--- 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}
-- 
cgit v0.12

