diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-07-20 12:02:02 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-07-20 12:02:02 +0200 |
| commit | 0faeabefa7faedb3a6a3675a5e49e947554adae9 (patch) | |
| tree | e51ae7db64408b159b2dfa13bfa9e01530223dc9 /docs | |
| parent | 2bb138ef6df2d1a608b42907185b274fb87f4513 (diff) | |
| parent | 317fc6e684356b645ea1327c2631c7d5fc193ddd (diff) | |
| download | wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.tar.gz wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.tar.zst wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.zip | |
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/en/user/installation.rst | 2 | ||||
| -rw-r--r-- | docs/fr/user/installation.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 58d9fb7e..bd3095e0 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst | |||
| @@ -37,7 +37,7 @@ Installation | |||
| 37 | On a dedicated web server (recommended way) | 37 | On a dedicated web server (recommended way) |
| 38 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 38 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 39 | 39 | ||
| 40 | wallabag uses a large number of libraries in order to function. These libraries must be installed with a tool called Composer. You need to install it if you have not already done so. | 40 | wallabag uses a large number of libraries in order to function. These libraries must be installed with a tool called Composer. You need to install it if you have not already done so and be sure to use the 1.2 version (if you already have Composer, run a ``composer selfupdate``). |
| 41 | 41 | ||
| 42 | Install Composer: | 42 | Install Composer: |
| 43 | 43 | ||
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index b1136c12..0693fc5d 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst | |||
| @@ -35,7 +35,7 @@ Installation | |||
| 35 | Sur un serveur dédié (méthode conseillée) | 35 | Sur un serveur dédié (méthode conseillée) |
| 36 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 36 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 37 | 37 | ||
| 38 | wallabag utilise un grand nombre de bibliothèques pour fonctionner. Ces bibliothèques doivent être installées à l'aide d'un outil nommé Composer. Vous devez l'installer si ce n'est déjà fait. | 38 | wallabag utilise un grand nombre de bibliothèques pour fonctionner. Ces bibliothèques doivent être installées à l'aide d'un outil nommé Composer. Vous devez l'installer si ce n'est déjà fait et vous assurer que vous utilisez bien la version 1.2 (si vous avez déjà Composer, faite un ``composer selfupdate``). |
| 39 | 39 | ||
| 40 | Installation de Composer : | 40 | Installation de Composer : |
| 41 | 41 | ||