Merge pull request #5495 from takluyver/docs-fixing-broken-stuff

Fix various broken things in docs

docs/source/interactive/reference.rst

@@ -810,16 +810,16 b' Please look at the docstrings in the :mod:`~IPython.frontend.terminal.embed`'
 module for more details on the use of this system.
 
 The following sample file illustrating how to use the embedding
-functionality is provided in the examples directory as example-embed.py.
+functionality is provided in the examples directory as embed_class_long.py.
 It should be fairly self-explanatory:
 
-.. literalinclude:: ../../../examples/core/example-embed.py
+.. literalinclude:: ../../../examples/Embedding/embed_class_long.py
     :language: python
 
 Once you understand how the system functions, you can use the following
 code fragments in your programs which are ready for cut and paste:
 
-.. literalinclude:: ../../../examples/core/example-embed-short.py
+.. literalinclude:: ../../../examples/Embedding/embed_class_short.py
     :language: python
 
 Using the Python debugger (pdb)
@@ -1059,7 +1059,7 b' want to continue, you simply execute the next block of the demo. The'
 following listing shows the markup necessary for dividing a script into
 sections for execution as a demo:
 
-.. literalinclude:: ../../../examples/lib/example-demo.py
+.. literalinclude:: ../../../examples/IPython Kernel/example-demo.py
     :language: python
 
 In order to run a file as a demo, you must first make a Demo object out

docs/source/notebook/index.rst

@@ -6,7 +6,6 b' The IPython notebook'
     :maxdepth: 2
 
     notebook
-    cm_keyboard
     nbconvert
     public_server
     security

docs/source/notebook/notebook.rst

@@ -453,7 +453,7 b' on available options, use::'
 
     :ref:`config_overview`, in particular :ref:`Profiles`.
     
-    :ref:`notebook_security`
+    :ref:`notebook_server_security`
 
     :ref:`notebook_public_server`
 

docs/source/notebook/public_server.rst

@@ -9,7 +9,7 b' server-client structure. This server uses a :ref:`two-process kernel'
 architecture <ipythonzmq>` based on ZeroMQ_, as well as Tornado_ for serving
 HTTP requests. By default, a notebook server runs on http://127.0.0.1:8888/
 and is accessible only from `localhost`. This document describes how you can
-:ref:`secure a notebook server <notebook_security>` and how to :ref:`run it on
+:ref:`secure a notebook server <notebook_server_security>` and how to :ref:`run it on
 a public interface <notebook_public_server>`.
 
 .. _ZeroMQ: http://zeromq.org
@@ -17,7 +17,7 b' a public interface <notebook_public_server>`.'
 .. _Tornado: http://www.tornadoweb.org
 
 
-.. _notebook_security:
+.. _notebook_server_security:
 
 Securing a notebook server
 --------------------------

docs/source/parallel/asyncresult.rst

@@ -103,7 +103,7 b' Map results are iterable!'
 When an AsyncResult object has multiple results (e.g. the :class:`~AsyncMapResult`
 object), you can actually iterate through results themselves, and act on them as they arrive:
 
-.. literalinclude:: ../../../examples/parallel/itermapresult.py
+.. literalinclude:: ../../../examples/Parallel Computing/itermapresult.py
     :language: python
     :lines: 20-67
     

docs/source/parallel/dag_dependencies.rst

@@ -81,7 +81,7 b' The code to generate the simple DAG:'
 For demonstration purposes, we have a function that generates a random DAG with a given
 number of nodes and edges.
 
-.. literalinclude:: ../../../examples/parallel/dagdeps.py
+.. literalinclude:: ../../../examples/Parallel Computing/dagdeps.py
     :language: python
     :lines: 20-36
 
@@ -140,7 +140,7 b' These objects store a variety of metadata about each task, including various tim'
 We can validate that the dependencies were respected by checking that each task was
 started after all of its predecessors were completed:
 
-.. literalinclude:: ../../../examples/parallel/dagdeps.py
+.. literalinclude:: ../../../examples/Parallel Computing/dagdeps.py
     :language: python
     :lines: 64-70
 

docs/source/parallel/parallel_demos.rst

@@ -102,7 +102,7 b' compute the two digit counts for the digits in a single file. Then in a final'
 step the counts from each engine will be added up. To perform this
 calculation, we will need two top-level functions from :file:`pidigits.py`:
 
-.. literalinclude:: ../../../examples/parallel/pi/pidigits.py
+.. literalinclude:: ../../../examples/Parallel Computing/pi/pidigits.py
    :language: python
    :lines: 47-62