diff --git a/README.rst b/README.rst
index d505bdd..157c4e7 100644
--- a/README.rst
+++ b/README.rst
@@ -36,13 +36,10 @@
To install GNU Mailman follow the instructions in the documentation:
http://packages.python.org/mailman/
-A description how to run Postorius on Django's dev server, can be found in
-the GNU Mailman wiki:
-http://wiki.list.org/display/DEV/A+5+minute+guide+to+get+the+Mailman+web+UI+running
+A description how to run Postorius on Django's dev server or using
+Apache/mod_wsgi, can be found in the package documentation:
-You can also find a guide how to run Postorius using the Apache web server
-on the Mailman wiki:
-http://wiki.list.org/display/DEV/How+to+get+Postorius+running+on+Apache+and+mod_wsgi
+src/postorius/doc/setup.rst
Acknowledgements
diff --git a/src/postorius/doc/_build/doctrees/environment.pickle b/src/postorius/doc/_build/doctrees/environment.pickle
index 314683a..419c813 100644
--- a/src/postorius/doc/_build/doctrees/environment.pickle
+++ b/src/postorius/doc/_build/doctrees/environment.pickle
Binary files differ
diff --git a/src/postorius/doc/_build/doctrees/index.doctree b/src/postorius/doc/_build/doctrees/index.doctree
index 080f929..1b2a526 100644
--- a/src/postorius/doc/_build/doctrees/index.doctree
+++ b/src/postorius/doc/_build/doctrees/index.doctree
Binary files differ
diff --git a/src/postorius/doc/_build/doctrees/news.doctree b/src/postorius/doc/_build/doctrees/news.doctree
index e0f6fda..3e9a45e 100644
--- a/src/postorius/doc/_build/doctrees/news.doctree
+++ b/src/postorius/doc/_build/doctrees/news.doctree
Binary files differ
diff --git a/src/postorius/doc/_build/doctrees/setup.doctree b/src/postorius/doc/_build/doctrees/setup.doctree
index 625fc17..6d082be 100644
--- a/src/postorius/doc/_build/doctrees/setup.doctree
+++ b/src/postorius/doc/_build/doctrees/setup.doctree
Binary files differ
diff --git a/src/postorius/doc/_build/doctrees/using.doctree b/src/postorius/doc/_build/doctrees/using.doctree
index d720811..e61cc4e 100644
--- a/src/postorius/doc/_build/doctrees/using.doctree
+++ b/src/postorius/doc/_build/doctrees/using.doctree
Binary files differ
diff --git a/src/postorius/doc/_build/html/_sources/setup.txt b/src/postorius/doc/_build/html/_sources/setup.txt
index 63257c4..aa9ff9f 100644
--- a/src/postorius/doc/_build/html/_sources/setup.txt
+++ b/src/postorius/doc/_build/html/_sources/setup.txt
@@ -1,3 +1,4 @@
+============
Installation
============
@@ -6,16 +7,155 @@
GNU Mailman 3. To install GNU Mailman follow the instructions in the documentation:
http://packages.python.org/mailman/
-
-Installing for Development
---------------------------
+
+Install Dependencies
+====================
+
+Django:
+
+::
+
+ $ sudo pip install django
+
+mailman.client:
+
+::
+
+ $ bzr branch lp:mailman.client
+ $ cd mailman.client
+ $ sudo python setup.py install
+
+
+Install Postorius
+=================
+
+
+Latest release
+--------------
+
+If you just want to install the latest release of Postorius, install it from
+PyPi:
+
+::
+
+ $ sudo pip install postorius
+
+or:
+
+::
+
+ $ sudo easy_install postorius
+
+
+Latest dev version
+------------------
+
+If you want to keep up to date with the latest development version, you
+should install Postorius using bazaar:
+
+::
+
+ $ bzr branch lp:postorius
+ $ cd postorius
+ $ sudo python setup.py develop
+ $ cd ..
+
+You can always pull in the latest changes from the development branch:
+
+::
+
+ $ cd postorius
+ $ bzr pull
+ $ cd ..
+
+
+Setup your django project
+=========================
+
+Since you have now installed the necessary packages to run Postorius, it's
+time to setup your Django site.
+
+First, get the project directory from launchpad:
+
+::
+
+ $ bzr branch lp:~mailman-coders/postorius/postorius_standalone
+
+Second, change the database setting in ``postorius_standalone/settings.py`` to
+your preferred database. If you're OK with using sqlite, just change the path
+in line 48 to the correct location.
+
+.. note::
+ Detailed information on how to use different databse engines can be found
+ in the `Django documentation`_.
+
+.. _Django documentation: https://docs.djangoproject.com/en/1.4/ref/settings/#databases
+
+Third, prepare the database:
+
+::
+
+ $ cd postorius_standalone
+ $ python manage.py syncdb
+ $ cd ..
+
+This will create the ``.db file`` (if you ar using SQLite) and will setup all the
+necessary db tables. You will also be prompted to create a superuser which
+will act as an admin account for Postorius.
+
+
+Running the development server
+==============================
+
+The quickest way to run postorius is to just start the development server:
+
+::
+
+ $ cd postorius_standalone
+ $ python manage.py runserver
+
.. warning::
You should use the development server only locally. While it's possible to
- make the dev server available publicly, you should never do that in a
- production environment.
+ make your site publicly available using the dev server, you should never
+ do that in a production environment.
-Apache and mod_Wsgi
--------------------
+Running Postorius on Apache with mod_wsgi
+=========================================
+.. note::
+ This guide assumes that you know how to setup a VirtualHost with Apache.
+ If you are using SQLite, the ``.db`` file as well as its folder need to be
+ writable by the web server.
+
+These settings need to be added to your Apache VirtualHost:
+
+::
+
+ Alias /static /path/to/postorius_standalone/static
+
+ Order deny,allow
+ Allow from all
+
+
+ WSGIScriptAlias / /path/to/postorius_standalone/srv/postorius.wsgi
+
+ Order deny,allow
+ Allow from all
+
+
+The first Alias serves the static files (CSS, JS, Images, etc.). The
+WSGIScriptAlias serves the Django application. The paths need to be changed
+depending on which location you downloaded ``postorius_standalone`` to.
+
+We're almost ready. But you need to collect the static files from Postorius
+(which resides somewhere on your pythonpath) to be able to serve them from the
+site directory. All you have to do is to change into the
+``postorius_standalone`` directory and run:
+
+::
+
+ $ python manage.py collectstatic
+
+After reloading the webserver Postorius should be running!
diff --git a/src/postorius/doc/_build/html/_static/basic.css b/src/postorius/doc/_build/html/_static/basic.css
index f0379f3..43e8baf 100644
--- a/src/postorius/doc/_build/html/_static/basic.css
+++ b/src/postorius/doc/_build/html/_static/basic.css
@@ -79,11 +79,11 @@
font-size: 1em;
}
-div.sphinxsidebar input[type="text"] {
+div.sphinxsidebar #searchbox input[type="text"] {
width: 170px;
}
-div.sphinxsidebar input[type="submit"] {
+div.sphinxsidebar #searchbox input[type="submit"] {
width: 30px;
}
diff --git a/src/postorius/doc/_build/html/genindex.html b/src/postorius/doc/_build/html/genindex.html
index 1f85e6d..1b31d0c 100644
--- a/src/postorius/doc/_build/html/genindex.html
+++ b/src/postorius/doc/_build/html/genindex.html
@@ -106,7 +106,7 @@