Merge branch 'master' of github.com:brettp/Elgg

1 files changed, 62 insertions, 12 deletions

diff --git a/UPGRADE.txt b/UPGRADE.txt
index 032d285e9..0f1cd2ba3 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -1,19 +1,69 @@
+Elgg Upgrade Instructions
+=========================
 
-ELGG UPGRADE INSTRUCTIONS
+Note: Upgrades are one way--You cannot downgrade once you run the upgrade 
+      script. Always back up your database, code, and data directory
+      before upgrading!
 
-1. Backup your Elgg database and code
 
-2. Download the new version of Elgg from elgg.org.
+Upgrading from Elgg 1.7 to 1.8.
+----------------------------------------------------
 
-3. Overwrite your existing Elgg files. Any modifications should
-   have been written within plugins, so that they are not lost
-   on overwriting. If this is not the case, take care to
-   maintain your modifications, although Elgg is not guaranteed
-   to work correctly in this instance. 
+1. Back up your Elgg database, code, and data directory.
 
-4. Visit http://your-elgg-site-URL/upgrade.php
+2. Download the latest version of Elgg from http://elgg.org/.
 
-5. Copy htaccess_dist to .htaccess, replacing your existing version.
-   Any modifications to the original .htaccess should be moved to the
-   new .htaccess file.
+3. Identify and save any changes to core files. Pay special attention to
+   the views and actions directories. You will need to put these changes
+   in plugins once you have installed Elgg 1.8.
 
+3. Delete the following directories in the Elgg root on your server:
+	* _css
+	* account
+	* actions
+	* admin
+	* dashboard
+	* entities
+	* friends
+	* search
+	* settings
+	* simplecache
+    * views
+
+4. Delete the following core plugins from the Elgg mod directory. These
+   plugins are deprecated and no longer supported by Elgg's core developers.
+   If you modified these plugins, you will need to upgrade the plugin to work
+   in Elgg 1.8.
+	* captcha
+	* crontrigger
+	* default_widgets
+	* friends
+	* riverdashboard
+	* twitter_service
+
+5. Upload and overwrite your existing Elgg files with the Elgg 1.8 files.
+
+6. Copy htaccess_dist to .htaccess, replacing your existing version. Any
+   modifications to the original .htaccess should be moved to the new
+   .htaccess file.
+
+7. Visit http://your-elgg-site/upgrade.php
+
+
+Upgrading to the latest release
+-----------------------------------------
+
+1. Back up your Elgg database, code, and data directory.
+
+2. Download the latest version of Elgg from http://elgg.org/.
+
+3. Upload and overwrite your existing Elgg files. Any modifications should
+   have been written within plugins so that they are not lost. If this is
+   not the case, take care to maintain your modifications. If you have
+   modified core files, Elgg may not work correctly.
+
+4. Copy htaccess_dist to .htaccess, replacing your existing version. Any 
+   modifications to the original .htaccess should be moved to the new
+   .htaccess file.
+
+5. Visit http://your-elgg-site/upgrade.php