summaryrefslogtreecommitdiff
path: root/Doc/faq
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-02-27 14:29:13 -0800
committerGitHub <noreply@github.com>2019-02-27 14:29:13 -0800
commit197e46829b440484c030a4d9734867551acae79d (patch)
tree768ff588b02e13f511c9735bfe3b23c7d9dbf32e /Doc/faq
parent488aabafe2f1c5db05a6c1a7a8b49d7b89b1f36b (diff)
downloadcpython-git-197e46829b440484c030a4d9734867551acae79d.tar.gz
[3.7] Update FAQ to point to Infrastructure Team website. (GH-12077) (GH-12078)
(cherry picked from commit ccb92e814d289b89bccf9ad1b7d2ec6ecdebbfcb) Co-authored-by: Ned Deily <nad@python.org>
Diffstat (limited to 'Doc/faq')
-rw-r--r--Doc/faq/general.rst10
1 files changed, 2 insertions, 8 deletions
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
index 90fd69e729..7ee340d795 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.upfrontsoftware.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?