[Python-checkins] cpython (merge 2.7 -> 2.7): Merge heads

[serhiy.storchaka]

https://hg.python.org/cpython/rev/743ff7902879
changeset:   106315:743ff7902879
branch:      2.7
parent:      106311:d5590f357d74
parent:      106308:b43e270648a3
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Wed Jan 25 13:28:45 2017 +0200
summary:
  Merge heads

files:
  Doc/using/unix.rst |  19 +++++++------------
  1 files changed, 7 insertions(+), 12 deletions(-)


diff --git a/Doc/using/unix.rst b/Doc/using/unix.rst
--- a/Doc/using/unix.rst
+++ b/Doc/using/unix.rst
@@ -136,17 +136,12 @@
 To use shell commands in your Python scripts, look at the :mod:`subprocess` module.
 
 
-Editors
-=======
+Editors and IDEs
+================
 
-Vim and Emacs are excellent editors which support Python very well.  For more
-information on how to code in Python in these editors, look at:
+There are a number of IDEs that support Python programming language.
+Many editors and IDEs provide syntax highlighting, debugging tools, and PEP-8 checks.
 
-* http://www.vim.org/scripts/script.php?script_id=790
-* https://sourceforge.net/projects/python-mode
-
-Geany is an excellent IDE with support for a lot of languages. For more
-information, read: https://www.geany.org/
-
-Komodo edit is another extremely good IDE.  It also has support for a lot of
-languages. For more information, read https://komodoide.com/.
+Please go to `Python Editors <https://wiki.python.org/moin/PythonEditors>`_ and
+`Integrated Development Environments <https://wiki.python.org/moin/IntegratedDevelopmentEnvironments>`_
+for a comprehensive list.
\ No newline at end of file

-- 
Repository URL: https://hg.python.org/cpython