From 783bddaca1be19cd536c6c380c6847c7876435b1 2011-06-20 23:39:16
From: MinRK <benjaminrk@gmail.com>
Date: 2011-06-20 23:39:16
Subject: [PATCH] minor helpstring cleanup per review.

---

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 93ca390..7373068 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -240,7 +240,7 @@ class InteractiveShell(SingletonConfigurable, Magic):
     )
     colors = CaselessStrEnum(('NoColor','LightBG','Linux'), 
                              default_value=get_default_colors(), config=True,
-        help="Set the color scheme (NoColor, Linux, and LightBG)."
+        help="Set the color scheme (NoColor, Linux, or LightBG)."
     )
     debug = CBool(False, config=True)
     deep_reload = CBool(False, config=True, help=
diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index 5399aa2..3b55e00 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -3373,7 +3373,7 @@ Defaulting color scheme to 'NoColor'"""
         from IPython.config import profile
         profile_dir = os.path.dirname(profile.__file__)
         ipython_dir = self.ipython_dir
-        print "Installing profiles to: %s [overwrite=%s]"(ipython_dir,overwrite)
+        print "Installing profiles to: %s [overwrite=%s]"%(ipython_dir,overwrite)
         for src in os.listdir(profile_dir):
             if src.startswith('profile_'):
                 name = src.replace('profile_', '')
diff --git a/IPython/frontend/terminal/interactiveshell.py b/IPython/frontend/terminal/interactiveshell.py
index d27ea2e..5fcdee1 100644
--- a/IPython/frontend/terminal/interactiveshell.py
+++ b/IPython/frontend/terminal/interactiveshell.py
@@ -70,8 +70,8 @@ class TerminalInteractiveShell(InteractiveShell):
     confirm_exit = CBool(True, config=True,
         help="""
         Set to confirm when you try to exit IPython with an EOF (Control-D
-        in Unix, Control-Z/Enter in Windows). By typing 'exit', 'quit' or
-        '%%Exit', you can force a direct exit without any confirmation.""",
+        in Unix, Control-Z/Enter in Windows). By typing 'exit' or 'quit',
+        you can force a direct exit without any confirmation.""",
     )
     # This display_banner only controls whether or not self.show_banner()
     # is called when mainloop/interact are called.  The default is False
diff --git a/IPython/frontend/terminal/ipapp.py b/IPython/frontend/terminal/ipapp.py
index 99fa337..52401a7 100755
--- a/IPython/frontend/terminal/ipapp.py
+++ b/IPython/frontend/terminal/ipapp.py
@@ -162,8 +162,8 @@ addflag('color-info', 'InteractiveShell.color_info',
 )
 addflag('confirm-exit', 'TerminalInteractiveShell.confirm_exit',
     """Set to confirm when you try to exit IPython with an EOF (Control-D
-    in Unix, Control-Z/Enter in Windows). By typing 'exit', 'quit' or
-    '%%Exit', you can force a direct exit without any confirmation.""",
+    in Unix, Control-Z/Enter in Windows). By typing 'exit' or 'quit',
+    you can force a direct exit without any confirmation.""",
     "Don't prompt the user when exiting."
 )
 addflag('deep-reload', 'InteractiveShell.deep_reload',
@@ -173,7 +173,7 @@ addflag('deep-reload', 'InteractiveShell.deep_reload',
     use it). deep_reload() forces a full reload of modules whose code may
     have changed, which the default reload() function does not.  When
     deep_reload is off, IPython will use the normal reload(), but
-    deep_reload will still be available as dreload(). This fea- ture is off
+    deep_reload will still be available as dreload(). This feature is off
     by default [which means that you have both normal reload() and
     dreload()].""",
     "Disable deep (recursive) reloading by default."