Created a new chapter on structured markup processing, including the

existing SGML, HTML, & XML support, and providing a home for the new
XML support as it becomes documented.

diff --git a/Doc/Makefile.deps b/Doc/Makefile.deps
index 7fbdd6bbd9f30e5e5d980a90c06c8f1d4dfd3c6a..9a547bb0d57d0c28d8004beb39687de122fe4086 100644 (file)
--- a/Doc/Makefile.deps
+++ b/Doc/Makefile.deps
@@ -166,6 +166,7 @@ LIBFILES= $(MANSTYLES) $(COMMONTEX) \
        ../lib/libuserdict.tex \
        ../lib/libdis.tex \
        ../lib/libxmllib.tex \
+       ../lib/libpyexpat.tex \
        ../lib/libqueue.tex \
        ../lib/liblocale.tex \
        ../lib/libbasehttp.tex \
@@ -187,6 +188,7 @@ LIBFILES= $(MANSTYLES) $(COMMONTEX) \
        ../lib/libthreading.tex \
        ../lib/internet.tex \
        ../lib/netdata.tex \
+       ../lib/markup.tex \
        ../lib/libpycompile.tex \
        ../lib/libcompileall.tex \
        ../lib/libshlex.tex \

diff --git a/Doc/lib/lib.tex b/Doc/lib/lib.tex
index 2eaa1e51d4e567e0fd2bf00fca3b56a3613e4e96..79a226b8dcdc7dfd9b1038b5859337e7269906c4 100644 (file)
--- a/Doc/lib/lib.tex
+++ b/Doc/lib/lib.tex
@@ -215,9 +215,6 @@ and how to embed it in other applications.
 \input{libasyncore}
 
 \input{netdata}                        % Internet Data Handling
-\input{libsgmllib}
-\input{libhtmllib}
-\input{libxmllib}
 \input{libformatter}
 \input{librfc822}
 \input{libmimetools}
@@ -237,7 +234,13 @@ and how to embed it in other applications.
 \input{libnetrc}
 \input{librobotparser}
 
-\input{librestricted}
+\input{markup}                  % Structured Markup Processing Tools
+\input{libsgmllib}
+\input{libhtmllib}
+\input{libxmllib}
+\input{libpyexpat}
+
+\input{librestricted}           % Restricted Execution
 \input{librexec}
 \input{libbastion}
 

diff --git a/Doc/lib/markup.tex b/Doc/lib/markup.tex
new file mode 100644 (file)
index 0000000..66934c4
--- /dev/null
+++ b/Doc/lib/markup.tex
@@ -0,0 +1,10 @@
+\chapter{Structured Markup Processing Tools
+         \label{markup}}
+
+Python supports a variety of modules to work with various forms of
+structured data markup.  This includes modules to work with the
+Standard Generalized Markup Language (SGML) and the Hypertext Markup
+Language (HTML), and several interfaces for working with the
+Extensible Markup Language (XML).
+
+\localmoduletable