summaryrefslogtreecommitdiffstats
path: root/Doc/faq/general.rst
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)
commit485922ea1f2e099a0c07bdd2273666a6b0f1fb89 (patch)
treefcebe1fb7720ba7fb6bb653facfe03b60e5631ce /Doc/faq/general.rst
parente73778c1ac0e58d3520b37308b970073e818fa00 (diff)
downloadcpython-485922ea1f2e099a0c07bdd2273666a6b0f1fb89.zip
cpython-485922ea1f2e099a0c07bdd2273666a6b0f1fb89.tar.gz
cpython-485922ea1f2e099a0c07bdd2273666a6b0f1fb89.tar.bz2
Update "where is python.org hosted" FAQ.
Diffstat (limited to 'Doc/faq/general.rst')
-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 debe112..72dfe9e 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>`_.