diff options
author | Thomas Citharel <tcit@tcit.fr> | 2016-04-03 22:11:17 +0200 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2016-04-03 22:11:17 +0200 |
commit | a119acd15d6cf1c4b216435bcad47b8604e15dad (patch) | |
tree | 7579c3f4a00d0f3d0929358fb56e99ba4f12b142 /docs | |
parent | 7d997fd9f675b07e667e92b76e09b520f9760208 (diff) | |
parent | 163517da79d027458d5cadaa736962f4b4df8ab2 (diff) | |
download | wallabag-a119acd15d6cf1c4b216435bcad47b8604e15dad.tar.gz wallabag-a119acd15d6cf1c4b216435bcad47b8604e15dad.tar.zst wallabag-a119acd15d6cf1c4b216435bcad47b8604e15dad.zip |
Merge pull request #1835 from wallabag/v2-prepare-v22.0.0
:rocket: Prepare v2.0.0 :birthday:
Diffstat (limited to 'docs')
-rw-r--r-- | docs/en/user/installation.rst | 12 | ||||
-rw-r--r-- | docs/fr/user/installation.rst | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 11ad54fd..bc35a02b 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst | |||
@@ -4,9 +4,9 @@ Install wallabag | |||
4 | Requirements | 4 | Requirements |
5 | ------------ | 5 | ------------ |
6 | 6 | ||
7 | wallabag is compatible with php >= 5.5, including php 7. | 7 | wallabag is compatible with PHP >= 5.5, including PHP 7. |
8 | 8 | ||
9 | You'll need the following extensions for wallabag to work. Some of these may already activated in your version of php, so you may not have to install all corresponding packages. | 9 | You'll need the following extensions for wallabag to work. Some of these may already activated in your version of PHP, so you may not have to install all corresponding packages. |
10 | 10 | ||
11 | - php-session | 11 | - php-session |
12 | - php-ctype | 12 | - php-ctype |
@@ -25,9 +25,9 @@ You'll need the following extensions for wallabag to work. Some of these may alr | |||
25 | 25 | ||
26 | wallabag uses PDO to connect to database, so you'll need one of: | 26 | wallabag uses PDO to connect to database, so you'll need one of: |
27 | 27 | ||
28 | - php-pdo_mysql | 28 | - pdo_mysql |
29 | - php-pdo_sqlite | 29 | - pdo_sqlite |
30 | - php-pdo_pgsql | 30 | - pdo_pgsql |
31 | 31 | ||
32 | and it's corresponding database server. | 32 | and it's corresponding database server. |
33 | 33 | ||
@@ -50,7 +50,7 @@ To install wallabag itself, you must run these two commands: | |||
50 | 50 | ||
51 | git clone https://github.com/wallabag/wallabag.git | 51 | git clone https://github.com/wallabag/wallabag.git |
52 | cd wallabag | 52 | cd wallabag |
53 | git checkout 2.0.0-beta.2 | 53 | git checkout 2.0.0 |
54 | SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist | 54 | SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist |
55 | php bin/console wallabag:install --env=prod | 55 | php bin/console wallabag:install --env=prod |
56 | 56 | ||
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index c145fbc7..489304d6 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst | |||
@@ -4,9 +4,9 @@ Installer wallabag | |||
4 | Pré-requis | 4 | Pré-requis |
5 | ------------ | 5 | ------------ |
6 | 6 | ||
7 | wallabag est compatible avec php >= 5.5, php 7 inclus. | 7 | wallabag est compatible avec PHP >= 5.5, PHP 7 inclus. |
8 | 8 | ||
9 | Vous aurez besoin des extensions suivantes pour que wallabag fonctionne. Il est possible que certaines de ces extensions soient déjà activées dans votre version de php, donc vous n'avez pas forcément besoin d'installer tous les paquets correspondants. | 9 | Vous aurez besoin des extensions suivantes pour que wallabag fonctionne. Il est possible que certaines de ces extensions soient déjà activées dans votre version de PHP, donc vous n'avez pas forcément besoin d'installer tous les paquets correspondants. |
10 | 10 | ||
11 | - php-session | 11 | - php-session |
12 | - php-ctype | 12 | - php-ctype |
@@ -25,9 +25,9 @@ Vous aurez besoin des extensions suivantes pour que wallabag fonctionne. Il est | |||
25 | 25 | ||
26 | wallabag utilise PDO afin de se connecter à une base de données, donc vous aurez besoin d'une extension et d'un système de bases de données parmi : | 26 | wallabag utilise PDO afin de se connecter à une base de données, donc vous aurez besoin d'une extension et d'un système de bases de données parmi : |
27 | 27 | ||
28 | - php-pdo_mysql | 28 | - pdo_mysql |
29 | - php-pdo_sqlite | 29 | - pdo_sqlite |
30 | - php-pdo_pgsql | 30 | - pdo_pgsql |
31 | 31 | ||
32 | Installation | 32 | Installation |
33 | ------------ | 33 | ------------ |
@@ -48,7 +48,7 @@ Pour installer wallabag, vous devez exécuter ces deux commandes : | |||
48 | 48 | ||
49 | git clone https://github.com/wallabag/wallabag.git | 49 | git clone https://github.com/wallabag/wallabag.git |
50 | cd wallabag | 50 | cd wallabag |
51 | git checkout 2.0.0-beta.2 | 51 | git checkout 2.0.0 |
52 | SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist | 52 | SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist |
53 | php bin/console wallabag:install --env=prod | 53 | php bin/console wallabag:install --env=prod |
54 | 54 | ||