[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4
georg.brandl
python-checkins at python.org
Wed Oct 29 08:53:00 CET 2014
https://hg.python.org/cpython/rev/2c73dfbbc242
changeset: 93233:2c73dfbbc242
parent: 93226:5f0575ae7379
parent: 93232:40886ed3133c
user: Georg Brandl <georg at python.org>
date: Wed Oct 29 08:52:51 2014 +0100
summary:
merge with 3.4
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
More information about the Python-checkins
mailing list