? 1040810-UPGRADE-minor-version-updates-step-4.patch
Index: UPGRADE.txt
===================================================================
RCS file: /cvs/drupal/drupal/UPGRADE.txt,v
retrieving revision 1.27
diff -u -p -r1.27 UPGRADE.txt
--- UPGRADE.txt	27 Oct 2010 18:32:54 -0000	1.27
+++ UPGRADE.txt	28 Jan 2011 16:29:21 -0000
@@ -59,11 +59,18 @@ following the instructions in the INTROD
    If you made modifications to files like .htaccess or robots.txt, you will
    need to re-apply them from your backup, after the new files are in place.
 
-   Sometimes an update includes changes to settings.php (this will be noted in
-   the release announcement). If that's the case, replace your old settings.php
-   with the new one, and copy the site-specific entries (especially the lines
-   giving the database name, user, and password) from the old settings.php to
-   the new settings.php.
+   Sometimes an update includes changes to default.settings.php (this will be
+   noted in the release announcement). If that's the case, follow these steps:
+
+   - Make a backup copy of your settings.php file, with a different file name.
+
+   - Make a copy of the new default.settings.php file, and name the copy
+     settings.php (overwriting your previous settings.php file).
+
+   - Copy the custom and site-specific entries from the backup you made into the
+     new settings.php file. You will definitely need the lines giving the
+     database information, and you will also want to copy in any other
+     customizations you have added.
 
 4. Download the latest Drupal 7.x release from http://drupal.org to a
    directory outside of your web root. Extract the archive and copy the files