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

Fix various broken things in docs

docs/source/notebook/index.rst

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

docs/source/notebook/notebook.rst

@@ -453,7 +453,7 @@ 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 @@ 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 @@ a public interface <notebook_public_server>`.
 .. _Tornado: http://www.tornadoweb.org
 
 
-.. _notebook_security:
+.. _notebook_server_security:
 
 Securing a notebook server
 --------------------------