- update documentation contact address

14 files changed, 18 insertions, 16 deletions

diff --git a/Doc/ACKS b/Doc/ACKS
index c2108d5..6dcf909 100644
--- a/Doc/ACKS
+++ b/Doc/ACKS
@@ -4,7 +4,7 @@ Contributors to the Python Documentation
 This file lists people who have contributed in some way to the Python
 documentation.  It is probably not complete -- if you feel that you or
 anyone else should be on this list, please let us know (send email to
-python-docs@python.org), and we'll be glad to correct the problem.
+docs@python.org), and we'll be glad to correct the problem.
 
 It is only with the input and contributions of the Python community
 that Python has such wonderful documentation -- Thank You!
diff --git a/Doc/Makefile b/Doc/Makefile
index e0cdb9f..4c6760e 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -49,7 +49,7 @@
 # The formatted output is located in subdirectories.  For PDF and
 # PostScript, look in the paper-$(PAPER)/ directory.  For HTML, look in
 # the html/ directory.  If you want to fix the GNU info process, look
-# in the info/ directory; please send patches to python-docs@python.org.
+# in the info/ directory; please send patches to docs@python.org.
 
 # This Makefile only includes information on how to perform builds; for
 # dependency information, see Makefile.deps.
@@ -650,5 +650,6 @@ clobber:
 	rm -rf isilo/ref/ isilo/tut/ isilo/inst/ isilo/dist/
 	rm -rf isilo/whatsnew/
 	rm -f isilo/python-*-$(RELEASE).pdb isilo-$(RELEASE).zip
+	rm -f pkglist.html paper-$(PAPER)/README
 
 realclean distclean:  clobber
diff --git a/Doc/doc/doc.tex b/Doc/doc/doc.tex
index 3e608a4..45edf38 100644
--- a/Doc/doc/doc.tex
+++ b/Doc/doc/doc.tex
@@ -1805,7 +1805,7 @@ This \UNIX\ is also followed by a space.
     interested parties.
 
     Comments and bug reports on the standard documents should be sent
-    to \email{python-docs@python.org}.  This may include comments
+    to \email{docs@python.org}.  This may include comments
     about formatting, content, grammatical and spelling errors, or
     this document.  You can also send comments on this document
     directly to the author at \email{fdrake@acm.org}.
diff --git a/Doc/html/about.html b/Doc/html/about.html
index 492e76d..499dcbd 100644
--- a/Doc/html/about.html
+++ b/Doc/html/about.html
@@ -50,8 +50,8 @@
     <h2>Comments and Questions</h2>
 
     <p> General comments and questions regarding this document should
-      be sent by email to <a href="mailto:python-docs@python.org"
-        >python-docs@python.org</a>.  If you find specific errors in
+      be sent by email to <a href="mailto:docs@python.org"
+        >docs@python.org</a>.  If you find specific errors in
       this document, please report the bug at the <a
         href="http://sourceforge.net/bugs/?group_id=5470">Python Bug
         Tracker</a> at <a href="http://sourceforge.net/">SourceForge</a>.
diff --git a/Doc/html/stdabout.dat b/Doc/html/stdabout.dat
index bf0f1e6..00a20ba 100644
--- a/Doc/html/stdabout.dat
+++ b/Doc/html/stdabout.dat
@@ -28,8 +28,8 @@
 <h2>Comments and Questions</h2>
 
 <p> General comments and questions regarding this document should
-  be sent by email to <a href="mailto:python-docs@python.org"
-    >python-docs@python.org</a>.  If you find specific errors in
+  be sent by email to <a href="mailto:docs@python.org"
+    >docs@python.org</a>.  If you find specific errors in
   this document, either in the content or the presentation, please
   report the bug at the <a
     href="http://sourceforge.net/bugs/?group_id=5470">Python Bug
diff --git a/Doc/info/README b/Doc/info/README
index 8023144..bcee2be 100644
--- a/Doc/info/README
+++ b/Doc/info/README
@@ -18,4 +18,4 @@ Thanks go to Milan Zamazal <pdm@zamazal.org> for providing this
 conversion to the info format.
 
 Questions and comments on these documents should be directed to
-python-docs@python.org.
+docs@python.org.
diff --git a/Doc/lib/libundoc.tex b/Doc/lib/libundoc.tex
index f854d7b..1ed7db1 100644
--- a/Doc/lib/libundoc.tex
+++ b/Doc/lib/libundoc.tex
@@ -2,7 +2,8 @@
 
 Here's a quick listing of modules that are currently undocumented, but
 that should be documented.  Feel free to contribute documentation for
