summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-03-15 20:24:10 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-03-15 20:24:10 (GMT)
commitbbd392e9e2b8f7f69b649488828e559c788d5f3e (patch)
treed93934f83cdc346597e205c74d10414810f009af /Doc
parent7e7fb0374a44cb7eab9bf49970ba3ab150ef0cbf (diff)
parent039227107389277e48428b7a7e75ff904ca7e90d (diff)
downloadcpython-bbd392e9e2b8f7f69b649488828e559c788d5f3e.zip
cpython-bbd392e9e2b8f7f69b649488828e559c788d5f3e.tar.gz
cpython-bbd392e9e2b8f7f69b649488828e559c788d5f3e.tar.bz2
merge 3.3
Diffstat (limited to 'Doc')
-rw-r--r--Doc/faq/general.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
index da2c933..6f4733f 100644
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -471,7 +471,8 @@ that is written in Python using Tkinter. PythonWin is a Windows-specific IDE.
Emacs users will be happy to know that there is a very good Python mode for
Emacs. All of these programming environments provide syntax highlighting,
auto-indenting, and access to the interactive interpreter while coding. Consult
-http://www.python.org/editors/ for a full list of Python editing environments.
+`the Python wiki <https://wiki.python.org/moin/PythonEditors>`_ for a full list
+of Python editing environments.
If you want to discuss Python's use in education, you may be interested in
joining `the edu-sig mailing list