Merge pull request #1847 from minrk/inlinecfg

add InlineBackend to ConsoleApp class list, so it will be included in generated config files / help-all output of the appropriate entry points.

This will alleviate some of the annoyance discussed on the list, because the config file will have the whole default rc commented out, so the starting point for user-edits is no change, rather than a blank slate.

IPython/frontend/consoleapp.py

@@ -108,6 +108,14 b' aliases.update(app_aliases)'
 # IPythonConsole
 #-----------------------------------------------------------------------------
 
+classes = [IPKernelApp, ZMQInteractiveShell, ProfileDir, Session]
+
+try:
+    from IPython.zmq.pylab.backend_inline import InlineBackend
+except ImportError:
+    pass
+else:
+    classes.append(InlineBackend)
 
 class IPythonConsoleApp(Configurable):
     name = 'ipython-console-mixin'
@@ -130,7 +138,7 b' class IPythonConsoleApp(Configurable):'
         
     """
 
-    classes = [IPKernelApp, ZMQInteractiveShell, ProfileDir, Session]
+    classes = classes
     flags = Dict(flags)
     aliases = Dict(aliases)
     kernel_manager_class = BlockingKernelManager

IPython/frontend/html/notebook/notebookapp.py

@@ -56,6 +56,7 b' from .clustermanager import ClusterManager'
 from IPython.config.application import catch_config_error, boolean_flag
 from IPython.core.application import BaseIPythonApplication
 from IPython.core.profiledir import ProfileDir
+from IPython.frontend.consoleapp import IPythonConsoleApp
 from IPython.lib.kernel import swallow_argv
 from IPython.zmq.session import Session, default_secure
 from IPython.zmq.zmqshell import ZMQInteractiveShell
@@ -255,8 +256,7 b' class NotebookApp(BaseIPythonApplication):'
     """
     examples = _examples
     
-    classes = [IPKernelApp, ZMQInteractiveShell, ProfileDir, Session,
-               MappingKernelManager, NotebookManager]
+    classes = IPythonConsoleApp.classes + [MappingKernelManager, NotebookManager]
     flags = Dict(flags)
     aliases = Dict(aliases)
 

IPython/frontend/qt/console/qtconsoleapp.py

@@ -165,7 +165,7 b' class IPythonQtConsoleApp(BaseIPythonApplication, IPythonConsoleApp):'
     """
     examples = _examples
 
-    classes = [IPKernelApp, IPythonWidget, ZMQInteractiveShell, ProfileDir, Session]
+    classes = [IPythonWidget] + IPythonConsoleApp.classes
     flags = Dict(flags)
     aliases = Dict(aliases)
     frontend_flags = Any(qt_flags)

IPython/frontend/terminal/console/app.py

@@ -96,7 +96,7 b' class ZMQTerminalIPythonApp(TerminalIPythonApp, IPythonConsoleApp):'
     """
     examples = _examples
 
-    classes = List([IPKernelApp, ZMQTerminalInteractiveShell, Session])
+    classes = [ZMQTerminalInteractiveShell] + IPythonConsoleApp.classes
     flags = Dict(flags)
     aliases = Dict(aliases)
     frontend_aliases = Any(frontend_aliases)