diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-19 11:23:07 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-09-19 11:23:07 +0200 |
commit | d7b4b2c72cd1c9ad967ecfec668d5b0b9e794149 (patch) | |
tree | d20f88d9e9157bf9721c77913096dcd6875231b5 /docs/en | |
parent | da18a4682f124b02278860d23ac1d59dee995277 (diff) | |
parent | f9feca5c64309a2a202258bb92ae24b7a1dbe31c (diff) | |
download | wallabag-d7b4b2c72cd1c9ad967ecfec668d5b0b9e794149.tar.gz wallabag-d7b4b2c72cd1c9ad967ecfec668d5b0b9e794149.tar.zst wallabag-d7b4b2c72cd1c9ad967ecfec668d5b0b9e794149.zip |
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to 'docs/en')
-rw-r--r-- | docs/en/user/installation.rst | 4 | ||||
-rw-r--r-- | docs/en/user/upgrade.rst | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 95df263a..763d7c66 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst | |||
@@ -53,7 +53,7 @@ To install wallabag itself, you must run the following commands: | |||
53 | 53 | ||
54 | git clone https://github.com/wallabag/wallabag.git | 54 | git clone https://github.com/wallabag/wallabag.git |
55 | cd wallabag | 55 | cd wallabag |
56 | git checkout 2.0.7 | 56 | git checkout 2.0.8 |
57 | SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist | 57 | SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist |
58 | php bin/console wallabag:install --env=prod | 58 | php bin/console wallabag:install --env=prod |
59 | 59 | ||
@@ -85,6 +85,8 @@ Execute this command to download and extract the latest package: | |||
85 | 85 | ||
86 | wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package | 86 | wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package |
87 | 87 | ||
88 | (md5 hash of the package: ``4f84c725d1d6e3345eae0a406115e5ff``) | ||
89 | |||
88 | Now, read the following documentation to create your virtual host, then access your wallabag. | 90 | Now, read the following documentation to create your virtual host, then access your wallabag. |
89 | If you changed the database configuration to use MySQL or PostgreSQL, you need to create a user via this command ``php bin/console wallabag:install --env=prod``. | 91 | If you changed the database configuration to use MySQL or PostgreSQL, you need to create a user via this command ``php bin/console wallabag:install --env=prod``. |
90 | 92 | ||
diff --git a/docs/en/user/upgrade.rst b/docs/en/user/upgrade.rst index 7782dc8a..90ed6c70 100644 --- a/docs/en/user/upgrade.rst +++ b/docs/en/user/upgrade.rst | |||
@@ -4,27 +4,29 @@ Upgrade wallabag | |||
4 | Upgrade on a dedicated web server | 4 | Upgrade on a dedicated web server |
5 | --------------------------------- | 5 | --------------------------------- |
6 | 6 | ||
7 | 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.0.3`` by the last release number): | 7 | 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.0.8`` by the last release number): |
8 | 8 | ||
9 | :: | 9 | :: |
10 | 10 | ||
11 | git fetch origin | 11 | git fetch origin |
12 | git fetch --tags | 12 | git fetch --tags |
13 | git checkout 2.0.3 | 13 | git checkout 2.0.8 |
14 | SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist | 14 | SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist |
15 | php bin/console cache:clear --env=prod | 15 | php bin/console cache:clear --env=prod |
16 | 16 | ||
17 | Upgrade on a shared hosting | 17 | Upgrade on a shared hosting |
18 | --------------------------- | 18 | --------------------------- |
19 | 19 | ||
20 | Backup your ``app/config/parameters.yml`` file. | 20 | Backup your ``app/config/parameters.yml`` file. |
21 | 21 | ||
22 | Download the last release of wallabag: | 22 | Download the last release of wallabag: |
23 | 23 | ||
24 | .. code-block:: bash | 24 | .. code-block:: bash |
25 | 25 | ||
26 | wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package | 26 | wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package |
27 | 27 | ||
28 | (md5 hash of the package: ``4f84c725d1d6e3345eae0a406115e5ff``) | ||
29 | |||
28 | Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. | 30 | Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. |
29 | 31 | ||
30 | If you use SQLite, you must also copy your ``data/`` folder inside the new installation. | 32 | If you use SQLite, you must also copy your ``data/`` folder inside the new installation. |