##// END OF EJS Templates
remove references to kernel config in parent config files...
MinRK -
Show More
@@ -70,11 +70,12 b" if __name__ == '__main__':"
70
70
71 write_doc('terminal', 'Terminal IPython options', TerminalIPythonApp().classes)
71 write_doc('terminal', 'Terminal IPython options', TerminalIPythonApp().classes)
72 write_doc('kernel', 'IPython kernel options', kernel_classes,
72 write_doc('kernel', 'IPython kernel options', kernel_classes,
73 preamble="These options can be used in :file:`ipython_notebook_config.py` "
73 preamble="These options can be used in :file:`ipython_kernel_config.py`",
74 "or in :file:`ipython_qtconsole_config.py`")
74 )
75 nbclasses = set(NotebookApp().classes) - set(kernel_classes)
75 nbclasses = set(NotebookApp().classes) - set(kernel_classes)
76 write_doc('notebook', 'IPython notebook options', nbclasses,
76 write_doc('notebook', 'IPython notebook options', nbclasses,
77 preamble="Any of the :doc:`kernel` can also be used.")
77 preamble="To configure the IPython kernel, see :doc:`kernel`."
78 )
78
79
79 try:
80 try:
80 from IPython.qt.console.qtconsoleapp import IPythonQtConsoleApp
81 from IPython.qt.console.qtconsoleapp import IPythonQtConsoleApp
@@ -84,5 +85,6 b" if __name__ == '__main__':"
84 else:
85 else:
85 qtclasses = set(IPythonQtConsoleApp().classes) - set(kernel_classes)
86 qtclasses = set(IPythonQtConsoleApp().classes) - set(kernel_classes)
86 write_doc('qtconsole', 'IPython Qt console options', qtclasses,
87 write_doc('qtconsole', 'IPython Qt console options', qtclasses,
87 preamble="Any of the :doc:`kernel` can also be used.")
88 preamble="To configure the IPython kernel, see :doc:`kernel`."
89 )
88
90
@@ -95,9 +95,6 b' commented; the minimum set you need to uncomment and edit is the following::'
95
95
96 c = get_config()
96 c = get_config()
97
97
98 # Kernel config
99 c.IPKernelApp.pylab = 'inline' # if you want plotting support always
100
101 # Notebook config
98 # Notebook config
102 c.NotebookApp.certfile = u'/absolute/path/to/your/certificate/mycert.pem'
99 c.NotebookApp.certfile = u'/absolute/path/to/your/certificate/mycert.pem'
103 c.NotebookApp.ip = '*'
100 c.NotebookApp.ip = '*'
General Comments 0
You need to be logged in to leave comments. Login now