summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--INSTALL.pgsql.txt18
-rw-r--r--sites/default/settings.php16
2 files changed, 10 insertions, 24 deletions
diff --git a/INSTALL.pgsql.txt b/INSTALL.pgsql.txt
index 078f4caaa..88ba13d00 100644
--- a/INSTALL.pgsql.txt
+++ b/INSTALL.pgsql.txt
@@ -6,7 +6,6 @@ CONTENTS OF THIS FILE
* Introduction
* Installation and configuration:
- Database and user creation
- - PL/pgSQL procedural language installation
- Drupal schema loading
INTRODUCTION
@@ -39,24 +38,11 @@ INSTALLATION AND CONFIGURATION
use with Drupal only. The following command creates a new database
named "databasename", which is owned by previously created "username":
- createdb --encoding=SQL_ASCII --owner=username databasename
+ createdb --encoding=UNICODE --owner=username databasename
If everything works correctly, you'll see a "CREATE DATABASE" notice.
-3. INSTALL THE PL/pgSQL LANGUAGE
-
- You must also install the PL/pgSQL language if it does not exist:
-
- createlang plpgsql databasename
-
- If everything works correctly, you won't see any messages. It is
- possible that the PL/pgSQL language was already installed; if so,
- running the above command would give you the following error:
-
- createlang: language "plpgsql" is already
- installed in database "databasename"
-
-4. LOAD THE DRUPAL DATABASE SCHEMA
+3. LOAD THE DRUPAL DATABASE SCHEMA
Once the database has been created, load the required tables into it:
diff --git a/sites/default/settings.php b/sites/default/settings.php
index 67fed645b..6f190b723 100644
--- a/sites/default/settings.php
+++ b/sites/default/settings.php
@@ -79,23 +79,23 @@
* );
*
* Database URL format:
- * $db_url = 'mysql://username:password@localhost/database';
- * $db_url = 'mysqli://username:password@localhost/database';
- * $db_url = 'pgsql://username:password@localhost/database';
+ * $db_url = 'mysql://username:password@localhost/databasename';
+ * $db_url = 'mysqli://username:password@localhost/databasename';
+ * $db_url = 'pgsql://username:password@localhost/databasename';
*/
-$db_url = 'mysql://username:password@localhost/database';
+$db_url = 'mysql://username:password@localhost/databasename';
$db_prefix = '';
/**
* Base URL:
*
* The URL of your website's main page. It is not allowed to have
- * a trailing slash; Drupal will add it for you.
- *
- * Examples:
+ * a trailing slash; Drupal will add it for you.
+ *
+ * Examples:
* $base_url = 'http://localhost';
* $base_url = 'http://example.com/drupal';
- *
+ *
* By default, Drupal tries to set the $base_url for you using
* the code below.
*/