summaryrefslogtreecommitdiffstats
path: root/Doc/faq
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-01-25 04:59:57 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-01-25 04:59:57 (GMT)
commitf580d5b6f7468abf768a2ee6360168ad92893457 (patch)
tree7d3654822b9420299b56f2ab382c56eb8217c683 /Doc/faq
parenta7184e617afb7face7a56b89feecf27cbd6ed1db (diff)
downloadcpython-f580d5b6f7468abf768a2ee6360168ad92893457.zip
cpython-f580d5b6f7468abf768a2ee6360168ad92893457.tar.gz
cpython-f580d5b6f7468abf768a2ee6360168ad92893457.tar.bz2
update hosting faq
Diffstat (limited to 'Doc/faq')
-rw-r--r--Doc/faq/general.rst9
1 files changed, 6 insertions, 3 deletions
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
index 9a893ec..cc2cbda 100644
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -268,9 +268,12 @@ Python references; or perhaps search for "Python" and "language".
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?