? sitesdefaultfiles2.patch
? sitesdefaultfiles3.patch
? files/.htaccess
? sites/default/settings.php
Index: INSTALL.txt
===================================================================
RCS file: /cvs/drupal/drupal/INSTALL.txt,v
retrieving revision 1.50
diff -u -p -r1.50 INSTALL.txt
--- INSTALL.txt	24 Nov 2007 20:35:36 -0000	1.50
+++ INSTALL.txt	17 Dec 2007 22:27:44 -0000
@@ -72,16 +72,14 @@ INSTALLATION
 
      chmod o+w sites/default
 
-3. CREATE AND GRANT WRITE PERMISSIONS TO FILES DIRECTORY
+3. GRANT WRITE PERMISSIONS TO FILES DIRECTORY
 
    Drupal requires the files directory be present and writable during
    the installation (the location of the files directory can be changed
-   after Drupal is installed). Use the following commands (from the
-   installation directory) to create this directory and grant the
-   web server write privileges to it:
+   after Drupal is installed). Use the following command (from the
+   installation directory) to grant the web server write privileges to it:
 
-     mkdir files
-     chmod o+w files
+     chmod o+w sites/default/files
 
 4. CREATE THE DRUPAL DATABASE
 
@@ -137,16 +135,11 @@ INSTALLATION
 
      * your site runs multiple Drupal installations from a single codebase
        (modify the file system path of each installation to a different
-       directory so that uploads do not overlap between installations);
+       directory so that uploads do not overlap between installations); or,
 
      * your site runs a number of web server front-ends behind a load
        balancer or reverse proxy (modify the file system path on each
-       server to point to a shared file repository); or,
-
-     * your site policies specify that all site-related files are stored
-       under the sites directory in order to simplify backup and restore
-       operations (modify the file system path to point to a newly-created
-       directory underneath sites).
+       server to point to a shared file repository).
 
    To modify the file system path:
 
Index: includes/file.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/file.inc,v
retrieving revision 1.113
diff -u -p -r1.113 file.inc
--- includes/file.inc	3 Dec 2007 09:02:37 -0000	1.113
+++ includes/file.inc	17 Dec 2007 22:27:44 -0000
@@ -959,7 +959,7 @@ function file_directory_temp() {
  * @return A string containing the path to Drupal's 'files' directory.
  */
 function file_directory_path() {
-  return variable_get('file_directory_path', 'files');
+  return variable_get('file_directory_path', 'sites/default/files');
 }
 
 /**