diff -Naurp -x Entries.Log -x Entries drupal-4-6-install.txt-25792/INSTALL.mysql.txt ../cvs/drupal-4-6/INSTALL.mysql.txt
--- drupal-4-6-install.txt-25792/INSTALL.mysql.txt	2005-11-19 19:41:39.000000000 +0100
+++ ../cvs/drupal-4-6/INSTALL.mysql.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,62 +0,0 @@
-// $Id$
-
-This file describes steps neccesarily to set up MySQL database with Drupal.
-
-1. CREATE THE DRUPAL DATABASE
-
-   This step is only necessary if you don't already have a database
-   set-up (e.g. by your host). If you control your databases through a
-   web-based control panel, check its documentation for creating databases,
-   as the following instructions are for the command-line only.
-
-   In the following examples, 'dba_user' is an example MySQL user which has 
-   the CREATE and GRANT privileges. Use the appropriate user name for your 
-   system.
-
-   First, you must create a new database for your Drupal site
-   (here, 'drupal' is the name of the new database):
-
-     mysqladmin -u dba_user -p create drupal
-
-   MySQL will prompt for the 'dba_user' database password and then create
-   the initial database files. Next you must login and set the access
-   database rights:
-
-     mysql -u dba_user -p
-
-   Again, you will be asked for the 'dba_user' database password.
-   At the MySQL prompt, enter following command:
-
-     GRANT ALL PRIVILEGES ON drupal.*
-        TO nobody@localhost IDENTIFIED BY 'password';
-
-   where
-
-    'drupal' is the name of your database
-    'nobody@localhost' is the username of your webserver MySQL account
-    'password' is the password required to log in as the MySQL user
-
-   If successful, MySQL will reply with:
-
-     Query OK, 0 rows affected
-
-   To activate the new permissions you must enter the command:
-
-     flush privileges;
-
-   and then enter '\q' to exit MySQL.
-
-2. LOAD THE DRUPAL DATABASE SCHEME
-
-   Once you have a database, you must load the required tables into it.
-
-   If you use a web-based control panel, you should be able
-   to upload the file 'database.mysql' from Drupal's 'database'
-   directory and run it directly as SQL commands.
-
-   From the command line, use (again, replacing 'nobody' and
-   'drupal' with your MySQL username and name of your database):
-
-     mysql -u nobody -p drupal < database/database.mysql
-
-
diff -Naurp -x Entries.Log -x Entries drupal-4-6-install.txt-25792/INSTALL.pgsql.txt ../cvs/drupal-4-6/INSTALL.pgsql.txt
--- drupal-4-6-install.txt-25792/INSTALL.pgsql.txt	2005-11-19 23:10:03.000000000 +0100
+++ ../cvs/drupal-4-6/INSTALL.pgsql.txt	1970-01-01 01:00:00.000000000 +0100
@@ -1,97 +0,0 @@
-// $Id$
-
-CONTENTS OF THIS FILE
----------------------
-
- * Introduction
- * Installation and configuration:
-    - Database user creation
-    - Database creation
-    - PL/pgSQL procedural language installation
-    - Drupal scheme loading
- * Troubleshooting
-
-INTRODUCTION
-------------
-
-This file describes the steps necessary to set up a PostgreSQL database
-with Drupal. It is not meant as complete guide on configuring
-PostgreSQL database.
-
-Please read the entire set of instructions before starting.
-
-If you control your databases through a web-based control panel, 
-check its documentation, as the following instructions are for the 
-command-line only.
-
-INSTALLATION AND CONFIGURATION
-------------------------------
-
-1. CREATE DATABASE USER
-   
-   This step is only necessary if you don't already have a user
-   setup (e.g. by your host) or you want to create new user for 
-   use with Drupal only.
-
-   The following command creates new user named "drupal_user" and asks 
-   for a password for that user:
-
-     createuser --pwprompt --encrypted --no-adduser --no-createdb drupal_user
-  
-   If everything works correctly you'll see "CREATE USER" notice.
-
-2. CREATE THE DATABASE
-   
-   This step is only necessary if you don't already have a database
-   setup (e.g. by your host) or you want to create new database for 
-   use with Drupal only.
-
-   The following command creates new database named "drupal", which is owned by
-   previously created "drupal_user":
-     
-     createdb --encoding=SQL_ASCII --owner=drupal_user drupal
-     
-   If everything works correctly you'll see "CREATE DATABASE" notice.
-
-3. INSTALL PL/pgSQL LANGUAGE  
-   
-   You also must install PL/pgSQL language in the database, 
-   if it does not exist:
-   
-     createlang plpgsql drupal
-   
-   If everything works correctly you won't see any messages.
-
-   It is possible that the PL/pgSQL language was already installed so you 
-   don't have to do anything . In such a case you'll get following notice:
-
-     createlang: language "plpgsql" is already installed in database "drupal"
-
-4. LOAD THE DRUPAL DATABASE SCHEME
-
-   Once you have a database, you must load the required tables into it:
-
-     psql -q -f database/database.pgsql drupal drupal_user 
-
-   If everything works correctly you won't see any messages.
-
-TROUBLESHOOTING
----------------
-
-Commands from steps 1-2 assume that the user which executes them has all 
-necessary rights to create users, databases and languages. This may be 
-different in your setup. If you see any errors like this:
-
-   createuser: creation of new user failed: ERROR:  must be superuser to create users
-   createdb: database creation failed: ERROR:  permission denied to create database
-   createdb: database creation failed: ERROR:  must be superuser to create database for another user
-   createlang: language installation failed: ERROR:  permission denied for language c
-
-it means you do not have enough permissions to create the object.
-
-If you see error like this:
-
-   psql: FATAL:  no pg_hba.conf entry for host "[local]", user "someuser", database "somedatabase", SSL off
-
-it probably means you have not configured your pg_hba.conf access properly.
-
diff -Naurp -x Entries.Log -x Entries drupal-4-6-install.txt-25792/INSTALL.txt ../cvs/drupal-4-6/INSTALL.txt
--- drupal-4-6-install.txt-25792/INSTALL.txt	2005-11-19 22:45:37.000000000 +0100
+++ ../cvs/drupal-4-6/INSTALL.txt	2005-11-15 23:50:12.000000000 +0100
@@ -52,17 +52,65 @@ INSTALLATION
 
      mv drupal-x.x.x/* drupal-x.x.x/.htaccess /var/www/html
 
-2. PREPARE YOUR DATABASE, LOAD DRUPAL SCHEMA
+2. CREATE THE DRUPAL DATABASE
 
-   Depending on database of your choise, please read either
-   INSTALL.mysql.txt (for MySQL) or INSTALL.pgsql.txt (for PostgreSQL).
-      
-   Before you proceed to the next step you should know:
-   - "username"      - user name used for connecting to the database
-   - "password"      - password of the user
-   - "databasename"  - name of the database
-   
-3. CONNECTING DRUPAL
+   This step is only necessary if you don't already have a database
+   set-up (e.g. by your host). If you control your databases through a
+   web-based control panel, check its documentation for creating databases,
+   as the following instructions are for the command-line only.
+
+   These instructions are for MySQL. If you are using another database,
+   check the database documentation. In the following examples,
+   'dba_user' is an example MySQL user which has the CREATE and GRANT
+   privileges. Use the appropriate user name for your system.
+
+   First, you must create a new database for your Drupal site
+   (here, 'drupal' is the name of the new database):
+
+     mysqladmin -u dba_user -p create drupal
+
+   MySQL will prompt for the 'dba_user' database password and then create
+   the initial database files. Next you must login and set the access
+   database rights:
+
+     mysql -u dba_user -p
+
+   Again, you will be asked for the 'dba_user' database password.
+   At the MySQL prompt, enter following command:
+
+     GRANT ALL PRIVILEGES ON drupal.*
+        TO nobody@localhost IDENTIFIED BY 'password';
+
+   where
+
+    'drupal' is the name of your database
+    'nobody@localhost' is the username of your webserver MySQL account
+    'password' is the password required to log in as the MySQL user
+
+   If successful, MySQL will reply with:
+
+     Query OK, 0 rows affected
+
+   To activate the new permissions you must enter the command:
+
+     flush privileges;
+
+   and then enter '\q' to exit MySQL.
+
+3. LOAD THE DRUPAL DATABASE SCHEME
+
+   Once you have a database, you must load the required tables into it.
+
+   If you use a web-based control panel, you should be able
+   to upload the file 'database.mysql' from Drupal's 'database'
+   directory and run it directly as SQL commands.
+
+   From the command line, use (again, replacing 'nobody' and
+   'drupal' with your MySQL username and name of your database):
+
+     mysql -u nobody -p drupal < database/database.mysql
+
+4. CONNECTING DRUPAL
 
    The default configuration can be found in the
    'sites/default/settings.php' file within your Drupal installation.
@@ -70,13 +118,11 @@ INSTALLATION
    base URL to the web site. Open the configuration file and edit the
    $db_url line to match the database defined in the previous steps:
 
-     $db_url = "mysql://username:password@localhost/databasename"; 
+     $db_url = "mysql://username:password@localhost/database";
 
-   where 'username', 'password', 'localhost' and 'databasename' are the
+   where 'username', 'password', 'localhost' and 'database' are the
    username, password, host and database name for your set up.
 
-   If you use PostgreSQL change "mysql" to "pgsql" in the above line.
-     
    Set $base_url to match the address to your Drupal site:
 
      $base_url = "http://www.example.com";
@@ -134,7 +180,7 @@ INSTALLATION
    NOTE: for more information about multiple virtual hosts or the
    configuration settings, consult the Drupal handbook at drupal.org.
 
-4. CONFIGURE DRUPAL
+5. CONFIGURE DRUPAL
 
    You should consider creating a "files" subdirectory in your Drupal
    installation directory. This subdirectory stores files such as
@@ -148,7 +194,7 @@ INSTALLATION
    Create an account and login. The first account will automatically
    become the main administrator account with total control.
 
-5. CRON TASKS
+6. CRON TASKS
 
    Many Drupal modules (such as the search functionality) have periodic
    tasks that must be triggered by a cron job. To activate these tasks,
diff -Naurp -x Entries.Log -x Entries drupal-4-6-install.txt-25792/database/database.pgsql ../cvs/drupal-4-6/database/database.pgsql
--- drupal-4-6-install.txt-25792/database/database.pgsql	2005-11-16 13:14:22.000000000 +0100
+++ ../cvs/drupal-4-6/database/database.pgsql	2005-11-15 23:50:12.000000000 +0100
@@ -1,6 +1,3 @@
--- Do not show NOTICE: messages, it's hard to spot errors.
-set client_min_messages = 'warning';
-
 --
 -- Table structure for access
 --
