diff --git a/Doc/ACKS b/Doc/ACKS
index 5f4e57d..ac84349 100644
--- a/Doc/ACKS
+++ b/Doc/ACKS
@@ -22,6 +22,7 @@
 Daniel Barclay
 Chris Barker
 Don Bashford
+Anthony Baxter
 Bennett Benson
 Jonathan Black
 Robin Boerdijk
@@ -30,6 +31,7 @@
 Keith Briggs
 Lorenzo M. Catucci
 Mauro Cicognini
+Gilles Civario
 Steve Clift
 Andrew Dalke
 Ben Darnell
@@ -126,6 +128,7 @@
 Constantina S.
 Hugh Sasse
 Bob Savage
+Scott Schram
 Neil Schemenauer
 Barry Scott
 Joakim Sernbrant
diff --git a/Doc/lib/liblocale.tex b/Doc/lib/liblocale.tex
index 7f40f06..4cb726b 100644
--- a/Doc/lib/liblocale.tex
+++ b/Doc/lib/liblocale.tex
@@ -61,6 +61,40 @@
   Returns the database of of the local conventions as a dictionary.
   This dictionary has the following strings as keys:
 
+  \begin{tableiii}{l|l|l}{code}{Key}{Category}{Meaning}
+    \lineiii{'decimal_point'}{\constant{LC_NUMERIC}}
+            {Decimal point character.}
+    \lineiii{'grouping'}{\constant{LC_NUMERIC}}
+            {Sequence of numbers specifying which relative positions
+             the \code{'thousands_sep'} is expected.  If the sequence is
+             terminated with \constant{CHAR_MAX}, no further grouping
+             is performed. If the sequence terminates with a \code{0}, 
+             the last group size is repeatedly used.}
+    \lineiii{'thousands_sep'}{\constant{LC_NUMERIC}}
+            {Character used between groups.}\hline
+    \lineiii{'int_curr_symbol'}{\constant{LC_MONETARY}}
+            {International currency symbol.}
+    \lineiii{'currency_symbol'}{\constant{LC_MONETARY}}
+            {Local currency symbol.}
+    \lineiii{'mon_decimal_point'}{\constant{LC_MONETARY}}
+            {Decimal point used for monetary values.}
+    \lineiii{'mon_thousands_sep'}{\constant{LC_MONETARY}}
+            {Group separator used for monetary values.}
+    \lineiii{'mon_grouping'}{\constant{LC_MONETARY}}
+            {Equivalent to \code{'grouping'}, used for monetary
+             values.}
+    \lineiii{'positive_sign'}{\constant{LC_MONETARY}}
+            {Symbol used to annotate a positive monetary value.}
+    \lineiii{'negative_sign'}{\constant{LC_MONETARY}}
+            {Symbol used to annotate a nnegative monetary value.}
+    \lineiii{'frac_digits'}{\constant{LC_MONETARY}}
+            {Number of fractional digits used in local formatting
+             of monetary values.}
+    \lineiii{'int_frac_digits'}{\constant{LC_MONETARY}}
+            {Number of fractional digits used in international
+             formatting of monetary values.}
+  \end{tableiii}
+
   \begin{itemize}
     \item
     \code{'decimal_point'} specifies the decimal point used in floating
diff --git a/Doc/lib/libsunau.tex b/Doc/lib/libsunau.tex
index e0db04d..58aa460 100644
--- a/Doc/lib/libsunau.tex
+++ b/Doc/lib/libsunau.tex
@@ -127,7 +127,9 @@
 \end{methoddesc}
 
 \begin{methoddesc}[AU_read]{readframes}{n}
-Reads and returns at most \var{n} frames of audio, as a string of bytes.
+Reads and returns at most \var{n} frames of audio, as a string of
+bytes.  The data will be returned in linear format.  If the original
+data is in u-LAW format, it will be converted.
 \end{methoddesc}
 
 \begin{methoddesc}[AU_read]{rewind}{}
diff --git a/Doc/ref/ref2.tex b/Doc/ref/ref2.tex
index 64853fb..8ff448d 100644
--- a/Doc/ref/ref2.tex
+++ b/Doc/ref/ref2.tex
@@ -395,6 +395,12 @@
 concatenation can use different quoting styles for each component
 (even mixing raw strings and triple quoted strings).
 
+
+\subsection{Unicode literals \label{unicode}}
+
+XXX explain more here...
+
+
 \subsection{Numeric literals\label{numbers}}
 
 There are four types of numeric literals: plain integers, long
diff --git a/Doc/texinputs/boilerplate.tex b/Doc/texinputs/boilerplate.tex
index 31be096..45bf1a9 100644
--- a/Doc/texinputs/boilerplate.tex
+++ b/Doc/texinputs/boilerplate.tex
@@ -5,6 +5,6 @@
 	E-mail: \email{python-docs@python.org}
 }
 
