X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=doc%2FUpdate.md;h=c4fe16186380c011d539b895e51baed3d93a2422;hb=56a77f5275ba8566a37d690ade0e929c88b828e2;hp=7b7ccf7bbd82a7d4375e134c13169951205cdc62;hpb=4375edd63e44b71913bd45bf25a4a554582b581e;p=friendica.git

diff --git a/doc/Update.md b/doc/Update.md
index 7b7ccf7bbd..c4fe161863 100644
--- a/doc/Update.md
+++ b/doc/Update.md
@@ -6,8 +6,15 @@ Updating Friendica
 ## Using a Friendica archive
 
 If you installed Friendica in the ``path/to/friendica`` folder:
+
 1. Unpack the new Friendica archive in ``path/to/friendica_new``.
-2. Copy ``config/local.config.php``, ``photo/`` and ``proxy/`` from ``path/to/friendica`` to ``path/to/friendica_new``.
+2. Copy  the following items from ``path/to/friendica`` to ``path/to/friendica_new``:
+   * ``config/local.config.php``
+   * ``proxy/``   
+The following items only need to be copied if they are located inside your friendica path:
+   * your storage folder as set in **Admin -> Site -> File Upload -> Storage base path** 
+   * your item cache as set in **Admin -> Site -> Performance -> Path to item cache**
+   * your temp folder as set in **Admin -> Site -> Advanced -> Temp path**
 3. Rename the ``path/to/friendica`` folder to ``path/to/friendica_old``.
 4. Rename the ``path/to/friendica_new`` folder to ``path/to/friendica``.
 5. Check your site. Note: it may go into maintenance mode to update the database schema.
@@ -29,11 +36,11 @@ The addon tree has to be updated separately like so:
     git pull
 
 For both repositories:
-The default branch to use is the ``master`` branch, which is the stable version of Friendica.
+The default branch to use is the ``stable`` branch, which is the stable version of Friendica.
 It is updated about four times a year on a fixed schedule.
 
 If you want to use and test bleeding edge code please checkout the ``develop`` branch.
-The new features and fixes will be merged from ``develop`` into ``master`` after a release candidate period before each release.
+The new features and fixes will be merged from ``develop`` into ``stable`` after a release candidate period before each release.
 
 Warning: The ``develop`` branch is unstable, and breaks on average once a month for at most 24 hours until a patch is submitted and merged.
 Be sure to pull frequently if you choose the ``develop`` branch.