diff --git a/docs/source/development/gitwash/development_workflow.rst b/docs/source/development/gitwash/development_workflow.rst
index b66c710..00b8412 100644
--- a/docs/source/development/gitwash/development_workflow.rst
+++ b/docs/source/development/gitwash/development_workflow.rst
@@ -116,8 +116,7 @@ The generated comparison, is between your feature branch
 ``my-new-feature``, and the place in ``master`` from which you branched
 ``my-new-feature``.  In other words, you can keep updating ``master``
 without interfering with the output from the comparison.  More detail?
-Note the three dots in the URL above (``master...my-new-feature``) and
-see :ref:`dot2-dot3`.
+Note the three dots in the URL above (``master...my-new-feature``).
 
 Asking for your changes to be merged with the main repo
 =======================================================
diff --git a/docs/source/development/gitwash/dot2_dot3.rst b/docs/source/development/gitwash/dot2_dot3.rst
deleted file mode 100644
index 7759e2e..0000000
--- a/docs/source/development/gitwash/dot2_dot3.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-.. _dot2-dot3:
-
-========================================
- Two and three dots in difference specs
-========================================
-
-Thanks to Yarik Halchenko for this explanation.
-
-Imagine a series of commits A, B, C, D...  Imagine that there are two
-branches, *topic* and *master*.  You branched *topic* off *master* when
-*master* was at commit 'E'.  The graph of the commits looks like this::
-
-
-        A---B---C topic
-        /
-   D---E---F---G master
-
-Then::
-
-   git diff master..topic
-
-will output the difference from G to C (i.e. with effects of F and G),
-while::
-
-   git diff master...topic
-
-would output just differences in the topic branch (i.e. only A, B, and
-C).
diff --git a/docs/source/development/index.rst b/docs/source/development/index.rst
index be82d74..c8a7142 100644
--- a/docs/source/development/index.rst
+++ b/docs/source/development/index.rst
@@ -26,3 +26,4 @@ on the IPython GitHub wiki.
    parallel_connections
    pycompat
    config
+   inputhook_app
diff --git a/docs/source/parallel/winhpc_index.rst b/docs/source/parallel/winhpc_index.rst
deleted file mode 100644
index dad2e86..0000000
--- a/docs/source/parallel/winhpc_index.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-========================================
-Using IPython on Windows HPC Server 2008
-========================================
-
-
-Contents
-========
-
-.. toctree::
-   :maxdepth: 1
-
-   parallel_winhpc
-   parallel_demos
-
diff --git a/docs/source/whatsnew/version0.11.rst b/docs/source/whatsnew/version0.11.rst
index 697684d..2b7b6fd 100644
--- a/docs/source/whatsnew/version0.11.rst
+++ b/docs/source/whatsnew/version0.11.rst
@@ -547,7 +547,7 @@ Backwards incompatible changes
 
 * Old style configuration files :file:`ipythonrc` and :file:`ipy_user_conf.py`
   are no longer supported. Users should migrate there configuration files to
-  the new format described :doc:`here <config/intro>` and
+  the new format described :doc:`here </config/intro>` and
   :ref:`here <config_overview>`.
 
 * The old IPython extension API that relied on :func:`ipapi` has been