Merge pull request #8302 from annando/allowed-chars

[friendica.git] / doc / Update.md

diff --git a/doc/Update.md b/doc/Update.md
index a1b62748c276dc7c7e3cc639b546af96319d072c..1fca48ac1b5f95bd962571f8ac21323069a6ac3f 100644 (file)
--- a/doc/Update.md
+++ b/doc/Update.md
@@ -6,8 +6,9 @@ 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 ``.htconfig.php``, ``photo/`` and ``proxy/`` from ``path/to/friendica`` to ``path/to/friendica_new``.
+2. Copy ``config/local.config.php``, ``photo/`` and ``proxy/`` from ``path/to/friendica`` to ``path/to/friendica_new``.
 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.
@@ -21,12 +22,12 @@ You can get the latest changes at any time with
 
     cd path/to/friendica
     git pull
-    util/composer.phar install
+    bin/composer.phar install --no-dev
 
 The addon tree has to be updated separately like so:
 
-    git -C addon pull
-       util/composer.phar install -d addon
+    cd path/to/friendica/addon
+    git pull
 
 For both repositories:
 The default branch to use is the ``master`` branch, which is the stable version of Friendica.
@@ -69,4 +70,4 @@ DROP TABLE <table_name>;
 RENAME TABLE <table_name>_new TO <table_name>;
 ```
 
-This method is slower overall, but it is better suited for large numbers of duplicates.
\ No newline at end of file
+This method is slower overall, but it is better suited for large numbers of duplicates.