[Python-checkins] cpython (3.4): Update "where is python.org hosted" FAQ.

[georg.brandl]

https://hg.python.org/cpython/rev/40886ed3133c
changeset:   93232:40886ed3133c
branch:      3.4
parent:      93225:96b6b4882c0f
user:        Georg Brandl <georg at python.org>
date:        Wed Oct 29 08:52:43 2014 +0100
summary:
  Update "where is python.org hosted" FAQ.

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


diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -270,11 +270,12 @@
 ---------------------------------------------
 
 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>`_.
 
 

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