summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorAurélien Bompard <aurelien@bompard.org>2012-11-22 17:02:27 +0100
committerAurélien Bompard <aurelien@bompard.org>2012-11-22 17:02:27 +0100
commitb3fcdf9951fbb7154f217c55b26c7be2e6ae5e27 (patch)
tree78934af8c5fc506e0d9c1e1dc308ef8c9b349538 /doc
parent1bd98c9b501a339f5767235cb58cefda3bc2f5b5 (diff)
downloadhyperkitty-b3fcdf9951fbb7154f217c55b26c7be2e6ae5e27.tar.gz
hyperkitty-b3fcdf9951fbb7154f217c55b26c7be2e6ae5e27.tar.xz
hyperkitty-b3fcdf9951fbb7154f217c55b26c7be2e6ae5e27.zip
Make a few post-QA fixes
Diffstat (limited to 'doc')
-rw-r--r--doc/database.rst7
-rw-r--r--doc/install.rst13
2 files changed, 11 insertions, 9 deletions
diff --git a/doc/database.rst b/doc/database.rst
index 1eb8e9a..56b1fa4 100644
--- a/doc/database.rst
+++ b/doc/database.rst
@@ -6,7 +6,7 @@ access URLs in ``hyperkitty_standalone/settings.py`` (or
``hyperkitty_standalone/settings_local.py``). HyperKitty's database can be
created using the following command::
- python manage.py syncdb
+ python hyperkitty_standalone/manage.py syncdb
KittyStore's database will be created automatically on first access.
@@ -16,3 +16,8 @@ mailman database. Thoses archives can be downloaded by a script similar to the
installing hyperkitty on the machine which hosted the previous version of
mailman, the archived are already available locally and you can use them
directly.
+
+.. warning::
+ If you're using SQLite and you're getting "Database is locked" errors, stop
+ your webserver during the import.
+
diff --git a/doc/install.rst b/doc/install.rst
index 6827054..7a109ce 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -40,9 +40,6 @@ file) and ``KITTYSTORE_URL`` (at the bottom).
.. _Django documentation: https://docs.djangoproject.com/en/1.4/ref/settings/#databases
-Third, you must setup the database tables, and the admin account (you will be
-prompted for it).
-
.. Setting up the databases
@@ -66,13 +63,13 @@ Add following line to your apache/httpd configuration file::
And reload Apache. We're almost ready. But you need to collect the static files
from HyperKitty (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
-``hyperkitty_standalone`` directory and run::
+serve them from the site directory. All you have to do is run::
- python manage.py collectstatic
+ python hyperkitty_standalone/manage.py collectstatic
-These static files will be served by Apache. You should now be all set. Try
-accessing HyperKitty in your web browser.
+These static files will be collected in the ``hyperkitty_standalone/static``
+directory and served by Apache. You should now be all set. Try accessing
+HyperKitty in your web browser.
Connecting to Mailman