From dc52f7ed5e733e4a8b322ca0e2f3092658b24014 2016-08-29 17:14:20
From: Yuri Numerov <achi@hush.ai>
Date: 2016-08-29 17:14:20
Subject: [PATCH] Modified ipython banner

This is a squash of all the commits found in

    `https://github.com/ipython/ipython/pull/8773`

 - updated banner
 - updated banner again
 - fixed type
 - modified ipython banner
 - attempt at fixing rebase issues
 - modified ipython banner
 - fixed git screwup
 - updated banner
 - updated banner again
 - fixed type
 - fixed accidental deleted gui_reference restoration

---

diff --git a/IPython/core/usage.py b/IPython/core/usage.py
index a3d17dd..5bf300f 100644
--- a/IPython/core/usage.py
+++ b/IPython/core/usage.py
@@ -325,20 +325,16 @@ The following magic functions are currently available:
 
 """
 
-quick_guide = """\
-?         -> Introduction and overview of IPython's features.
-%quickref -> Quick reference.
-help      -> Python's own help system.
-object?   -> Details about 'object', use 'object??' for extra details.
+quick_guide = "Type '?', '%quickref' or 'help' for help, and 'x?/x??' for object details\n"
+
+gui_note = """\
+%guiref   -> A brief reference about the graphical user interface.
 """
 
-default_banner_parts = [
-    'Python %s\n' % (sys.version.split('\n')[0],),
-    'Type "copyright", "credits" or "license" for more information.\n\n',
-    'IPython {version} -- An enhanced Interactive Python.\n'.format(
-        version=release.version,
-        ),
-    quick_guide
+default_banner_parts = ["Python %s\n"%sys.version.split("\n")[0],
+    "Type 'copyright', 'credits' or 'license' for more information\n" ,
+    'IPython {version} -- An enhanced Interactive Python.\n'.format(version=release.version),
+    quick_guide    
 ]
 
 default_banner = ''.join(default_banner_parts)