? 56634.diff
Index: .htaccess
===================================================================
RCS file: /cvs/drupal/drupal/.htaccess,v
retrieving revision 1.70
diff -u -p -r1.70 .htaccess
--- .htaccess	24 Mar 2006 18:00:27 -0000	1.70
+++ .htaccess	8 Apr 2006 08:16:15 -0000
@@ -2,6 +2,17 @@
 # Apache/PHP/Drupal settings:
 #
 
+# If your site can be accessed both with and without the prefix www.
+# you can use one of the following settings to force user to use only one option:
+#
+# If you want the site to be accessed WITH the www. only, adapt and comment out the following:
+# RewriteCond %{HTTP_HOST} !^www\.example\.com$ [NC]
+# RewriteRule .* http://www.example.com/ [L,R=301]
+#
+# If you want the site to be accessed only WITHOUT the www. , adapt and comment out the following:
+# RewriteCond %{HTTP_HOST} !^example\.com$ [NC]
+# RewriteRule .* http://example.com/ [L,R=301]
+
 # Protect files and directories from prying eyes.
 <FilesMatch "(\.(engine|inc|install|module|sh|.*sql|theme|tpl|xtmpl)|code-style\.pl|Entries.*|Repository|Root)$">
   Order deny,allow
Index: sites/default/settings.php
===================================================================
RCS file: /cvs/drupal/drupal/sites/default/settings.php,v
retrieving revision 1.24
diff -u -p -r1.24 settings.php
--- sites/default/settings.php	8 Jan 2006 12:10:12 -0000	1.24
+++ sites/default/settings.php	8 Apr 2006 08:16:15 -0000
@@ -92,11 +92,16 @@ $db_prefix = '';
  * The URL to your Drupal installation.
  *
  * Examples:
+ *   $base_url = 'http://example.com';
  *   $base_url = 'http://www.example.com';
  *   $base_url = 'http://www.example.com:8888';
  *   $base_url = 'http://www.example.com/drupal';
  *   $base_url = 'https://www.example.com:8888/drupal';
  *
+ * Beware: if your site is usually accessible both with and without the prefix www.
+ * you might one to force users to use only one of the possibilities by
+ * adapting the relevant settings in .htaccess.
+ *
  * It is not allowed to have a trailing slash; Drupal will add it
  * for you.
  */