From 8d415ef1dde94979f0dd2bfdee267b8b451e4654 Mon Sep 17 00:00:00 2001
From: Sheila Miguez <github@codersquid.com>
Date: Wed, 27 Aug 2014 16:14:41 -0500
Subject: [PATCH 1/2] updating docs, add content management section

---
 docs/content.rst | 40 ++++++++++++++++++++++++++++++++++++++++
 docs/index.rst   | 25 ++++++++++++++-----------
 2 files changed, 54 insertions(+), 11 deletions(-)
 create mode 100644 docs/content.rst

diff --git a/docs/content.rst b/docs/content.rst
new file mode 100644
index 00000000..59c0b3ef
--- /dev/null
+++ b/docs/content.rst
@@ -0,0 +1,40 @@
+Content Management
+==================
+
+The content management system allows organizers to create pages and page
+sections for a conference.  You may want to have an entire page about a job
+fair, or may only want to have an editable section at the top of a tutorial
+schedule with some instructions for all of the tutorial attendees.
+
+CMS App
+-------
+
+The ``cms`` app provides functionality for creating wiki pages. These pages can
+be created using the django admin. The django admin form has controls for
+specifying:
+
+* title
+* markup content
+* url path
+* tags
+* public or draft mode
+* publication date
+
+Page content and title can also be edited directly at the url. The ``cms`` app
+uses the `django-reversion <http://django-reversion.readthedocs.org>`_ package,
+thus content is version controlled.
+
+Boxes App
+---------
+
+The ``boxes`` app allows for sections of a page to be edited like a wiki. To use this in a template
+use the ``boxes_tags`` and specify a box section of a page using the ``boxes`` tag:
+
+.. code-block:: django
+
+    {% load boxes_tags %}
+    {% boxes "intro_section" %}
+
+This template will render an editable content box. When a staff user visits the
+page,  they will see an ``Edit this content`` button. The ``boxes`` app also uses the
+``django-reversion`` package.
diff --git a/docs/index.rst b/docs/index.rst
index 732670ca..0b7abda1 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,27 +1,30 @@
 Pinax Symposion
 ===============
 
-Pinax Symposion is an open-source Django project for conference websites.
+Pinax Symposion is an open-source conference management system written in
+Django.  Symposion includes support for content management, proposal
+submission, reviews, scheduling and sponsor management.
 
-It came out of development done by Eldarion for DjangoCon US and US PyCon
-but has been independently used for a number of other conferences.
-
-We are in the process of cleaning things up and making them more generic.
-
-The project homepage is http://eldarion.com/symposion/
-
-Apps:
 
 .. toctree::
    :maxdepth: 2
-   
+
+   project
    conference
+   content
+   proposals
    sponsorship
    speakers
-   proposals
    schedule
 
 
+About
+-----
+
+Symposion came out of development done by Eldarion for DjangoCon US and US PyCon
+but has been independently used for a number of other conferences.
+The project homepage is http://eldarion.com/symposion/
+
 Indices and tables
 ==================
 

From 450bf3f5e4d1247088899b24d1a24ea637a1d0fe Mon Sep 17 00:00:00 2001
From: Sheila Miguez <github@codersquid.com>
Date: Tue, 16 Dec 2014 20:32:09 -0600
Subject: [PATCH 2/2] adds a starting page about the example project

---
 docs/project.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 docs/project.rst

diff --git a/docs/project.rst b/docs/project.rst
new file mode 100644
index 00000000..8a59b8db
--- /dev/null
+++ b/docs/project.rst
@@ -0,0 +1,10 @@
+Project Template
+================
+
+The `pinax-project-symposion <https://github.com/pinax/pinax-project-symposion>`_ repository
+is a starter project demonstrating how to create a minimal symposion instance.
+
+TODO:
+  * initial data
+  * overriding templates
+  * deployment