diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-10-04 17:13:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-04 17:13:57 +0200 |
commit | c36f5adce2dcf30affe972fe8752e98aeb8d57a1 (patch) | |
tree | aef901bd588446bcacba5e67f5323cba963ae59c /docs/en/user | |
parent | 57386125abc5c50c1438cf7e78d01f06021adc0a (diff) | |
parent | 933c6f3155b7ea940e493e7a6103eb20f8f933d3 (diff) | |
download | wallabag-c36f5adce2dcf30affe972fe8752e98aeb8d57a1.tar.gz wallabag-c36f5adce2dcf30affe972fe8752e98aeb8d57a1.tar.zst wallabag-c36f5adce2dcf30affe972fe8752e98aeb8d57a1.zip |
Merge pull request #2349 from wallabag/prepare-211
Prepare wallabag 2.1.1
Diffstat (limited to 'docs/en/user')
-rw-r--r-- | docs/en/user/installation.rst | 2 | ||||
-rw-r--r-- | docs/en/user/upgrade-2.0.x-2.1.y.rst | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 833a36a6..bab8f0a5 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst | |||
@@ -54,7 +54,7 @@ To install wallabag itself, you must run the following commands: | |||
54 | 54 | ||
55 | git clone https://github.com/wallabag/wallabag.git | 55 | git clone https://github.com/wallabag/wallabag.git |
56 | cd wallabag | 56 | cd wallabag |
57 | git checkout 2.1.0 | 57 | git checkout 2.1.1 --force |
58 | SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist | 58 | SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist |
59 | php bin/console wallabag:install --env=prod | 59 | php bin/console wallabag:install --env=prod |
60 | 60 | ||
diff --git a/docs/en/user/upgrade-2.0.x-2.1.y.rst b/docs/en/user/upgrade-2.0.x-2.1.y.rst index ce5b5441..649ab6ca 100644 --- a/docs/en/user/upgrade-2.0.x-2.1.y.rst +++ b/docs/en/user/upgrade-2.0.x-2.1.y.rst | |||
@@ -7,14 +7,14 @@ Before this migration, if you configured the Pocket import by adding your consum | |||
7 | Upgrade on a dedicated web server | 7 | Upgrade on a dedicated web server |
8 | --------------------------------- | 8 | --------------------------------- |
9 | 9 | ||
10 | The last release is published on https://www.wallabag.org/pages/download-wallabag.html. In order to upgrade your wallabag installation and get the last version, run the following commands in you wallabag folder (replace ``2.1.0`` by the last release number): | 10 | The last release is published on https://www.wallabag.org/pages/download-wallabag.html. In order to upgrade your wallabag installation and get the last version, run the following commands in you wallabag folder (replace ``2.1.1`` by the last release number): |
11 | 11 | ||
12 | :: | 12 | :: |
13 | 13 | ||
14 | rm -rf var/cache/* | 14 | rm -rf var/cache/* |
15 | git fetch origin | 15 | git fetch origin |
16 | git fetch --tags | 16 | git fetch --tags |
17 | git checkout 2.1.0 | 17 | git checkout 2.1.1 --force |
18 | SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist | 18 | SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist |
19 | php bin/console doctrine:migrations:migrate --env=prod | 19 | php bin/console doctrine:migrations:migrate --env=prod |
20 | php bin/console cache:clear --env=prod | 20 | php bin/console cache:clear --env=prod |