Skip to content

Commit

Permalink
Merge pull request #9565 from klonuo/docs-fixes-5
Browse files Browse the repository at this point in the history
Fix undefined labels in docs #2
  • Loading branch information
Carreau committed Jun 8, 2016
2 parents e2153cf + a2d38c2 commit d307ae7
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 13 deletions.
2 changes: 1 addition & 1 deletion docs/source/interactive/python-ipython-diff.rst
Expand Up @@ -179,7 +179,7 @@ The later form of expansion supports arbitrary python expression:
The bang can also be present in the right hand side of an assignment, just
after the equal sign, or separated from it by a white space. In which case the
standard output of the command after the bang ``!`` will be split out into lines
in a list-like object (:ref:`IPython Slist`) and assign to the left hand side.
in a list-like object and assign to the left hand side.

This allow you for example to put the list of files of the current working directory in a variable:

Expand Down
2 changes: 1 addition & 1 deletion docs/source/overview.rst
Expand Up @@ -20,7 +20,7 @@ has three main components:
* An enhanced interactive Python shell.
* A decoupled :ref:`two-process communication model <ipythonzmq>`, which
allows for multiple clients to connect to a computation kernel, most notably
the web-based :ref:`notebook <htmlnotebook>`
the web-based notebook.
* An architecture for interactive parallel computing.

All of IPython is open source (released under the revised BSD license).
Expand Down
7 changes: 3 additions & 4 deletions docs/source/whatsnew/version0.12.rst
Expand Up @@ -97,8 +97,7 @@ for floating matplotlib windows or::
for plotting support with automatically inlined figures. Note that it is now
possible also to activate pylab support at runtime via ``%pylab``, so you do
not need to make this decision when starting the server.

See :ref:`the Notebook docs <htmlnotebook>` for technical details.


.. _two_process_console:

Expand Down Expand Up @@ -173,8 +172,8 @@ Other important new features
----------------------------

* **SSH Tunnels**: In 0.11, the :mod:`IPython.parallel` Client could tunnel its
connections to the Controller via ssh. Now, the QtConsole :ref:`supports
<ssh_tunnels>` ssh tunneling, as do parallel engines.
connections to the Controller via ssh. Now, the QtConsole supports ssh tunneling,
as do parallel engines.

* **relaxed command-line parsing**: 0.11 was released with overly-strict
command-line parsing, preventing the ability to specify arguments with spaces,
Expand Down
4 changes: 0 additions & 4 deletions docs/source/whatsnew/version1.0.rst
Expand Up @@ -164,10 +164,6 @@ To use nbconvert to convert various file formats::
See ``ipython nbconvert --help`` for more information.
nbconvert depends on `pandoc`_ for many of the translations to and from various formats.

.. seealso::

:ref:`nbconvert`

.. _pandoc: http://johnmacfarlane.net/pandoc/

Notebook
Expand Down
4 changes: 2 additions & 2 deletions docs/source/whatsnew/version2.0.rst
Expand Up @@ -149,11 +149,11 @@ which can be started from the Help menu.
Security
********

2.0 introduces a :ref:`security model <notebook_security>` for notebooks,
2.0 introduces a security model for notebooks,
to prevent untrusted code from executing on users' behalf when notebooks open.
A quick summary of the model:

- Trust is determined by :ref:`signing notebooks<signing_notebooks>`.
- Trust is determined by signing notebooks.
- Untrusted HTML output is sanitized.
- Untrusted Javascript is never executed.
- HTML and Javascript in Markdown are never trusted.
Expand Down
2 changes: 1 addition & 1 deletion docs/source/whatsnew/version3.rst
Expand Up @@ -278,7 +278,7 @@ Backwards incompatible changes
Adapters are included, so IPython frontends can still talk to kernels that
implement protocol version 4.

* The :ref:`notebook format <nbformat>` has been updated from version 3 to version 4.
* The notebook format has been updated from version 3 to version 4.
Read-only support for v4 notebooks has been backported to IPython 2.4.
Notable changes:

Expand Down

0 comments on commit d307ae7

Please sign in to comment.