From f331b1fa3f44f261b83ae4d02aa74015f60db8e8 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 18 Dec 2009 11:31:08 +0100
Subject: [PATCH] Updates

---
 docs/manuals/en/main/main.kilepr    |  2 +-
 docs/manuals/en/main/postgresql.tex | 45 ++++++++++++++++-------------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/docs/manuals/en/main/main.kilepr b/docs/manuals/en/main/main.kilepr
index ddafc06c..7b053a4b 100644
--- a/docs/manuals/en/main/main.kilepr
+++ b/docs/manuals/en/main/main.kilepr
@@ -161,7 +161,7 @@ order=-1
 
 [item:newfeatures.tex]
 archive=true
-column=30
+column=12
 encoding=UTF-8
 highlight=LaTeX
 line=341
diff --git a/docs/manuals/en/main/postgresql.tex b/docs/manuals/en/main/postgresql.tex
index 3defc639..a4061fb2 100644
--- a/docs/manuals/en/main/postgresql.tex
+++ b/docs/manuals/en/main/postgresql.tex
@@ -124,23 +124,10 @@ user).
 \begin{enumerate}
 \item cd \lt{}install-directory\gt{}
 
-   This directory contains the Bacula catalog  interface routines.  
+   This directory contains the Bacula catalog interface routines.  
 
-\item ./create\_bacula\_database
-
-   This script creates the PostgreSQL {\bf bacula} database.  
-   Before running this command, you should carefully think about
-   what encoding sequence you want for the text fields (paths, files, ...).
-   Ideally, the encoding should be set to UTF8. However, many Unix systems
-   have filenames that are not encoded in UTF8, either because you have
-   not set UTF8 as your default character set or because you have imported
-   files from elsewhere (e.g. MacOS X).  For this reason, Bacula uses
-   SQL\_ASCII as the default encoding.  If you want to change this,
-   please modify the script before running it, but be forewarned that
-   Bacula backups will fail if PostgreSQL finds any non-UTF8 sequences.
-
-   If running the script fails, it is probably because the database is
-   owned by a user other than yourself.  On many systems, the database
+\item Create the database owner ({\bf bacula})
+   On many systems, the PostreSQL master 
    owner is {\bf pgsql} and on others such as Red Hat and Fedora it is {\bf
    postgres}.  You can find out which it is by examining your /etc/passwd
    file.  To create a new user under either your name or with say the name
@@ -150,15 +137,33 @@ user).
    su
    (enter root password)
    su pgsql (or postgres)
-   createuser kern (or perhaps bacula)
+   createuser bacula
    Shall the new user be allowed to create databases? (y/n) y
    Shall the new user be allowed to create more new users? (y/n) (choose
          what you want)
    exit
 \end{verbatim}
-    
-    At this point, you should be able to execute the
-    ./create\_bacula\_database command.
+   Normally the {\bf bacula} user must be able to create new databases,
+   if you use the script in the next item, 
+   or you will have to create one for it, but it does not need to 
+   create new users.
+
+\item ./create\_bacula\_database
+
+   This script creates the PostgreSQL {\bf bacula} database.  
+   Before running this command, you should carefully think about
+   what encoding sequence you want for the text fields (paths, files, ...).
+   We strongly recommend that you use the default value of SQL\_ASCII
+   that is in the create\_bacula\_database script.  Please be warned
+   that if you change this value, your backups may fail.  After running
+   the script, you can check with the command:
+
+\begin{verbatim}
+   psql -l
+\end{verbatim}
+
+   and the column marked {\bf Encoding} should be {\bf SQL\_ASCII} for
+   all your Bacula databases (normally {\bf bacula}).
 
 \item ./make\_bacula\_tables
 
-- 
2.39.5