Index: openacs-4/etc/install/install.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/etc/install/install.tcl,v
diff -u -r1.18 -r1.19
--- openacs-4/etc/install/install.tcl	8 Dec 2003 16:34:33 -0000	1.18
+++ openacs-4/etc/install/install.tcl	9 Dec 2003 09:16:07 -0000	1.19
@@ -93,15 +93,23 @@
 # example: install simulation during server setup
 #set install_xml_file          "${serverroot}/packages/simulation/install.xml"
 
+#----------------------------------------------------------------------
+# Database configuration
+#----------------------------------------------------------------------
 
 #---------------------------------------------------------------------
 # Choose which database you will use - Say 'oracle' or 'postgres'
-
 set database                  "postgres"
 
+#---------------------------------------------------------------------
+# For PostgreSQL this is the name of the database. For Oracle it is
+# the name of the db user. Note that for Oracle a tablespace must already exist with
+# the same name. Remember that for Oracle, dashes (minus signs) are not allowed here.
+# Will be re-created.
+set db_name                   "${server}"
 
 #----------------------------------------------------------------------
-# Database configuration - PostgreSQL
+# PostgreSQL
 #----------------------------------------------------------------------
 
 #---------------------------------------------------------------------
@@ -112,9 +120,6 @@
 # Name of the postgres user for web service access
 set pg_db_user                ${server}
 
-#---------------------------------------------------------------------
-# Name of the PostgreSQL database. Will be created.
-set db_name                   ${server}
 
 #---------------------------------------------------------------------
 # The host running PostgreSQL
@@ -130,12 +135,9 @@
 
 
 #----------------------------------------------------------------------
-# Database configuration - Oracle
+# Oracle
 #----------------------------------------------------------------------
 
-# The name of the Oracle user and tablespace. Will get created.
-set oracle_user               ${server}
-
 # Password for the Oracle user
 set oracle_password           ${db_name}
 
@@ -145,6 +147,8 @@
 
 
 
+
+
 #######################################################################
 #
 # Things you don't want to change if you're doing a standard install