[Pkg-ocaml-maint-commits] [SCM] nurpawiki packaging branch, master, updated. upstream/1.2.1-9-gaeb4d5b

[Stephane Glondu]

The following commit has been merged in the master branch:
commit aeb4d5bb1b4fd659cc3a4880e3336e778d460267
Author: Janne Hellsten <jjhellst at gmail.com>
Date:   Wed Oct 1 02:31:21 2008 +0300

    Minor documentation changes.

diff --git a/debian/README.Debian b/debian/README.Debian
index 9a85f12..4076e46 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -18,22 +18,22 @@ user postgres):
       ALTER ${DBUSER} PASSWORD '${DBPASSWORD}';
       \q
  3. Populate the database with Nurpawiki's schema:
-      psql ${DBNAME} ${DBUSER} < schema.psql
+      psql ${DBNAME} ${DBUSER} < /usr/share/doc/nurpawiki/schema.psql
 
 You can take, for example, DBUSER=ocsigen and DBNAME=nurpawiki (beware
 of commands executed in psql shell). The schema.psql file is available
-in /usr/share/doc/nurpawiki where Nurpawiki is installed.
+in /usr/share/doc/nurpawiki.
 
 A sample template for a configuration file is available in
-/usr/share/doc/nurpawiki/examples. Filling it with proper user,
-database name and password will give you a <file> that can be run with
-"ocsigen -c <file>" (as root). Ocsigen will then be listening on port
-8080, as user ocsigen, and be serving Nurpawiki only (at /). If
-satisfied, and if you don't use any other Ocsigen-based service, you
-can directly use that configuration file as /etc/ocsigen/ocsigen.conf
-and use the initscript to launch ocsigen. Of course, Nurpawiki can be
-used with other Ocsigen-based services, but you'll have to edit
-/etc/ocsigen.conf yourself.
+/usr/share/doc/nurpawiki/examples. Filling it with proper database
+user, database name and password will give you a <file> that can be
+run with "ocsigen -c <file>" (as root). Ocsigen will then be listening
+on port 8080, as user ocsigen, and be serving Nurpawiki only (at
+/). If satisfied, and if you don't use any other Ocsigen-based
+service, you can directly use that configuration file as
+/etc/ocsigen/ocsigen.conf and use the initscript to launch ocsigen. Of
+course, Nurpawiki can be used with other Ocsigen-based services, but
+you'll have to edit /etc/ocsigen.conf yourself.
 
 At installation, a wiki user "admin" with an empty password is created.
 
@@ -44,7 +44,7 @@ At installation, a wiki user "admin" with an empty password is created.
   Tutorial on using Nurpawiki:
     http://code.google.com/p/nurpawiki/wiki/Tutorial
 
-  Nurpawiki project page:
+  Nurpawiki project page (use Issues tab for bug reporting):
     http://code.google.com/p/nurpawiki/
 
   Ocsigen project page:
@@ -54,11 +54,12 @@ At installation, a wiki user "admin" with an empty password is created.
 3. Known limitations
 ~~~~~~~~~~~~~~~~~~~~
 
-Nurpawiki seems to work only with a local PostgreSQL database, and
-doesn't handle ident (socket-based) authentication.
+Nurpawiki can only be used with a local PostgreSQL database and
+doesn't handle ident (socket-based) authentication.  This is merely a
+configuration limitation and should be easy to fix if need be.
 
 Ocsigen provides a /etc/ocsigen/conf.d directory for easy splitting of
-the configuration, but the default /etc/ocsigen/ocsigen.conf provided
+the configuration but the default /etc/ocsigen/ocsigen.conf provided
 by the ocsigen package makes it useless. This is the reason why the
 configuration part is still a bit tricky (this will hopefully be fixed
 in the future).

-- 
nurpawiki packaging