diff options
Diffstat (limited to 'docs/en/user')
-rw-r--r-- | docs/en/user/installation.rst | 9 | ||||
-rw-r--r-- | docs/en/user/upgrade.rst | 7 |
2 files changed, 4 insertions, 12 deletions
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 3794c757..8e9f71d4 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst | |||
@@ -47,20 +47,13 @@ Install Composer: | |||
47 | 47 | ||
48 | You can find specific instructions `here <https://getcomposer.org/doc/00-intro.md>`__. | 48 | You can find specific instructions `here <https://getcomposer.org/doc/00-intro.md>`__. |
49 | 49 | ||
50 | You also need to install node.js (via `the Download page <https://nodejs.org/en/download/>`__), npm (already install with node.js), bower and grunt: | ||
51 | |||
52 | :: | ||
53 | |||
54 | npm install -g bower | ||
55 | npm install -g grunt-cli | ||
56 | |||
57 | To install wallabag itself, you must run the following commands: | 50 | To install wallabag itself, you must run the following commands: |
58 | 51 | ||
59 | :: | 52 | :: |
60 | 53 | ||
61 | git clone https://github.com/wallabag/wallabag.git | 54 | git clone https://github.com/wallabag/wallabag.git |
62 | cd wallabag | 55 | cd wallabag |
63 | git checkout 2.1 | 56 | git checkout 2.1.0 |
64 | ./install.sh | 57 | ./install.sh |
65 | 58 | ||
66 | To start PHP's build-in server and test if everything did install correctly, you can do: | 59 | To start PHP's build-in server and test if everything did install correctly, you can do: |
diff --git a/docs/en/user/upgrade.rst b/docs/en/user/upgrade.rst index 90ed6c70..5c37be95 100644 --- a/docs/en/user/upgrade.rst +++ b/docs/en/user/upgrade.rst | |||
@@ -4,15 +4,14 @@ 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.8`` 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.1.0`` 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.8 | 13 | git checkout 2.1.0 |
14 | SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist | 14 | ./install.sh |
15 | php bin/console cache:clear --env=prod | ||
16 | 15 | ||
17 | Upgrade on a shared hosting | 16 | Upgrade on a shared hosting |
18 | --------------------------- | 17 | --------------------------- |