Updated for IDLEfork re-integration

2 files changed, 66 insertions, 48 deletions

diff --git a/Lib/idlelib/CREDITS.txt b/Lib/idlelib/CREDITS.txt
index 01cdfa5..62e2f8d 100644
--- a/Lib/idlelib/CREDITS.txt
+++ b/Lib/idlelib/CREDITS.txt
@@ -1,20 +1,22 @@
-IDLEfork Credits
-==================
-
-Guido van Rossum, as well as being the creator of the Python language, is
-the original creator of IDLE.  He also developed the RPC code and Remote
-Debugger extension used in IDLEfork.
-
-The IDLEfork project was initiated and brought up to version 0.7.1 primarily
-by David Scherer, with help from Peter Schneider-Kamp and Nicholas Riley.
-Bruce Sherwood has contributed considerable time testing and suggesting
-improvements.
-
-Besides Guido, the main developers who have been active on IDLEfork version
-0.8.1 and later are Stephen M. Gava, who implemented the Configuration GUI, the
-new configuration system, and the new About menu, and Kurt B. Kaiser, who
-completed the integration of the RPC and remote debugger, implemented the
-threaded subprocess, and made a number of usability enhancements.
+Guido van Rossum, as well as being the creator of the Python language, is the
+original creator of IDLE.  Other contributors prior to Version 0.8 include
+Mark Hammond, Jeremy Hylton, Tim Peters, and Moshe Zadka.
+
+IDLE's recent development has been carried out in the IDLEfork project.
+The objective was to develop a version of IDLE which had an execution
+environment which could be initialized prior to each run of user code.
+
+The IDLEfork project was initiated by David Scherer, with some help from Peter
+Schneider-Kamp and Nicholas Riley.  David wrote the first version of the RPC
+code and designed a fast turn-around environment for VPython.  Guido developed
+the RPC code and Remote Debugger currently integrated in IDLE.  Bruce Sherwood
+contributed considerable time testing and suggesting improvements.
+
+Besides David and Guido, the main developers who have been active on IDLEfork
+are Stephen M. Gava, who implemented the configuration GUI, the new
+configuration system, and the About dialog, and Kurt B. Kaiser, who completed
+the integration of the RPC and remote debugger, implemented the threaded
+subprocess, and made a number of usability enhancements.
 
 Other contributors include Raymond Hettinger, Tony Lownds (Mac integration),
 Neal Norwitz (code check and clean-up), and Chui Tey (RPC integration, debugger
@@ -24,14 +26,10 @@ Hernan Foffani, Christos Georgiou, Martin v. Loewis, Jason Orendorff, Noam
 Raphael, Josh Robb, Nigel Rowe, and Bruce Sherwood have submitted useful
 patches.  Thanks, guys!
 
-There are others who should be included here, especially those who contributed
-to IDLE versions prior to 0.8, principally Mark Hammond, Jeremy Hylton,
-Tim Peters, and Moshe Zadka.  For additional details refer to NEWS.txt and
-Changelog.
+For additional details refer to NEWS.txt and Changelog.
 
-Please contact the IDLEfork maintainer to have yourself included here if you
+Please contact the IDLE maintainer to have yourself included here if you
 are one of those we missed! 
 
-Contact details at http://idlefork.sourceforge.net
 
 
diff --git a/Lib/idlelib/README.txt b/Lib/idlelib/README.txt
index 575245b..df0b7b8 100644
--- a/Lib/idlelib/README.txt
+++ b/Lib/idlelib/README.txt
@@ -1,38 +1,58 @@
-IDLEfork README
-===============
+IDLE is Python's Tkinter-based Integrated DeveLopment Environment.
 
-IDLEfork is an official experimental fork of Python's Integrated DeveLopment
-Environment, IDLE.  The biggest change is to execute Python code in a separate
-process, which is /restarted/ for each Run (F5) initiated from an editor
-window.  This enhancement of IDLE has often been requested, and is now finally
-available, complete with the IDLE debugger.  The magic "reload/import *"
-incantations are no longer required when editing/testing a module two or three
-steps down the import chain.
+IDLE emphasizes a lightweight, clean design with a simple user interface.
+Although it is suitable for beginners, even advanced users will find that
+IDLE has everything they really need to develop pure Python code.
 
-It is possible to interrupt tightly looping user code with a control-c, even on
-Windows.
+IDLE features a multi-window text editor with multiple undo, Python colorizing,
+and many other capabilities, e.g. smart indent, call tips, and autocompletion.
 
-There is also a new GUI configuration manager which makes it easy to select
-fonts, colors, keybindings, and startup options.  There is new feature where
-the user can specify additional help sources, either locally or on the web.
+The editor has comprehensive search functions, including searching through
+multiple files.  Class browsers and path browsers provide fast access to
+code objects from a top level viewpoint without dealing with code folding.
 
-IDLEfork will be merged back into the Python distribution in the near future
-(probably 2.3), replacing the current version of IDLE.
+There is a Python Shell window which features colorizing and command recall.
 
-For information on this release, refer to NEWS.txt
+IDLE executes Python code in a separate process, which is restarted for each
+Run (F5) initiated from an editor window.  The environment can also be 
+restarted from the Shell window without restarting IDLE.
 
-If you find bugs let us know about them by using the IDLEfork Bug Tracker.  See
-the IDLEfork home page at
+This enhancement has often been requested, and is now finally available.  The
+magic "reload/import *" incantations are no longer required when editing and
+testing a module two or three steps down the import chain.
 
-http://idlefork.sourceforge.net 
+It is possible to interrupt tightly looping user code, even on Windows.
 
-for details.  Patches are always appreciated at the IDLEfork Patch Tracker, and
-Change Requests should be posted to the RFE Tracker at
+Applications which cannot support subprocesses and/or sockets can still run
+IDLE in a single process.
 
-https://sourceforge.net/tracker/?group_id=9579&atid=359579  
+IDLE has an integrated debugger with stepping, persistent breakpoints, and call
+stack visibility.
+
+There is a GUI configuration manager which makes it easy to select fonts,
+colors, keybindings, and startup options.  This facility includes a feature
+which allows the user to specify additional help sources, either locally or on
+the web.
+
+IDLE is coded in 100% pure Python, using the Tkinter GUI toolkit (Tk/Tcl)
+and is cross-platform, working on Unix, Mac, and Windows.
+
+IDLE accepts command line arguments.  Try idle -h to see the options.
+
+
+If you find bugs or have suggestions, let us know about them by using the
+Python Bug Tracker:
+
+http://sourceforge.net/projects/python
+
+Patches are always appreciated at the Python Patch Tracker, and change
+requests should be posted to the RFE Tracker.
+
+For further details and links, read the Help files and check the IDLE home
+page at
+
+http://www.python.org/idle/
 
 There is a mail list for IDLE: idle-dev@python.org.  You can join at
 
 http://mail.python.org/mailman/listinfo/idle-dev
-
-Thanks for trying IDLEfork.