[Python-checkins] cpython (merge 3.3 -> default): merge 3.3

[benjamin.peterson]

http://hg.python.org/cpython/rev/de2b96f220a5
changeset:   88683:de2b96f220a5
parent:      88680:93afa651e074
parent:      88681:3551f184b282
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Jan 25 00:00:28 2014 -0500
summary:
  merge 3.3

files:
  Doc/faq/general.rst |  9 ++++++---
  1 files changed, 6 insertions(+), 3 deletions(-)


diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -268,9 +268,12 @@
 Where in the world is www.python.org located?
 ---------------------------------------------
 
-It's currently in Amsterdam, graciously hosted by `XS4ALL
-<http://www.xs4all.nl>`_.  Thanks to Thomas Wouters for his work in arranging
-python.org's hosting.
+The Python project's infrastructure is located all over the world.
+www.python.org is currently in Amsterdam, graciously hosted by `XS4ALL
+<http://www.xs4all.nl>`_.  `Upfront Systems <http://www.upfrontsystems.co.za>`_
+hosts bugs.python.org.  Most other Python services like `PyPI
+<https://pypi.python.org>`_ and hg.python.org are hosted by `Oregon State
+University Open Source Lab <https://osuosl.org>`_.
 
 
 Why is it called Python?

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