-them!  (Send via email to \email{python-docs@python.org}.)
+them!  (Send via email to
+\ulink{\email{docs@python.org}}{mailto:docs@python.org}.)
 
 The idea and original contents for this chapter were taken
 from a posting by Fredrik Lundh; the specific contents of this chapter
diff --git a/Doc/mac/toolbox.tex b/Doc/mac/toolbox.tex
index eb31ce1..69f5a50 100644
--- a/Doc/mac/toolbox.tex
+++ b/Doc/mac/toolbox.tex
@@ -23,7 +23,7 @@ from Carbon import AE
 
 \strong{Warning!}  These modules are not yet documented.  If you
 wish to contribute documentation of any of these modules, please get
-in touch with \email{python-docs@python.org}.
+in touch with \email{docs@python.org}.
 
 \localmoduletable
 
diff --git a/Doc/mac/undoc.tex b/Doc/mac/undoc.tex
index e456238..13ad7a3 100644
--- a/Doc/mac/undoc.tex
+++ b/Doc/mac/undoc.tex
@@ -4,7 +4,7 @@
 The modules in this chapter are poorly documented (if at all).  If you
 wish to contribute documentation of any of these modules, please get in
 touch with
-\ulink{\email{python-docs@python.org}}{mailto:python-docs@python.org}.
+\ulink{\email{docs@python.org}}{mailto:docs@python.org}.
 
 \localmoduletable
 
diff --git a/Doc/texinputs/boilerplate.tex b/Doc/texinputs/boilerplate.tex
index 32d58b0..d99604a 100644
--- a/Doc/texinputs/boilerplate.tex
+++ b/Doc/texinputs/boilerplate.tex
@@ -2,7 +2,7 @@
 	Fred L. Drake, Jr., editor}
 \authoraddress{
 	\strong{PythonLabs}\\
-	Email: \email{python-docs@python.org}
+	Email: \email{docs@python.org}
 }
 
 \date{\today}			% XXX update before final release!
diff --git a/Doc/tools/getpagecounts b/Doc/tools/getpagecounts
index 0837431..58f703c 100755
--- a/Doc/tools/getpagecounts
+++ b/Doc/tools/getpagecounts
@@ -73,7 +73,7 @@ The following manuals are included in this package:
 
 
 If you have any questions, comments, or suggestions regarding these
-documents, please send them via email to python-docs@python.org.
+documents, please send them via email to docs@python.org.
 """
 
 def count_pages(filename):
diff --git a/Doc/tools/html2texi.pl b/Doc/tools/html2texi.pl
index be050b1..5dcfd46 100755
--- a/Doc/tools/html2texi.pl
+++ b/Doc/tools/html2texi.pl
@@ -137,7 +137,7 @@
 # Index:
 #   Perhaps double-check that every tag mentioned in the index is found
 #     in the text.
-# Python:  email to python-docs@python.org, to get their feedback.
+# Python:  email to docs@python.org, to get their feedback.
 #   Compare to existing lib/ Info manual
 #   Write the hooks into info-look; replace pyliblookup1-1.tar.gz.
 #   Postpass to remove extra quotation marks around typography already in
diff --git a/Doc/tools/mkackshtml b/Doc/tools/mkackshtml
index 917b303..e08dd57 100755
--- a/Doc/tools/mkackshtml
+++ b/Doc/tools/mkackshtml
@@ -52,7 +52,7 @@ THANKS = '''\
 documentation.  This list is probably not complete -- if you feel that
 you or anyone else should be on this list, please let us know (send
 email to <a
-href="mailto:python-docs@python.org">python-docs@python.org</a>), and
+href="mailto:docs@python.org">docs@python.org</a>), and
 we will be glad to correct the problem.</p>
 
 <p>It is only with the input and contributions of the Python community
diff --git a/Doc/tools/sgmlconv/README b/Doc/tools/sgmlconv/README
index 1546293..02564eb 100644
--- a/Doc/tools/sgmlconv/README
+++ b/Doc/tools/sgmlconv/README
@@ -13,7 +13,7 @@ To convert one document to XML:
 	cd Doc/<document-dir>
 	make -f ../tools/sgmlconv/make.rules TOOLSDIR=../tools
 
-Please send comments and bug reports to python-docs@python.org.
+Please send comments and bug reports to docs@python.org.
 
 
 What do the tools do?