X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=doc%2FUpdate.md;h=c4fe16186380c011d539b895e51baed3d93a2422;hb=d0d4245dc020a3c8076dad6cc435017caeb231ad;hp=1fca48ac1b5f95bd962571f8ac21323069a6ac3f;hpb=7ce48d1b77e9a691b1f77ec01690175f6b27bda9;p=friendica.git

diff --git a/doc/Update.md b/doc/Update.md
index 1fca48ac1b..c4fe161863 100644
--- a/doc/Update.md
+++ b/doc/Update.md
@@ -8,7 +8,13 @@ Updating Friendica
 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.
@@ -30,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.