Merge branch 'stable/0.4.x'

CHANGELOG.txt

@@ -1,11 +1,12 @@
 Changelog
 =========
 
-0.4 (xx.xx.20xx)
+0.4 (10.07.2014)
 ~~~~~~~~~~~~~~~~
  * ElasticUtils/pyelasticsearch swapped for elasticsearch-py
  * Python 3.2, 3.3 and 3.4 support
  * Added scheduled publishing
+ * Added support for private (password-protected) pages
  * Added frontend cache invalidator
  * Added sitemap generator
  * Added notification preferences

docs/conf.py

@@ -59,9 +59,9 @@ copyright = u'2014, Torchbox'
 # built documents.
 #
 # The short X.Y version.
-version = '0.3.1'
+version = '0.4'
 # The full version, including alpha/beta/rc tags.
-release = '0.3.1'
+release = '0.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/index.rst

@@ -28,3 +28,4 @@ It supports Django 1.6.2+ on Python 2.6, 2.7, 3.2, 3.3 and 3.4. Django 1.7 suppo
    support
    roadmap
    editor_manual/index
+   releases/index

docs/releases/0.4.rst

@@ -32,7 +32,7 @@ A new management command has been added (:ref:`publish_scheduled_pages`) to publ
 Search on QuerySet with Elasticsearch
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Its now possible to perform searches with Elasticsearch on ``PageQuerySet``s:
+Its now possible to perform searches with Elasticsearch on ``PageQuerySet`` objects:
 
     >>> from wagtail.wagtailcore.models import Page
     >>> Page.objects.live().descendant_of(events_index).search("Hello")
@@ -174,7 +174,7 @@ Previously, the ``route`` method called ``serve`` and returned a ``HttpResponse`
 
 
 Wagtailadmins ``hooks`` module has moved to wagtailcore
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If you use any ``wagtail_hooks.py`` files in your project, you may have an import like: ``from wagtail.wagtailadmin import hooks``
 

docs/releases/index.rst

@@ -0,0 +1,7 @@
+Release notes
+=============
+
+.. toctree::
+   :maxdepth: 1
+
+   0.4

docs/search/backends.rst

@@ -14,7 +14,7 @@ Wagtail can degrade to a database-backed text search, but we strongly recommend
 .. _wagtailsearch_backends_database:
 
 Database Backend
-===============
+================
 
 The default DB search backend uses Django's ``__icontains`` filter.
 

docs/search/editors_picks.rst

@@ -1,5 +1,5 @@
 
-.. _wagtailsearch_editors_picks:
+.. _editors-picks:
 
 
 Editors picks

docs/search/for_python_developers.rst

@@ -35,7 +35,7 @@ Fields need to be explicitly added to the search configuration in order for you
 
 You can add new fields to the search index by overriding the ``search_fields`` property and appending a list of extra ``SearchField``/``FilterField`` objects to it.
 
-``Page`` sets a default value to ``search_fields`` indexing the ``title`` field as a ``SearchField`` and some other generally useful fields as ``FilterField``s.
+The default value of ``search_fields`` (as set in ``Page``) indexes the ``title`` field as a ``SearchField`` and some other generally useful fields as ``FilterField`` rules.
 
 
 Quick example

setup.py

@@ -47,7 +47,7 @@ if not PY3:
 
 setup(
     name='wagtail',
-    version='0.3.1',
+    version='0.4',
     description='A Django content management system focused on flexibility and user experience',
     author='Matthew Westcott',
     author_email='matthew.westcott@torchbox.com',