upstream/ipython Commit - r23368:27e95fe1

204

With the exclusion of the traditional single process terminal-based IPython

204

With the exclusion of the traditional single process terminal-based IPython

205

(what you start if you run ``ipython`` without any subcommands), all

205

(what you start if you run ``ipython`` without any subcommands), all

206

other IPython machinery uses this two-process model. Most of this is now part

206

other IPython machinery uses this two-process model. Most of this is now part

207

of the `Jupyter` project, whis includes ``jupyter console``, ``jupyter

207

of the `Jupyter` project, which includes ``jupyter console``, ``jupyter

208

qtconsole``, and ``jupyter notebook``.

208

qtconsole``, and ``jupyter notebook``.

209

210

As an example, this means that when you start ``jupyter qtconsole``, you're

210

As an example, this means that when you start ``jupyter qtconsole``, you're

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             With the exclusion of the traditional single process terminal-based IPython
             (what you start if you run ``ipython`` without any subcommands), all
             other IPython machinery uses this two-process model. Most of this is now part
-            of the `Jupyter` project, whis includes ``jupyter console``,  ``jupyter
+            of the `Jupyter` project, which includes ``jupyter console``,  ``jupyter
             qtconsole``, and ``jupyter notebook``.
             As an example, this means that when you start ``jupyter qtconsole``, you're