summaryrefslogtreecommitdiffstats
path: root/Doc/faq/general.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-10-29 09:57:37 (GMT)
committerGeorg Brandl <georg@python.org>2014-10-29 09:57:37 (GMT)
commitb7354a65ce71ac39d7dec97cce4ca7afdffcb8a3 (patch)
treedb84fdf0d6f2174731bf55700464e9ff3ec7307e /Doc/faq/general.rst
parent0ef496678a4908d321596043156fefeaf6e8afae (diff)
downloadcpython-b7354a65ce71ac39d7dec97cce4ca7afdffcb8a3.zip
cpython-b7354a65ce71ac39d7dec97cce4ca7afdffcb8a3.tar.gz
cpython-b7354a65ce71ac39d7dec97cce4ca7afdffcb8a3.tar.bz2
Fixing broken links in doc, part 4: some more breaks and redirects
Diffstat (limited to 'Doc/faq/general.rst')
-rw-r--r--Doc/faq/general.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
index 08c5427..e3ea962 100644
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -53,7 +53,7 @@ commercial use, to sell copies of Python in source or binary form (modified or
unmodified), or to sell products that incorporate Python in some form. We would
still like to know about all commercial use of Python, of course.
-See `the PSF license page <https://www.python.org/psf/license/>`_ to find further
+See `the PSF license page <https://docs.python.org/3/license/>`_ to find further
explanations and a link to the full text of the license.
The Python logo is trademarked, and in certain cases permission is required to
@@ -178,8 +178,8 @@ How do I get documentation on Python?
.. XXX mention py3k
The standard documentation for the current stable version of Python is available
-at https://docs.python.org/. PDF, plain text, and downloadable HTML versions are
-also available at https://docs.python.org/download.html.
+at https://docs.python.org/3/. PDF, plain text, and downloadable HTML versions are
+also available at https://docs.python.org/3/download.html.
The documentation is written in reStructuredText and processed by `the Sphinx
documentation tool <http://sphinx-doc.org/>`__. The reStructuredText source for
@@ -200,7 +200,7 @@ Is there a newsgroup or mailing list devoted to Python?
-------------------------------------------------------
There is a newsgroup, :newsgroup:`comp.lang.python`, and a mailing list,
-`python-list <http://mail.python.org/mailman/listinfo/python-list>`_. The
+`python-list <https://mail.python.org/mailman/listinfo/python-list>`_. The
newsgroup and mailing list are gatewayed into each other -- if you can read news
it's unnecessary to subscribe to the mailing list.
:newsgroup:`comp.lang.python` is high-traffic, receiving hundreds of postings
@@ -209,7 +209,7 @@ every day, and Usenet readers are often more able to cope with this volume.
Announcements of new software releases and events can be found in
comp.lang.python.announce, a low-traffic moderated list that receives about five
postings per day. It's available as `the python-announce mailing list
-<http://mail.python.org/mailman/listinfo/python-announce-list>`_.
+<https://mail.python.org/mailman/listinfo/python-announce-list>`_.
More info about other mailing lists and newsgroups
can be found at https://www.python.org/community/lists/.