[Pkg-drupal-commits] r1815 - in /branches/drupal-5.0/debian: changelog etc/settings.php

[luigi at users.alioth.debian.org]

Author: luigi
Date: Tue Aug 21 10:48:10 2007
New Revision: 1815

URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=1815
Log:
Apply fixes from upstream version (Closes: #435433)

Modified:
    branches/drupal-5.0/debian/changelog
    branches/drupal-5.0/debian/etc/settings.php

Modified: branches/drupal-5.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal-5.0/debian/changelog?rev=1815&op=diff
==============================================================================
--- branches/drupal-5.0/debian/changelog (original)
+++ branches/drupal-5.0/debian/changelog Tue Aug 21 10:48:10 2007
@@ -4,6 +4,9 @@
 
   * debian/README.Debian
     - Fixed references to configuration directory
+
+  * debian/etc/settings.php
+    - Apply fixes from upstream version (Closes: #435433)
 
  -- Luigi Gangitano <luigi at debian.org>  Fri, 27 Jul 2007 02:12:20 +0200
 

Modified: branches/drupal-5.0/debian/etc/settings.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/drupal-5.0/debian/etc/settings.php?rev=1815&op=diff
==============================================================================
--- branches/drupal-5.0/debian/etc/settings.php (original)
+++ branches/drupal-5.0/debian/etc/settings.php Tue Aug 21 10:48:10 2007
@@ -1,9 +1,15 @@
 <?php
-// $Id: settings.php,v 1.27 2006/04/24 19:25:37 dries Exp $
+// $Id: settings.php,v 1.39.2.3 2007/07/09 04:28:12 drumm Exp $
 
 /**
  * @file
  * Drupal site-specific configuration file.
+ *
+ * IMPORTANT NOTE:
+ * This file may have been set to read-only by the Drupal installation
+ * program. If you make changes to this file, be sure to protect it again
+ * after making your modifications. Failure to remove write permissions
+ * to this file is a security risk.
  *
  * The configuration file to be loaded is based upon the rules below.
  *
@@ -32,7 +38,7 @@
  * 10. sites/default
  *
  * If you are installing on a non-standard port number, prefix the
- * hostname with that number.  For example,
+ * hostname with that number. For example,
  * http://www.drupal.org:8080/mysite/test/ could be loaded from
  * sites/8080.www.drupal.org.mysite.test/.
  */
@@ -136,6 +142,16 @@
 ini_set('url_rewriter.tags',        '');
 
 /**
+ * Drupal automatically generates a unique session cookie name for each site
+ * based on on its full domain name. If you have multiple domains pointing at
+ * the same Drupal site, you can either redirect them all to a single domain
+ * (see comment in .htaccess), or uncomment the line below and specify their
+ * shared base domain. Doing so assures that users remain logged in as they
+ * cross between your various domains.
+ */
+# $cookie_domain = 'example.com';
+
+/**
  * Variable overrides:
  *
  * To override specific entries in the 'variable' table for this site,
@@ -148,7 +164,7 @@
  */
 # $conf = array(
 #   'site_name' => 'My Drupal site',
-#   'theme_default' => 'pushbutton',
-#   'anonymous' => 'Visitor'
+#   'theme_default' => 'minnelli',
+#   'anonymous' => 'Visitor',
 # );