Index: sites/default/settings.php
===================================================================
RCS file: /cvs/drupal/drupal/sites/default/settings.php,v
retrieving revision 1.9
diff -u -r1.9 settings.php
--- sites/default/settings.php	28 Feb 2005 16:42:39 -0000	1.9
+++ sites/default/settings.php	9 Mar 2005 19:34:50 -0000
@@ -5,18 +5,17 @@
  * @file
  * Drupal site-specific configuration file.
  *
- * The configuration file which will be loaded is based upon the rules
- * below.
+ * The configuration file to be loaded is based upon the rules below.
  *
  * The configuration directory will be discovered by stripping the
  * website's hostname from left to right and pathname from right to
- * left.  The first configuration file found will be used and any
- * others will be ignored.  If no other configuration file is found
+ * left. The first configuration file found will be used and any
+ * others will be ignored. If no other configuration file is found
  * then the default configuration file at 'sites/default' will be used.
  *
- * Example for a ficticious site installed at
- * http://www.drupal.org/mysite/test/ the 'settings.php' is
- * searched in the following directories:
+ * For example, for a ficticious site installed at
+ * http://www.drupal.org/mysite/test/, the 'settings.php'
+ * is searched in the following directories:
  *
  *  1. sites/www.drupal.org.mysite.test
  *  2. sites/drupal.org.mysite.test
@@ -36,27 +35,27 @@
 /**
  * Database settings:
  *
- *   Note that the $db_url variable gets parsed using PHP's built-in
- *   URL parser (i.e. using the "parse_url()" function) so make sure
- *   not to confuse the parser.  In practice, you should avoid using
- *   special characters that are not used in "normal" URLs either.
- *   That is, the use of ':', '/', '@', '?', '=' and '#', ''', '"',
- *   and so on is likely to confuse the parser; use alpha-numerical
- *   characters instead.
- *
- *   To specify multiple connections to be used in your site (i.e. for
- *   complex custom modules) you can also specify an associative array
- *   of $db_url variables with the 'default' element used until otherwise
- *   requested.
- *
- *   If an optional $db_prefix is specified all database table names
- *   will be prepended with this string.  Be sure to use valid database
- *   characters only, usually alphanumeric and underscore.  If no
- *   prefixes are desired, set to empty string "".
- *
- *   Database URL format:
- *   $db_url = 'mysql://db_user:db_password@db_hostname/db_name';
- *   $db_url = 'pgsql://db_user:db_password@db_hostname/db_name';
+ * Note that the $db_url variable gets parsed using PHP's built-in
+ * URL parser (i.e. using the "parse_url()" function) so make sure
+ * not to confuse the parser. In practice, you should avoid using
+ * special characters that are not used in "normal" URLs either.
+ * That is, the use of ':', '/', '@', '?', '=' and '#', ''', '"',
+ * and so on is likely to confuse the parser; use alpha-numerical
+ * characters instead.
+ *
+ * To specify multiple connections to be used in your site (i.e. for
+ * complex custom modules) you can also specify an associative array
+ * of $db_url variables with the 'default' element used until otherwise
+ * requested.
+ *
+ * If an optional $db_prefix is specified, all database table names
+ * will be prepended with this string. Be sure to use valid database
+ * characters only, usually alphanumeric and underscore. If no
+ * prefixes are desired, set to empty string ''.
+ *
+ * Database URL format:
+ * $db_url = 'mysql://db_user:db_password@db_hostname/db_name';
+ * $db_url = 'pgsql://db_user:db_password@db_hostname/db_name';
  */
 $db_url = 'mysql://drupal:drupal@localhost/drupal';
 $db_prefix = '';
@@ -64,41 +63,47 @@
 /**
  * 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.
+ * The URL of your website's main page. It is not allowed to have
+ * a trailing slash; Drupal will add it for you.
  */
 $base_url = 'http://localhost';
 
 /**
  * PHP settings:
  *
- *   To see what PHP settings are known to work well, read the PHP
- *   documentation at http://www.php.net/manual/en/ini.php#ini.list
- *   and take a look at the .htaccess file to see which settings are
- *   used there. Settings defined here should not be duplicated there
- *   to avoid conflict issues.
+ * To see what PHP settings are possible, including whether they can
+ * be set at runtime (ie., when ini_set() occurs), read the PHP
+ * documentation at http://www.php.net/manual/en/ini.php#ini.list
+ * and take a look at the .htaccess file to see which non-runtime
+ * settings are used there.Settings defined here should not be
+ * duplicated there so as to avoid conflict issues.
  */
+ini_set('arg_separator.output',     '&');
+ini_set('magic_quotes_runtime',     0);
+ini_set('magic_quotes_sybase',      0);
+ini_set('session.auto_start',       0);
 ini_set('session.cache_expire',     200000);
 ini_set('session.cache_limiter',    'none');
-ini_set('session.gc_maxlifetime',   200000);
 ini_set('session.cookie_lifetime',  2000000);
+ini_set('session.gc_maxlifetime',   200000);
 ini_set('session.save_handler',     'user');
 ini_set('session.use_only_cookies', 1);
 ini_set('session.use_trans_sid',    0);
+ini_set('track_vars',               1);
 
 /**
  * Variable overrides:
  *
- *   To override specific entries in the 'variable' table for this site,
- *   set them here.  You usually don't need to use this feature.  This is
- *   useful when used in a configuration file for a vhost or directory,
- *   rather than the default settings.php. Any configuration setting from
- *   the variable table can be given a new value.
+ * To override specific entries in the 'variable' table for this site,
+ * set them here. You usually don't need to use this feature. This is
+ * useful in a configuration file for a vhost or directory, rather than
+ * the default settings.php. Any configuration setting from the 'variable'
+ * table can be given a new value.
  */
-// $conf = array(
-//   'site_name' => 'My Drupal site',
-//   'theme_default' => 'pushbutton',
-//   'anonymous' => 'Visitor'
-// );
+//$conf = array(
+//  'site_name' => 'My Drupal site',
+//  'theme_default' => 'pushbutton',
+//  'anonymous' => 'Visitor'
+//);
 
 ?>