diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-19 15:30:49 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-19 15:30:49 +0100 |
| commit | 68003139e133835805b143b62c4407f19b495dab (patch) | |
| tree | 9a71a15d021330fb6d55cc338f125161ddfc61dd /docs/en/user/upgrade-2.1.x-2.1.y.rst | |
| parent | bbd4ae7b56d9db744482a5630abad350f2d819af (diff) | |
| parent | cb1a6590c0e58c56d0612066501b3a586b103ed5 (diff) | |
| download | wallabag-68003139e133835805b143b62c4407f19b495dab.tar.gz wallabag-68003139e133835805b143b62c4407f19b495dab.tar.zst wallabag-68003139e133835805b143b62c4407f19b495dab.zip | |
Merge remote-tracking branch 'origin/master' into 2.2
# Conflicts:
# .editorconfig
# docs/de/index.rst
# docs/de/user/import.rst
# docs/en/index.rst
# docs/en/user/configuration.rst
# docs/en/user/import.rst
# docs/fr/index.rst
# docs/fr/user/import.rst
# src/Wallabag/CoreBundle/Command/InstallCommand.php
# src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
# src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
# web/bundles/wallabagcore/themes/baggy/css/style.min.css
# web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
# web/bundles/wallabagcore/themes/material/css/style.min.css
# web/bundles/wallabagcore/themes/material/js/material.min.js
Diffstat (limited to 'docs/en/user/upgrade-2.1.x-2.1.y.rst')
| -rw-r--r-- | docs/en/user/upgrade-2.1.x-2.1.y.rst | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/docs/en/user/upgrade-2.1.x-2.1.y.rst b/docs/en/user/upgrade-2.1.x-2.1.y.rst deleted file mode 100644 index 62cb7dc0..00000000 --- a/docs/en/user/upgrade-2.1.x-2.1.y.rst +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | Upgrading from 2.1.x to 2.1.y | ||
| 2 | ============================= | ||
| 3 | |||
| 4 | Upgrade on a dedicated web server | ||
| 5 | --------------------------------- | ||
| 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.1.2`` by the last release number): | ||
| 8 | |||
| 9 | :: | ||
| 10 | |||
| 11 | rm -rf var/cache/* | ||
| 12 | git fetch origin | ||
| 13 | git fetch --tags | ||
| 14 | git checkout 2.1.2 --force | ||
| 15 | SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist | ||
| 16 | php bin/console cache:clear --env=prod | ||
| 17 | |||
| 18 | Upgrade on a shared hosting | ||
| 19 | --------------------------- | ||
| 20 | |||
| 21 | Backup your ``app/config/parameters.yml`` file. | ||
| 22 | |||
| 23 | Download the last release of wallabag: | ||
| 24 | |||
| 25 | .. code-block:: bash | ||
| 26 | |||
| 27 | wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package | ||
| 28 | |||
| 29 | You will find the `md5 hash of the latest package on our website <https://www.wallabag.org/pages/download-wallabag.html>`_. | ||
| 30 | |||
| 31 | Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. | ||
| 32 | |||
| 33 | If you use SQLite, you must also copy your ``data/`` folder inside the new installation. | ||
| 34 | |||
| 35 | Empty ``var/cache`` folder. | ||