From: Ned Deily <nad@python.org>
Date: Wed, 27 Feb 2019 22:43:13 +0000 (-0500)
Subject: Update FAQ to point to Infrastructure Team website. (GH-12079)
X-Git-Tag: v2.7.17rc1~142
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60ef9b05def9fd9e26959ffccc1811a32fb7dc0f;p=thirdparty%2FPython%2Fcpython.git

Update FAQ to point to Infrastructure Team website. (GH-12079)
---

diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
index 887dea74f5f1..e9b3fafbf55f 100644
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -268,14 +268,8 @@ Python references; or perhaps search for "Python" and "language".
 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 graciously hosted by `Rackspace
-<https://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>`_.  Many other Python services like `the Wiki
-<https://wiki.python.org>`_ are hosted by `Oregon State
-University Open Source Lab <https://osuosl.org>`_.
+The Python project's infrastructure is located all over the world and is managed
+by the Python Infrastructure Team. Details `here <http://infra.psf.io>`__.
 
 
 Why is it called Python?