Merge pull request ipython#1465 from minrk/helpcommand

allow `ipython help subcommand` syntax

We use git-style subcommands, and should support git-style help to match.

IPython/config/application.py

@@ -404,6 +404,10 @@ def flatten_flags(self):
     def parse_command_line(self, argv=None):
         """Parse the command line arguments."""
         argv = sys.argv[1:] if argv is None else argv
+
+        if argv and argv[0] == 'help':
+            # turn `ipython help notebook` into `ipython notebook -h`
+            argv = argv[1:] + ['-h']
 
         if self.subcommands and len(argv) > 0:
             # we have subcommands, and one may have been specified

IPython/frontend/terminal/ipapp.py

@@ -67,13 +67,16 @@
 ipython --profile=foo      # start with profile foo
 
 ipython qtconsole          # start the qtconsole GUI application
-ipython qtconsole -h       # show the help string for the qtconsole subcmd
+ipython help qtconsole     # show the help for the qtconsole subcmd
 
 ipython console            # start the terminal-based console application
-ipython console -h         # show the help string for the console subcmd
+ipython help console       # show the help for the console subcmd
+
+ipython notebook           # start the IPython notebook
+ipython help notebook      # show the help for the notebook subcmd
 
 ipython profile create foo # create profile foo w/ default config files
-ipython profile -h         # show the help string for the profile subcmd
+ipython help profile       # show the help for the profile subcmd
 """
 
 #-----------------------------------------------------------------------------