diff --git a/docs/autogen_config.py b/docs/autogen_config.py index 1086cf8..854dd2b 100755 --- a/docs/autogen_config.py +++ b/docs/autogen_config.py @@ -70,11 +70,12 @@ if __name__ == '__main__': write_doc('terminal', 'Terminal IPython options', TerminalIPythonApp().classes) write_doc('kernel', 'IPython kernel options', kernel_classes, - preamble="These options can be used in :file:`ipython_notebook_config.py` " - "or in :file:`ipython_qtconsole_config.py`") + preamble="These options can be used in :file:`ipython_kernel_config.py`", + ) nbclasses = set(NotebookApp().classes) - set(kernel_classes) write_doc('notebook', 'IPython notebook options', nbclasses, - preamble="Any of the :doc:`kernel` can also be used.") + preamble="To configure the IPython kernel, see :doc:`kernel`." + ) try: from IPython.qt.console.qtconsoleapp import IPythonQtConsoleApp @@ -84,5 +85,6 @@ if __name__ == '__main__': else: qtclasses = set(IPythonQtConsoleApp().classes) - set(kernel_classes) write_doc('qtconsole', 'IPython Qt console options', qtclasses, - preamble="Any of the :doc:`kernel` can also be used.") + preamble="To configure the IPython kernel, see :doc:`kernel`." + ) diff --git a/docs/source/notebook/public_server.rst b/docs/source/notebook/public_server.rst index 1745497..f79d179 100644 --- a/docs/source/notebook/public_server.rst +++ b/docs/source/notebook/public_server.rst @@ -95,9 +95,6 @@ commented; the minimum set you need to uncomment and edit is the following:: c = get_config() - # Kernel config - c.IPKernelApp.pylab = 'inline' # if you want plotting support always - # Notebook config c.NotebookApp.certfile = u'/absolute/path/to/your/certificate/mycert.pem' c.NotebookApp.ip = '*'