Doc updated

ellmetha · Mar 12, 2015 · 289bdc0 · 289bdc0
1 parent 512e52d
commit 289bdc0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/docs/index.rst b/docs/index.rst
@@ -16,6 +16,8 @@ Welcome to django-machina's documentation!
 
 *Django-machina* is customizable and extensible : each single functionality of the application can be customized or overriden to accommodate with your needs and your own business logic. The central aim of *django-machina* is to provide a solid core of a forum project - without much of extra functionality included - that can be extended or customized to suit your project needs.
 
+.. image:: ./images/machina_forum_header.png
+
 Features
 --------
 
@@ -35,6 +37,7 @@ Using django-machina
    :maxdepth: 2
 
    getting_started
+   settings
 
 
 

diff --git a/docs/settings.rst b/docs/settings.rst
@@ -0,0 +1,15 @@
+########
+Settings
+########
+
+This is a comprehensive list of all the settings *django-machina* provides. All settings are optional.
+
+General
+*******
+
+``MACHINA_FORUM_NAME``
+----------------------
+
+Default: ``'Machina'``
+
+The forum name.