[Python-checkins] devguide (merge default -> default): Merge

[terry.reedy]

http://hg.python.org/devguide/rev/68ba0bef5913
changeset:   485:68ba0bef5913
parent:      484:081106c142ec
parent:      483:1a25c29fb571
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Thu Jan 19 18:13:17 2012 -0500
summary:
  Merge

files:
  conf.py   |   2 +-
  faq.rst   |  10 +++++++---
  setup.rst |  24 ++++++++++++------------
  3 files changed, 20 insertions(+), 16 deletions(-)


diff --git a/conf.py b/conf.py
--- a/conf.py
+++ b/conf.py
@@ -43,7 +43,7 @@
 
 # General information about the project.
 project = u'Python Developer\'s Guide'
-copyright = u'2011, Python Software Foundation'
+copyright = u'2011-2012, Python Software Foundation'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/faq.rst b/faq.rst
--- a/faq.rst
+++ b/faq.rst
@@ -16,12 +16,14 @@
 Where should I ask general Python questions?
 --------------------------------------------
 
-General Python questions should still go to `python-list`_ or `python-tutor`_
-or similar resources, such as StackOverflow_ or ``#python`` on IRC.
+General Python questions should still go to `python-list`_ or `tutor`_
+or similar resources, such as StackOverflow_ or the ``#python`` IRC channel
+on Freenode_.
 
 .. _python-list: http://mail.python.org/mailman/listinfo/python-list
-.. _python-tutor: http://mail.python.org/mailman/listinfo/python-tutor
+.. _tutor: http://mail.python.org/mailman/listinfo/tutor
 .. _StackOverflow: http://stackoverflow.com/
+.. _Freenode: http://freenode.net/
 
 
 Where should I suggest new features and language changes?
@@ -48,6 +50,8 @@
 The `Python Mentors`_ program is specifically about encouraging
 developers and others that would like to contribute to Python development in
 general, rather than necessarily being focused on one particular issue.
+Some core developers are also available on the ``#python-dev`` IRC channel on
+Freenode_.
 
 .. _Python Mentors: http://pythonmentors.com
 
diff --git a/setup.rst b/setup.rst
--- a/setup.rst
+++ b/setup.rst
@@ -198,46 +198,46 @@
 every rule.
 
 ``Doc``
-     The official documentation. This is what http://docs.python.org/ uses.
+     The official documentation. This is what http://docs.python.org/ uses.
      To build the docs, see ``Doc/README.txt``.
 
 ``Grammar``
-     Contains the :abbr:`EBNF (Extended Backus–Naur Form)` grammar file for
+     Contains the :abbr:`EBNF (Extended Backus-Naur Form)` grammar file for
      Python.
 
 ``Include``
-     Contains all interpreter-wide header files.
+     Contains all interpreter-wide header files.
 
 ``Lib``
-     The part of the standard library implemented in pure Python.
+     The part of the standard library implemented in pure Python.
 
 ``Mac``
-     Mac-specific code (e.g., using IDLE as an OS X application).
+     Mac-specific code (e.g., using IDLE as an OS X application).
 
 ``Misc``
-     Things that do not belong elsewhere. Typically this is varying kinds of
+     Things that do not belong elsewhere. Typically this is varying kinds of
      developer-specific documentation.
 
 ``Modules``
-     The part of the standard library (plus some other code) that is implemented
+     The part of the standard library (plus some other code) that is implemented
      in C.
 
 ``Objects``
-     Code for all built-in types.
+     Code for all built-in types.
 
 ``PC``
-     Windows-specific code along with build files for VC 6, 7, & 8 along with
+     Windows-specific code along with build files for VC 6, 7, & 8 along with
      OS/2.
 
 ``PCbuild``
-     Build files for VC 9 and newer.
+     Build files for VC 9 and newer.
 
 ``Parser``
-     Code related to the parser. The definition of the AST nodes is also kept
+     Code related to the parser. The definition of the AST nodes is also kept
      here.
 
 ``Python``
-     The code that makes up the CPython interpreter. This includes the compiler,
+     The code that makes up the CPython interpreter. This includes the compiler,
      eval loop and various built-in modules.
 
 ``Tools``

-- 
Repository URL: http://hg.python.org/devguide