-\date{October 16, 2000}		% XXX update before release!
+\date{\today}		% XXX update before release!
 \release{2.0}			% software release, not documentation
 \setshortversion{2.0}		% major.minor only for software
diff --git a/Doc/texinputs/howto.cls b/Doc/texinputs/howto.cls
index 33db125..899b4ae 100644
--- a/Doc/texinputs/howto.cls
+++ b/Doc/texinputs/howto.cls
@@ -6,6 +6,7 @@
 \ProvidesClass{howto}
              [1998/02/25 Document class (Python HOWTO)]
 
+\RequirePackage{pypaper}
 
 % Change the options here to get a different set of basic options,  This
 % is where to add things like "a4paper" or "10pt".
diff --git a/Doc/tools/listmodules b/Doc/tools/listmodules
index 7751a9e..03e7b5d 100755
--- a/Doc/tools/listmodules
+++ b/Doc/tools/listmodules
@@ -8,18 +8,24 @@
 
 """%(program)s - list modules in the Python standard library
 
--a, --annotate	  Annotate the module names with the subdirectory they live in
+-a, --annotate	  Annotate the module names with the subdirectory they
+                  live in
 -c, --categorize  Group the modules by subdirectory
 -i <file>,
---ignore-from <file>  Ignore the modules listed in <file>.  <file> may contain
-		  a list of module names or a module index file as produced
-                  when formatting the Python documentation (.idx flavor).
 
-If neither -a nor -c are given, the modules are listed in alphabetical order.
+--ignore-from <file>	Ignore the modules listed in <file>.  <file> may
+                  contain a list of module names or a module index file
+                  as produced when formatting the Python documentation
+                  (.idx or .html flavor).
+
+If neither -a nor -c are given, the modules are listed in alphabetical
+order.
 
 Note that -a and -c are mutually exclusive.
 
-Limitation:  Modules loadable as shared objects are not listed.
+Limitation: Modules loadable as shared objects may not be listed,
+though this script attempts to locate such modules.
+
 """
 
 __version__ = '$Revision$'
@@ -32,7 +38,8 @@
 import sys
 
 
-REMOVE_DIRS = ["dos-8x3", "lib-old", "lib-stdwin", "test"]
+REMOVE_DIRS = ["dos-8x3", "encodings", "distutils",
+               "lib-old", "lib-stdwin", "test"]
 
 
 def main():
@@ -86,7 +93,7 @@
             if not ignore(name):
                 modules_by_name[name] = "<built-in>"
                 l.append(name)
-    rx = re.compile("Lib/plat-[a-z0-9]*/", re.IGNORECASE)
+    rx = re.compile("Lib/plat-[a-zA-Z0-9]*/")
     fp = os.popen("find Lib -name \*.py -print", "r")
     while 1:
         line = fp.readline()
diff --git a/Doc/tools/sgmlconv/conversion.xml b/Doc/tools/sgmlconv/conversion.xml
index e80485d..244c824 100644
--- a/Doc/tools/sgmlconv/conversion.xml
+++ b/Doc/tools/sgmlconv/conversion.xml
@@ -78,6 +78,8 @@
   <macro name="optional">
     <content/>
     </macro>
+  <macro name="unspecified"/>
+  <macro name="moreargs"/>
   <environment name="classdesc">
     <attribute name="name"/>
     <child name="args"/>
@@ -409,6 +411,15 @@
          </text>
     <child name="entry"/>
     </environment>
+  <environment name="longtableii" outputname="table">
+    <attribute name="cols">2</attribute>
+    <attribute name="colspec"/>
+    <attribute name="style"/>
+    <child name="entry"/>
+    <text>
+         </text>
+    <child name="entry"/>
+    </environment>
   <macro name="lineii" outputname="row">
     <child name="entry"/>
     <text>
@@ -428,6 +439,18 @@
          </text>
     <child name="entry"/>
     </environment>
+  <environment name="longtableiii" outputname="table">
+    <attribute name="cols">3</attribute>
+    <attribute name="colspec"/>
+    <attribute name="style"/>
+    <child name="entry"/>
+    <text>
+         </text>
+    <child name="entry"/>
+    <text>
+         </text>
+    <child name="entry"/>
+    </environment>
   <macro name="lineiii" outputname="row">
     <child name="entry"/>
     <text>
@@ -453,6 +476,21 @@
          </text>
     <child name="entry"/>
     </environment>
+  <environment name="longtableiv" outputname="table">
+    <attribute name="cols">4</attribute>
+    <attribute name="colspec"/>
+    <attribute name="style"/>
+    <child name="entry"/>
+    <text>
+         </text>
+    <child name="entry"/>
+    <text>
+         </text>
+    <child name="entry"/>
+    <text>
+         </text>
+    <child name="entry"/>
+    </environment>
   <macro name="lineiv" outputname="row">
     <child name="entry"/>
     <text>