summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-10-29 07:52:43 (GMT)
committerGeorg Brandl <georg@python.org>2014-10-29 07:52:43 (GMT)
commit00da140c63c6c9651c96c43d4aa994a994b95cc7 (patch)
treee2ed8ac25d149a5da1c4294428d8b3cdaea293df /Doc
parent06f3b3b98c3c9067c4c91d584e6fd4f08ac7f80a (diff)
downloadcpython-00da140c63c6c9651c96c43d4aa994a994b95cc7.zip
cpython-00da140c63c6c9651c96c43d4aa994a994b95cc7.tar.gz
cpython-00da140c63c6c9651c96c43d4aa994a994b95cc7.tar.bz2
Update "where is python.org hosted" FAQ.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/faq/general.rst9
1 files changed, 5 insertions, 4 deletions
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
index 4e26eef..73d31a7 100644
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -270,11 +270,12 @@ Where in the world is www.python.org located?
---------------------------------------------
The Python project's infrastructure is located all over the world.
-`www.python.org <https://www.python.org>`_ is currently in Amsterdam, graciously
-hosted by `XS4ALL <http://www.xs4all.nl>`_. `Upfront Systems
+`www.python.org <https://www.python.org>`_ is graciously hosted by `Rackspace
+<http://www.rackspace.com>`_, with CDN caching provided by `Fastly
+<https://www.fastly.com>`_. `Upfront Systems
<http://www.upfrontsystems.co.za>`_ hosts `bugs.python.org
-<https://bugs.python.org>`_. Most other Python services like `PyPI
-<https://pypi.python.org>`_ and hg.python.org are hosted by `Oregon State
+<https://bugs.python.org>`_. Many other Python services like `the Wiki
+<https://wiki.python.org>`_ are hosted by `Oregon State
University Open Source Lab <https://osuosl.org>`_.