Skip to content

Commit

Permalink
Merge pull request #277 from takluyver/notebookapp-jupyter
Browse files Browse the repository at this point in the history
Remove some references to IPython in notebookapp
  • Loading branch information
Carreau committed Aug 18, 2015
2 parents b37b727 + 2ad0e9f commit 51fabeb
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions notebook/notebookapp.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# coding: utf-8
"""A tornado based IPython notebook server."""
"""A tornado based Jupyter notebook server."""

# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.
Expand Down Expand Up @@ -33,7 +33,7 @@
ioloop.install()

# check for tornado 3.1.0
msg = "The IPython Notebook requires tornado >= 4.0"
msg = "The Jupyter Notebook requires tornado >= 4.0"
try:
import tornado
except ImportError:
Expand Down Expand Up @@ -323,7 +323,7 @@ def start(self):
{'NotebookApp' : {'enable_mathjax' : False}},
"""Disable MathJax
MathJax is the javascript library IPython uses to render math/LaTeX. It is
MathJax is the javascript library Jupyter uses to render math/LaTeX. It is
very large, so you may want to disable it if you have a slow internet
connection, or for offline use of the notebook.
Expand Down Expand Up @@ -540,7 +540,7 @@ def _webapp_settings_changed(self, name, old, new):

tornado_settings = Dict(config=True,
help="Supply overrides for the tornado.web.Application that the "
"IPython notebook uses.")
"Jupyter notebook uses.")

ssl_options = Dict(config=True,
help="""Supply SSL options for the tornado HTTPServer.
Expand All @@ -557,7 +557,7 @@ def _webapp_settings_changed(self, name, old, new):
enable_mathjax = Bool(True, config=True,
help="""Whether to enable MathJax for typesetting math/TeX
MathJax is the javascript library IPython uses to render math/LaTeX. It is
MathJax is the javascript library Jupyter uses to render math/LaTeX. It is
very large, so you may want to disable it if you have a slow internet
connection, or for offline use of the notebook.
Expand Down Expand Up @@ -691,7 +691,7 @@ def _mathjax_url_changed(self, name, old, new):
of `jupyter_client.kernelspec.KernelSpecManager`.
The Api of KernelSpecManager is provisional and might change
without warning between this version of IPython and the next stable one.
without warning between this version of Jupyter and the next stable one.
"""
)

Expand Down Expand Up @@ -1019,7 +1019,7 @@ def notebook_info(self):
"Return the current working directory and the server url information"
info = self.contents_manager.info_string() + "\n"
info += "%d active kernels \n" % len(self.kernel_manager._kernels)
return info + "The IPython Notebook is running at: %s" % self.display_url
return info + "The Jupyter Notebook is running at: %s" % self.display_url

def server_info(self):
"""Return a JSONable dict of information about this server."""
Expand Down Expand Up @@ -1049,7 +1049,7 @@ def remove_server_info_file(self):
raise

def start(self):
""" Start the IPython Notebook server app, after initialization
""" Start the Notebook server app, after initialization
This method takes no arguments so all configuration and initialization
must be done prior to calling this method."""
Expand Down

0 comments on commit 51fabeb

Please sign in to comment.