5 commits

Author	SHA1	Message	Date
Matt Westcott	00e12cccaf	Merge branch 'master' into feature/fep2 ... Conflicts: docs/index.rst	2014-07-04 22:00:46 +01:00
Matt Westcott	e2040e8842	fix documentation syntax errors / warnings	2014-07-04 21:57:58 +01:00
Matt Westcott	466df9ffd6	Add developer docs for private pages	2014-07-04 20:56:34 +01:00
Jeffrey Hearn	85793d3dbb	Settings doc changes based on feedback	2014-06-09 11:47:12 -04:00
Jeffrey Hearn	9b17154cdf	Added wagtail and django settings doc ... more settings stuffs settings stuff settings stuff so many things omg is it really two AM More docs	2014-06-08 16:59:46 -04:00