merge from HEAD

Author: Richard Jones

doc/installation.txt

@@ -476,6 +476,12 @@ The tracker "db" directory should be chmod'ed g+sw so that the group can
 write to the database, and any new files created in the database will be owned
 by the group.
 
+If you're using the mysql or postgresql backend then you'll need to ensure
+that the tracker user has appropriate permissions to create/modify the
+database. If you're using roundup.cgi, the apache user needs permissions
+to modify the database.  Alternatively, explicitly specify a database login
+in ``POSTRGRESQL_DATABASE`` or ``MYSQL_DATABASE`` in ``config.py``.
+
 An alternative to the above is to create a new user who has the sole
 responsibility of running roundup. This user:
 

doc/mysql.txt

@@ -53,8 +53,8 @@ Additional configuration
 ========================
 
 To initialise and use the MySQL database backend, roundup's configuration 
-file (config.py in the tracker's home directory) should have the following
-entries::
+file (``config.py`` in the tracker's home directory) should have the following
+entries (substituting real values of course)::
 
     MYSQL_DBHOST = 'localhost'
     MYSQL_DBUSER = 'rounduptest'
@@ -64,9 +64,9 @@ entries::
         MYSQL_DBNAME )
 
 Fill in the first four entries with values for your local MySQL installation 
-before running "roundup-admin initialise".  Use the commands in the `Running the
-MySQL tests` to set up a database if you have privilege, or ask your local
-administrator if not.
+before running "roundup-admin initialise". Use the commands in the
+`Running the MySQL tests`_ to set up a database if you have privilege, or
+ask your local administrator if not.
 
 
 Showing MySQL who's boss
@@ -82,3 +82,4 @@ just::
 
 and all will be better (note that on some systems, ``mysql`` is spelt
 ``mysqld``).
+

doc/postgresql.txt

@@ -33,13 +33,15 @@ Additional configuration
 ========================
 
 To initialise and use PostgreSQL database roundup's configuration file
-(config.py in the tracker's home directory) should be appended with the
-following constants (substituting real values, obviously)::
+(``config.py`` in the tracker's home directory) should be ammended with
+the following constants (substituting real values, obviously)::
 
     POSTGRESQL_DATABASE = {'database': 'rounduptest'}
 
-if not local, or a different user is to be used, then more information may
-be supplied::
+Note that it's usually a good idea to explicitly specify the user which is
+to be used access the database too, to avoid permissions problems. If
+postgresql is not local, or a different user is to be used, then more
+information may be supplied::
 
     POSTGRESQL_DATABASE = {
         'host': 'localhost', 'port': 5432,
@@ -50,10 +52,16 @@ be supplied::
 Also note that you can leave some values out of
 ``POSTGRESQL_DATABASE``: 'host' and 'port' are not necessary when
 connecting to a local database and 'password'
-is optional if postgres trusts local connections. The user specified in
-``user`` must have rights to create a new database and to
-connect to the "template1" database, used while initializing roundup.
+is optional if postgres trusts local connections.
 
-    Have fun with psycopg,
-    Federico Di Gregorio <[email protected]>
+The user specified in ``user`` must have rights to create a new database
+and to connect to the "template1" database, used while initializing roundup.
+
+
+
+Credit
+======
+
+The postgresql backend was originally submitted by Federico Di Gregorio
+<[email protected]>