summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
Diffstat (limited to 'Doc')
-rw-r--r--Doc/ACKS2
-rw-r--r--Doc/Makefile2
-rw-r--r--Doc/doc/doc.tex2
-rw-r--r--Doc/html/about.html4
-rw-r--r--Doc/html/stdabout.dat4
-rw-r--r--Doc/info/README2
-rw-r--r--Doc/lib/libundoc.tex2
-rw-r--r--Doc/mac/toolbox.tex2
-rw-r--r--Doc/mac/undoc.tex2
-rw-r--r--Doc/python-docs.txt8
-rw-r--r--Doc/texinputs/boilerplate.tex6
-rwxr-xr-xDoc/tools/getpagecounts2
-rwxr-xr-xDoc/tools/html2texi.pl2
-rwxr-xr-xDoc/tools/mkackshtml2
-rw-r--r--Doc/tools/sgmlconv/README2
15 files changed, 22 insertions, 22 deletions
diff --git a/Doc/ACKS b/Doc/ACKS
index c70306f..2e69540 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 384b23f..1b54f0b 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.
diff --git a/Doc/doc/doc.tex b/Doc/doc/doc.tex
index 210ae2c..6c77ba0 100644
--- a/Doc/doc/doc.tex
+++ b/Doc/doc/doc.tex
@@ -1911,7 +1911,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 0e0fb64..1d69fd1 100644
--- a/Doc/html/about.html
+++ b/Doc/html/about.html
@@ -55,8 +55,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 466d75b..e1d3a2a 100644
--- a/Doc/lib/libundoc.tex
+++ b/Doc/lib/libundoc.tex
@@ -2,7 +2,7 @@
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 \email{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 d31b7f8..9fbcb84 100644
--- a/Doc/mac/toolbox.tex
+++ b/Doc/mac/toolbox.tex
@@ -24,7 +24,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 93c66d8..55f1721 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/python-docs.txt b/Doc/python-docs.txt
index 22beac6..94d4513 100644
--- a/Doc/python-docs.txt
+++ b/Doc/python-docs.txt
@@ -1,5 +1,5 @@
This message is being sent in response to your message to the Python
-documentation maintainers (python-docs@python.org). Your message will
+documentation maintainers (docs@python.org). Your message will
be handled by a human, but this message serves to answer the most
common questions sent to this address.
@@ -96,7 +96,7 @@ Answers to the Questions
Start by reading the documentation for XXX. If the
documentation doesn't make sense or seems incomplete, please
- file a specific bug report to python-docs@python.org (the
+ file a specific bug report to docs@python.org (the
address you sent your question to). Otherwise, you probably
sent your question to the wrong place (which does not preclude
an answer, if I know it).
@@ -124,14 +124,14 @@ Answers to the Questions
http://www.jython.org/
Chances are very good that the person who answers questions
- posted to python-docs@python.org doesn't use Jython very often,
+ posted to docs@python.org doesn't use Jython very often,
and won't be able to give you a meaningful answer beyond "Look
at the Jython website." Sorry, I don't have *all* the answers!
8. I found a bug in the documentation, who should I tell?
If you're reading this, you've found the right address! Send
- all documentation bug reports to python-docs@python.org. If
+ all documentation bug reports to docs@python.org. If
you prefer to use a Web-based reporting mechanism, you can use
the bug database at http://www.python.org/python-bugs/.
diff --git a/Doc/texinputs/boilerplate.tex b/Doc/texinputs/boilerplate.tex
index c69cdba..7a61be6 100644
--- a/Doc/texinputs/boilerplate.tex
+++ b/Doc/texinputs/boilerplate.tex
@@ -2,10 +2,10 @@
Fred L. Drake, Jr., editor}
\authoraddress{
\strong{PythonLabs}\\
- Email: \email{python-docs@python.org}
+ Email: \email{docs@python.org}
}
-\date{July 29, 2003} % XXX update before final release!
-\release{2.3} % software release, not documentation
+\date{\today} % XXX update before final release!
+\release{2.3+} % software release, not documentation
\setreleaseinfo{} % empty for final release
\setshortversion{2.3} % major.minor only for software
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 79fe3f9..2c79f5e 100755
--- a/Doc/tools/mkackshtml
+++ b/Doc/tools/mkackshtml
@@ -53,7 +53,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?