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

tim-one · tim-one · commit 88ad134e3612 · 2003-01-01T02:14:12.000Z
I leave to Fred to sort out.
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`Email: \email{[email protected]}`
`6`	`6`	`}`
`7`	`7`
`8`		`-\date{\today} % XXX update before release!`
	`8`	`+\date{December 31, 2002} % XXX update before release!`
`9`	`9`	`\release{2.3} % software release, not documentation`
`10`	`10`	`\setreleaseinfo{a1+} % empty for final release`
`11`	`11`	`\setshortversion{2.3} % major.minor only for software`