From 735cbc4cff979658a5e6ae8da37d577a912dc1ec Mon Sep 17 00:00:00 2001
From: webchick <webchick@24967.no-reply.drupal.org>
Date: Tue, 27 Sep 2011 12:11:03 -0700
Subject: [PATCH] Issue #1040810 by Tor Arne Thune, jhodgdon: Fixed UPGRADE.txt
describes erroneous step and should mention release notes.
---
UPGRADE.txt | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/UPGRADE.txt b/UPGRADE.txt
index d4909d8effa6..c6fee9874c83 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -1,4 +1,3 @@
-
INTRODUCTION
------------
This document describes how to:
@@ -25,6 +24,11 @@ First steps and definitions:
applying it to your live site. Even minor updates can cause your site's
behavior to change.
+ * Each new release of Drupal has release notes, which explain the changes made
+ since the previous version and any special instructions needed to update or
+ upgrade to the new version. You can find a link to the release notes for the
+ version you are upgrading or updating to on the Drupal project page
+ (http://drupal.org/project/drupal).
UPGRADE PROBLEMS
----------------
@@ -40,7 +44,6 @@ If you encounter errors during this process,
More in-depth information on upgrading can be found at http://drupal.org/upgrade
-
MINOR VERSION UPDATES
---------------------
To update from one minor 7.x version of Drupal to any later 7.x version, after
@@ -58,11 +61,18 @@ following the instructions in the INTRODUCTION section at the top of this file:
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 notes). 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
@@ -110,7 +120,6 @@ following the instructions in the INTRODUCTION section at the top of this file:
Disable the "Put site into maintenance mode" checkbox and save the
configuration.
-
MAJOR VERSION UPGRADE
---------------------
To upgrade from a previous major version of Drupal to Drupal 7.x, after
@@ -221,4 +230,3 @@ following the instructions in the INTRODUCTION section at the top of this file:
To get started with Drupal 7 administration, visit
http://drupal.org/getting-started/7/admin
-
--
GitLab