Merging in changes from r23a1-branch. Doc/makefile had conflicts, which

I leave to Fred to sort out.

diff --git a/Doc/texinputs/boilerplate.tex b/Doc/texinputs/boilerplate.tex
index c872482204c4ffec926b1fe53ea184e7a9253522..654ed27a78cf3660534acb1838708d437260e5dd 100644 (file)
--- a/Doc/texinputs/boilerplate.tex
+++ b/Doc/texinputs/boilerplate.tex
@@ -5,7 +5,7 @@
        Email: \email{python-docs@python.org}
 }
 
-\date{\today}                  % XXX update before release!
+\date{December 31, 2002}       % XXX update before release!
 \release{2.3}                  % software release, not documentation
 \setreleaseinfo{a1+}           % empty for final release
 \setshortversion{2.3}          % major.minor only for software

diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse
index 239e6b7950989f629b58b0eda6661e83a54950d5..f2a9ca45c6cb2b9a7d2ce837e69806d43fa5eb22 100644 (file)
--- a/PCbuild/python20.wse
+++ b/PCbuild/python20.wse
@@ -1973,6 +1973,12 @@ item: Install File
   Description=email test data
   Flags=0000000000000010
 end
+item: Install File
+  Source=..\lib\email\test\data\*.au
+  Destination=%MAINDIR%\Lib\email\test\data
+  Description=email test data
+  Flags=0000000000000010
+end
 item: Remark
 end
 item: Install File