diff -r d693f961c5ff Doc/using/windows.rst
--- a/Doc/using/windows.rst	Sat Aug 18 12:24:56 2012 -0700
+++ b/Doc/using/windows.rst	Sun Aug 19 15:52:21 2012 -0700
@@ -577,6 +577,19 @@
    `MingW -- Python extensions <http://oldwiki.mingw.org/index.php/Python%20extensions>`_
       by Trent Apted et al, 2007
 
+Editors
+=======
+
+**Notepad++** 
+
+http://notepad-plus-plus.org
+
+Notepad++ is a free source code editor and Notepad replacement that supports several languagees including Python. 
+
+* Syntax Highlighting and Syntax Folding
+* PCRE (Perl Compatible Regular Expression) Search/Replace
+* GUI entirely customizaable: minimalist, tab with close button, multi-line tab, etc.
+* Auto-Completion: Word completion, Function completion and Function parameters hint
 
 Other resources
 ===============
@@ -594,4 +607,3 @@
    :pep:`397` - Python launcher for Windows
       The proposal for the launcher to be included in the Python distribution.
 
-