Updates

diff --git a/docs/manuals/en/main/mysql.tex b/docs/manuals/en/main/mysql.tex
index 75cc6f0e8f601adabe907de723998bf961c8bed0..fb937269b26475d925c7cc1a2da6ebdcb1c8e672 100644 (file)
--- a/docs/manuals/en/main/mysql.tex
+++ b/docs/manuals/en/main/mysql.tex
@@ -39,15 +39,28 @@ mysql-server-<version>.rpm
 mysql-devel-<version>.rpm
 \end{verbatim}
 \normalsize
+
+If you wish to install them from debs, you will probably need the
+following:
+
+\footnotesize
+\begin{verbatim}
+mysql-server-<version>.deb
+mysql-client-<version>.deb
+libmysqlclient15-dev-<version>.deb
+libmysqlclient15off-<version>.deb
+\end{verbatim}
+\normalsize
+
 The names of the packages may vary from distribution to
-distribution. It is important to have the devel package loaded as
+distribution. It is important to have the {\bf devel} or {\bf dev} package loaded as
 it contains the libraries and header files necessary to build
 Bacula.  There may be additional packages that are required to 
 install the above, for example, zlib and openssl.   
 
 Once these packages are installed, you will be able to build Bacula (using
 the files installed with the mysql package, then run MySQL using the
-files installed with mysql-server. If you have installed MySQL by rpms,
+files installed with mysql-server. If you have installed MySQL by debs or rpms,
 please skip Phase I below, and return to complete the installation of
 Bacula, then come back to Phase II of the MySQL installation when indicated
 to do so.

diff --git a/docs/manuals/en/main/postgresql.tex b/docs/manuals/en/main/postgresql.tex
index a4061fb2837fb93cee405094a4da27b2150e7437..0d22a7bedeed318c632fb5366b0ab24d1f3060d4 100644 (file)
--- a/docs/manuals/en/main/postgresql.tex
+++ b/docs/manuals/en/main/postgresql.tex
@@ -192,8 +192,9 @@ PostgreSQL-directory/bin/psql --command \\dp bacula
 \normalsize
 
 Also, I had an authorization problem with the password. In the end,
-I had to modify my {\bf pg\_hba.conf} file (in /var/lib/pgsql/data on my machine)
-from:
+I had to modify my {\bf pg\_hba.conf} file (in /var/lib/pgsql/data on my machine
+in /var/lib/postgresql/8.x on others, and in /etc/postgres/8.x/main on
+still others -- what a mess!) from:
 
 \footnotesize
 \begin{verbatim}
@@ -209,7 +210,7 @@ my regression scripts without having a password.
 
 A more secure way to perform database authentication is with md5
 password hashes.  Begin by editing the {\bf pg\_hba.conf} file, and
-just prior the the existing ``local'' and ``host'' lines, add the line:
+above the existing ``local'' and ``host'' lines, add the line:
 
 \footnotesize
 \begin{verbatim}
@@ -217,14 +218,14 @@ just prior the the existing ``local'' and ``host'' lines, add the line:
 \end{verbatim}
 \normalsize
 
-and restart the Postgres database server (frequently, this can be done
+then restart the Postgres database server (frequently, this can be done
 using "/etc/init.d/postgresql restart" or "service postgresql restart") to
 put this new authentication rule into effect.
 
 Next, become the Postgres administrator, postgres, either by logging
 on as the postgres user, or by using su to become root and then using
-su - postgres to become postgres.  Add a password to the bacula
-database for the bacula user using:
+{\bf su - postgres} or {\bf su - pgsql} to become postgres.  
+Add a password to the {\bf bacula} database for the {\bf bacula} user using:
 
 \footnotesize
 \begin{verbatim}
@@ -314,8 +315,8 @@ device name for your machine.
 \index[general]{Installing PostgreSQL from RPMs}
 If you are installing PostgreSQL from RPMs, you will need to install
 both the PostgreSQL binaries and the client libraries.  The client
-libraries are usually found in a devel package, so you must
-install:
+libraries are usually found in a {\bf devel} or {\bf dev} package, so you must
+install the following for rpms:
 
 \footnotesize
 \begin{verbatim}
@@ -326,6 +327,21 @@ install:
 \end{verbatim}
 \normalsize
 
+
+and the following for debs:
+
+\footnotesize
+\begin{verbatim}
+  postgresql
+  postgresql-common
+  postgresql-client
+  postgresql-client-common
+  libpq5
+  libpq-dev
+\end{verbatim}
+\normalsize
+
+
 These will be similar with most other package managers too.  After
 installing from rpms, you will still need to run the scripts that set up
 the database and create the tables as described above.

diff --git a/docs/manuals/en/problems/firewalls.tex b/docs/manuals/en/problems/firewalls.tex
index 1e93c04e2109e5911eef042f3bb50e450fdc4bd7..9646ea65ee15faa5880628124898bb9823e63090 100644 (file)
--- a/docs/manuals/en/problems/firewalls.tex
+++ b/docs/manuals/en/problems/firewalls.tex
@@ -28,7 +28,7 @@ FD      -> SD:9103
 
 Where hopefully it is obvious that DIR represents the Director, FD the File
 daemon or client, and SD the Storage daemon. The numbers that follow those
-names are the standard ports used by Bacula, and the -\gt{} represents the
+names are the standard ports used by Bacula, and the \verb:->: represents the
 left side making a connection to the right side (i.e. the right side is the
 "server" or is listening on the specified port), and the left side is the
 "client" that initiates the conversation.