diff --git a/IPython/core/shellapp.py b/IPython/core/shellapp.py index 5b0cecf..6aed2e7 100644 --- a/IPython/core/shellapp.py +++ b/IPython/core/shellapp.py @@ -195,7 +195,7 @@ class InteractiveShellApp(Configurable): ) pylab_import_all = Bool(True, config=True, help="""If true, IPython will populate the user namespace with numpy, pylab, etc. - and an 'import *' is done from numpy and pylab, when using pylab mode. + and an ``import *`` is done from numpy and pylab, when using pylab mode. When False, pylab mode should not import any names into the user namespace. """ diff --git a/IPython/qt/console/console_widget.py b/IPython/qt/console/console_widget.py index 3d10053..b108ff3 100644 --- a/IPython/qt/console/console_widget.py +++ b/IPython/qt/console/console_widget.py @@ -130,15 +130,18 @@ class ConsoleWidget(MetaQObjectHasTraits('NewBase', (LoggingConfigurable, QtGui. help=""" The type of paging to use. Valid values are: - 'inside' : The widget pages like a traditional terminal. - 'hsplit' : When paging is requested, the widget is split - horizontally. The top pane contains the console, and the - bottom pane contains the paged text. - 'vsplit' : Similar to 'hsplit', except that a vertical splitter - used. - 'custom' : No action is taken by the widget beyond emitting a - 'custom_page_requested(str)' signal. - 'none' : The text is written directly to the console. + 'inside' + The widget pages like a traditional terminal. + 'hsplit' + When paging is requested, the widget is split horizontally. The top + pane contains the console, and the bottom pane contains the paged text. + 'vsplit' + Similar to 'hsplit', except that a vertical splitter is used. + 'custom' + No action is taken by the widget beyond emitting a + 'custom_page_requested(str)' signal. + 'none' + The text is written directly to the console. """) font_family = Unicode(config=True, diff --git a/docs/autogen_config.py b/docs/autogen_config.py index cf62376..a2538b4 100644 --- a/docs/autogen_config.py +++ b/docs/autogen_config.py @@ -38,7 +38,7 @@ def document_config_options(classes): help = trait.get_metadata('help') if help is not None: - help = '\n'.join(wrap_paragraphs(help, 76)) + help = '\n\n'.join(wrap_paragraphs(help, 76)) lines.append(indent(help, 4)) else: lines.append(' No description')