diff --git a/docs/building_your_site/djangodevelopers.rst b/docs/building_your_site/djangodevelopers.rst
index 89f0ed6422..ee066b99a3 100644
--- a/docs/building_your_site/djangodevelopers.rst
+++ b/docs/building_your_site/djangodevelopers.rst
@@ -171,6 +171,8 @@ Other Relationships
 Your ``Page``-derived models might have other interrelationships which extend the basic Wagtail tree or depart from it entirely. You could provide functions to navigate between siblings, such as a "Next Post" link on a blog page (``post->post->post``). It might make sense for subtrees to interrelate, such as in a discussion forum (``forum->post->replies``) Skipping across the hierarchy might make sense, too, as all objects of a certain model class might interrelate regardless of their ancestors (``events = EventPage.objects.all``). It's largely up to the models to define their interrelations, the possibilities are really endless.
 
 
+.. _anatomy_of_a_wagtail_request:
+
 Anatomy of a Wagtail Request
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/management_commands.rst b/docs/management_commands.rst
index 96cfe95c3a..18358a8699 100644
--- a/docs/management_commands.rst
+++ b/docs/management_commands.rst
@@ -1,6 +1,11 @@
+.. _management_commands:
+
 Management commands
 ===================
 
+
+.. _publish_scheduled_pages:
+
 publish_scheduled_pages
 -----------------------
 
@@ -8,6 +13,9 @@ publish_scheduled_pages
 
 This command publishes or unpublishes pages that have had these actions scheduled by an editor. It is recommended to run this command once an hour.
 
+
+.. _fixtree:
+
 fixtree
 -------
 
@@ -15,6 +23,9 @@ fixtree
 
 This command scans for errors in your database and attempts to fix any issues it finds.
 
+
+.. _move_pages:
+
 move_pages
 ----------
 
@@ -30,6 +41,9 @@ Options:
  - **to**
    This is the **id** of the page to move pages to.
 
+
+.. _update_index:
+
 update_index
 ------------
 
@@ -44,6 +58,9 @@ It is recommended to run this command once a week and at the following times:
 
 The search may not return any results while this command is running, so avoid running it at peak times.
 
+
+.. _search_garbage_collect:
+
 search_garbage_collect
 ----------------------
 
diff --git a/docs/releases/0.4.rst b/docs/releases/0.4.rst
index f2eb290f53..1330603dca 100644
--- a/docs/releases/0.4.rst
+++ b/docs/releases/0.4.rst
@@ -7,12 +7,12 @@ Whats new
 =========
 
 
-Front-end permissions
-~~~~~~~~~~~~~~~~~~~~~
+Private Pages
+~~~~~~~~~~~~~
 
 Wagtail now supports password protecting pages on the frontend allowing sections of your website to be made private.
 
-TODO: Link to docs
+:ref:`private_pages`
 
 
 Python 3 support
@@ -26,9 +26,7 @@ Scheduled publishing
 
 Editors can now schedule pages to be published or unpublished at specified times.
 
-A new management command has been added (``publish_scheduled_pages``) to publish pages that have been scheduled by an Editor.
-
-TODO: Link to docs
+A new management command has been added (:ref:`publish_scheduled_pages`) to publish pages that have been scheduled by an Editor.
 
 
 Search on QuerySet with Elasticsearch
@@ -46,7 +44,7 @@ Sitemap generation
 
 A new module has been added (``wagtail.contrib.wagtailsitemaps``) which produces XML sitemaps for Wagtail sites.
 
-TODO: Link to docs
+:ref:`sitemap_generation`
 
 
 Front-end cache invalidation
@@ -54,7 +52,7 @@ Front-end cache invalidation
 
 A new module has been added (``wagtail.contrib.wagtailfrontendcache``) which invalidates pages in a frontend cache when they are updated or deleted in Wagtail.
 
-TODO: Link to docs
+:ref:`frontend_cache_purging`
 
 
 Notification preferences
@@ -129,7 +127,7 @@ If you are using the elasticsearch backend, you must install the ``elasticsearch
 
 .. note::
 
-    If you are using an older version of Elasticsearch (< 1.0) you must install elasticsearch-py 0.4.x.
+    If you are using an older version of Elasticsearch (< 1.0) you must install ``elasticsearch`` version 0.4.x.
 
 
 Deprecated features
@@ -152,15 +150,13 @@ New search field configuration format
 
 ``indexed_fields`` is now deprecated and has been replaced by a new search field configuration format called ``search_fields``.
 
-TODO: Needs docs!
-
 
 Page.route method should now return a RouteResult
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Previously, the ``route`` method called ``serve`` and returned a ``HttpResponse`` object. This has now been split up so ``serve`` is called separately and ``route`` must now return a RouteResult object.
 
-TODO: Link to docs
+:ref:`anatomy_of_a_wagtail_request`
 
 
 Wagtailadmins ``hooks`` module has moved to wagtailcore
@@ -171,8 +167,8 @@ If you use any ``wagtail_hooks.py`` files in your project, you may have an impor
 Change this to: ``from wagtail.wagtailcore import hooks``
 
 
-Page.show_as_mode renamed to Page.serve_preview
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Page.show_as_mode replaced with Page.serve_preview
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 TODO