aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2016-09-28 11:13:20 +0200
committerNicolas Lœuillet <nicolas@loeuillet.org>2016-09-28 11:13:20 +0200
commiteef8aeec8fa56519363e90977900f198ff3bd19b (patch)
treeb3d3f82dfdde7c38dbbc0831c5c5bff1b6535c11
parent084fb0d303efc6edd0bfbf43d96b6cbe48acb2b8 (diff)
downloadwallabag-eef8aeec8fa56519363e90977900f198ff3bd19b.tar.gz
wallabag-eef8aeec8fa56519363e90977900f198ff3bd19b.tar.zst
wallabag-eef8aeec8fa56519363e90977900f198ff3bd19b.zip
Reordered upgrade documentation
-rw-r--r--docs/de/index.rst3
-rw-r--r--docs/de/user/upgrade-2.0.x-2.0.y.rst (renamed from docs/de/user/upgrade.rst)7
-rw-r--r--docs/de/user/upgrade-2.0.x-2.1.0.rst50
-rw-r--r--docs/en/index.rst3
-rw-r--r--docs/en/user/upgrade-2.0.x-2.0.y.rst (renamed from docs/en/user/upgrade.rst)13
-rw-r--r--docs/en/user/upgrade-2.0.x-2.1.0.rst50
-rw-r--r--docs/fr/index.rst3
-rw-r--r--docs/fr/user/upgrade-2.0.x-2.0.y.rst (renamed from docs/fr/user/upgrade.rst)13
-rw-r--r--docs/fr/user/upgrade-2.0.x-2.1.0.rst51
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml1
10 files changed, 172 insertions, 22 deletions
diff --git a/docs/de/index.rst b/docs/de/index.rst
index d8cd8f39..62f8b54a 100644
--- a/docs/de/index.rst
+++ b/docs/de/index.rst
@@ -30,7 +30,8 @@ Die Dokumentation ist in anderen Sprachen verfügbar :
30 30
31 user/faq 31 user/faq
32 user/installation 32 user/installation
33 user/upgrade 33 user/upgrade-2.0.x-2.1.0
34 user/upgrade-2.0.x-2.0.y
34 user/migration 35 user/migration
35 user/import 36 user/import
36 user/create_account 37 user/create_account
diff --git a/docs/de/user/upgrade.rst b/docs/de/user/upgrade-2.0.x-2.0.y.rst
index 084dab74..c04b68f3 100644
--- a/docs/de/user/upgrade.rst
+++ b/docs/de/user/upgrade-2.0.x-2.0.y.rst
@@ -4,15 +4,14 @@ Wallabag updaten
4Update auf einem dedizierten Webserver 4Update auf einem dedizierten Webserver
5-------------------------------------- 5--------------------------------------
6 6
7Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.html veröffentlicht. Um deine wallabag Installation auf die neueste Version upzudaten, führe die folgenden Kommandos in deinem wallabag Ordner aus (ersetze ``2.1.0`` mit der neuesten Releasenummer): 7Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.html veröffentlicht. Um deine wallabag Installation auf die neueste Version upzudaten, führe die folgenden Kommandos in deinem wallabag Ordner aus (ersetze ``2.0.8`` mit der neuesten Releasenummer):
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.1.0 13 git checkout 2.0.8
14 ASSETS=build ./install.sh 14 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
15 php bin/console doctrine:migrations:migrate --env=prod
16 php bin/console cache:clear --env=prod 15 php bin/console cache:clear --env=prod
17 16
18Update auf einem Shared Webhosting 17Update auf einem Shared Webhosting
diff --git a/docs/de/user/upgrade-2.0.x-2.1.0.rst b/docs/de/user/upgrade-2.0.x-2.1.0.rst
new file mode 100644
index 00000000..eb67e686
--- /dev/null
+++ b/docs/de/user/upgrade-2.0.x-2.1.0.rst
@@ -0,0 +1,50 @@
1Wallabag updaten
2================
3
4.. warning::
5Before this migration, if you configured the Pocket import by adding your consumer key in Internal settings, please do a backup of it: you'll have to add it into the Config page after the upgrade.
6
7Update auf einem dedizierten Webserver
8--------------------------------------
9
10Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.html veröffentlicht. Um deine wallabag Installation auf die neueste Version upzudaten, führe die folgenden Kommandos in deinem wallabag Ordner aus (ersetze ``2.1.0`` mit der neuesten Releasenummer):
11
12::
13
14 git fetch origin
15 git fetch --tags
16 git checkout 2.1.0
17 ASSETS=build ./install.sh
18 php bin/console doctrine:migrations:migrate --env=prod
19 php bin/console cache:clear --env=prod
20
21Update auf einem Shared Webhosting
22----------------------------------
23
24Sichere deine ``app/config/parameters.yml`` Datei.
25
26Lade das neueste Release von wallabag herunter:
27
28.. code-block:: bash
29
30 wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
31
32(md5 hash: ``4f84c725d1d6e3345eae0a406115e5ff``)
33
34Entpacke das Archiv in deinen wallabag Ordner und ersetze ``app/config/parameters.yml`` mit deiner Datei.
35
36Wenn du SQLite nutzt, musst auch das ``data/`` Verzeichnis in die neue Installation kopieren.
37
38Leere den ``var/cache`` Ordner.
39
40Sie müssen einige SQL-Abfragen ausführen, um Ihre Datenbank zu aktualisieren. We assume that the table prefix is ``wallabag_`` and the database server is a MySQL one:
41
42.. code-block:: sql
43
44 ALTER TABLE `wallabag_entry` ADD `uuid` LONGTEXT DEFAULT NULL;
45 INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('share_public', '1', 'entry');
46 ALTER TABLE `wallabag_oauth2_clients` ADD name longtext COLLATE 'utf8_unicode_ci' DEFAULT NULL;
47 INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_redis', '0', 'import');
48 INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_rabbitmq', '0', 'import');
49 ALTER TABLE `wallabag_config` ADD `pocket_consumer_key` VARCHAR(255) DEFAULT NULL;
50 DELETE FROM `wallabag_craue_config_setting` WHERE `name` = 'pocket_consumer_key';
diff --git a/docs/en/index.rst b/docs/en/index.rst
index 46450b8f..da23400b 100644
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -30,7 +30,8 @@ The documentation is available in other languages:
30 30
31 user/faq 31 user/faq
32 user/installation 32 user/installation
33 user/upgrade 33 user/upgrade-2.0.x-2.1.0
34 user/upgrade-2.0.x-2.0.y
34 user/migration 35 user/migration
35 user/import 36 user/import
36 user/create_account 37 user/create_account
diff --git a/docs/en/user/upgrade.rst b/docs/en/user/upgrade-2.0.x-2.0.y.rst
index f547f247..6a0818b3 100644
--- a/docs/en/user/upgrade.rst
+++ b/docs/en/user/upgrade-2.0.x-2.0.y.rst
@@ -1,18 +1,17 @@
1Upgrade wallabag 1Upgrade from 2.0.x to 2.0.y
2================ 2===========================
3 3
4Upgrade on a dedicated web server 4Upgrade on a dedicated web server
5--------------------------------- 5---------------------------------
6 6
7The 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): 7The 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.1.0 13 git checkout 2.0.8
14 ASSETS=build ./install.sh 14 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
15 php bin/console doctrine:migrations:migrate --env=prod
16 php bin/console cache:clear --env=prod 15 php bin/console cache:clear --env=prod
17 16
18Upgrade on a shared hosting 17Upgrade on a shared hosting
@@ -26,7 +25,7 @@ Download the last release of wallabag:
26 25
27 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
28 27
29(md5 hash of the package: ``4f84c725d1d6e3345eae0a406115e5ff``) 28(md5 hash of the 2.0.8 package: ``4f84c725d1d6e3345eae0a406115e5ff``)
30 29
31Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. 30Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours.
32 31
diff --git a/docs/en/user/upgrade-2.0.x-2.1.0.rst b/docs/en/user/upgrade-2.0.x-2.1.0.rst
new file mode 100644
index 00000000..3a24ee58
--- /dev/null
+++ b/docs/en/user/upgrade-2.0.x-2.1.0.rst
@@ -0,0 +1,50 @@
1Upgrading from 2.0.x to 2.1.0
2=============================
3
4.. warning::
5Before this migration, if you configured the Pocket import by adding your consumer key in Internal settings, please do a backup of it: you'll have to add it into the Config page after the upgrade.
6
7Upgrade on a dedicated web server
8---------------------------------
9
10The 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):
11
12::
13
14 git fetch origin
15 git fetch --tags
16 git checkout 2.1.0
17 ASSETS=build ./install.sh
18 php bin/console doctrine:migrations:migrate --env=prod
19 php bin/console cache:clear --env=prod
20
21Upgrade on a shared hosting
22---------------------------
23
24Backup your ``app/config/parameters.yml`` file.
25
26Download the last release of wallabag:
27
28.. code-block:: bash
29
30 wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
31
32(md5 hash of the package: ``4f84c725d1d6e3345eae0a406115e5ff``)
33
34Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours.
35
36If you use SQLite, you must also copy your ``data/`` folder inside the new installation.
37
38Empty ``var/cache`` folder.
39
40You must run some SQL queries to upgrade your database. We assume that the table prefix is ``wallabag_`` and the database server is a MySQL one:
41
42.. code-block:: sql
43
44 ALTER TABLE `wallabag_entry` ADD `uuid` LONGTEXT DEFAULT NULL;
45 INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('share_public', '1', 'entry');
46 ALTER TABLE `wallabag_oauth2_clients` ADD name longtext COLLATE 'utf8_unicode_ci' DEFAULT NULL;
47 INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_redis', '0', 'import');
48 INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_rabbitmq', '0', 'import');
49 ALTER TABLE `wallabag_config` ADD `pocket_consumer_key` VARCHAR(255) DEFAULT NULL;
50 DELETE FROM `wallabag_craue_config_setting` WHERE `name` = 'pocket_consumer_key';
diff --git a/docs/fr/index.rst b/docs/fr/index.rst
index dfa55afe..ff99948c 100644
--- a/docs/fr/index.rst
+++ b/docs/fr/index.rst
@@ -31,7 +31,8 @@ La documentation est disponible dans d'autres langues :
31 31
32 user/faq 32 user/faq
33 user/installation 33 user/installation
34 user/upgrade 34 user/upgrade-2.0.x-2.1.0
35 user/upgrade-2.0.x-2.0.y
35 user/migration 36 user/migration
36 user/import 37 user/import
37 user/create_account 38 user/create_account
diff --git a/docs/fr/user/upgrade.rst b/docs/fr/user/upgrade-2.0.x-2.0.y.rst
index 42aef9c7..d8dfac6e 100644
--- a/docs/fr/user/upgrade.rst
+++ b/docs/fr/user/upgrade-2.0.x-2.0.y.rst
@@ -1,18 +1,17 @@
1Mettre à jour wallabag 1Mettre à jour de la 2.0.x à la 2.0.y
2====================== 2====================================
3 3
4Mise à jour sur un serveur dédié 4Mise à jour sur un serveur dédié
5-------------------------------- 5--------------------------------
6 6
7La dernière version de wallabag est publiée à cette adresse : https://www.wallabag.org/pages/download-wallabag.html. Pour mettre à jour votre installation de wallabag, exécutez les commandes suivantes dans votre répertoire d'installation (remplacez ``2.1.0`` par le numéro de la dernière version) : 7La dernière version de wallabag est publiée à cette adresse : https://www.wallabag.org/pages/download-wallabag.html. Pour mettre à jour votre installation de wallabag, exécutez les commandes suivantes dans votre répertoire d'installation (remplacez ``2.0.8`` par le numéro de la dernière version) :
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.1.0 13 git checkout 2.0.8
14 ASSETS=build ./install.sh 14 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
15 php bin/console doctrine:migrations:migrate --env=prod
16 php bin/console cache:clear --env=prod 15 php bin/console cache:clear --env=prod
17 16
18Mise à jour sur un hébergement mutualisé 17Mise à jour sur un hébergement mutualisé
@@ -26,7 +25,7 @@ Téléchargez la dernière version de wallabag :
26 25
27 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
28 27
29(hash md5 de l'archive : ``4f84c725d1d6e3345eae0a406115e5ff``) 28(hash md5 de l'archive 2.0.8 : ``4f84c725d1d6e3345eae0a406115e5ff``)
30 29
31Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre. 30Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre.
32 31
diff --git a/docs/fr/user/upgrade-2.0.x-2.1.0.rst b/docs/fr/user/upgrade-2.0.x-2.1.0.rst
new file mode 100644
index 00000000..18f09a63
--- /dev/null
+++ b/docs/fr/user/upgrade-2.0.x-2.1.0.rst
@@ -0,0 +1,51 @@
1Mettre à jour de la 2.0.x à la 2.1.0
2====================================
3
4.. warning::
5Avant cette migration, si vous aviez configuré l'import depuis Pocket en ajoutant votre consumer key dans les paramètres internes, pensez à effectuer une sauvegarde de celle-ci : vous devrez l'ajouter dans la configuration de wallabag après la mise à jour.
6
7Mise à jour sur un serveur dédié
8--------------------------------
9
10La dernière version de wallabag est publiée à cette adresse : https://www.wallabag.org/pages/download-wallabag.html. Pour mettre à jour votre installation de wallabag, exécutez les commandes suivantes dans votre répertoire d'installation (remplacez ``2.1.0`` par le numéro de la dernière version) :
11
12::
13
14 git fetch origin
15 git fetch --tags
16 git checkout 2.1.0
17 ASSETS=build ./install.sh
18 php bin/console doctrine:migrations:migrate --env=prod
19 php bin/console cache:clear --env=prod
20
21Mise à jour sur un hébergement mutualisé
22----------------------------------------
23
24Effectuez une sauvegarde du fichier ``app/config/parameters.yml``.
25
26Téléchargez la dernière version de wallabag :
27
28.. code-block:: bash
29
30 wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
31
32(hash md5 de l'archive : ``4f84c725d1d6e3345eae0a406115e5ff``)
33
34Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre.
35
36Si vous utilisez SQLite, vous devez également conserver le contenu du répertoire ``data/``.
37
38Videz le répertoire ``var/cache``.
39
40Vous allez devoir également exécuter des requêtes SQL pour mettre à jour votre base de données. Nous partons du principe que le préfixe de vos tables est ``wallabag_`` et que le serveur SQL est un serveur MySQL :
41
42.. code-block:: sql
43
44 ALTER TABLE `wallabag_entry` ADD `uuid` LONGTEXT DEFAULT NULL;
45 INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('share_public', '1', 'entry');
46 ALTER TABLE `wallabag_oauth2_clients` ADD name longtext COLLATE 'utf8_unicode_ci' DEFAULT NULL;
47 INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_redis', '0', 'import');
48 INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_rabbitmq', '0', 'import');
49 ALTER TABLE `wallabag_config` ADD `pocket_consumer_key` VARCHAR(255) DEFAULT NULL;
50 DELETE FROM `wallabag_craue_config_setting` WHERE `name` = 'pocket_consumer_key';
51
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 95cb31d1..b70ca64d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -45,7 +45,6 @@ footer:
45 social: 'Social' 45 social: 'Social'
46 powered_by: 'propulsé par' 46 powered_by: 'propulsé par'
47 about: 'À propos' 47 about: 'À propos'
48 page_title: 'Configuration'
49 48
50config: 49config:
51 page_title: 'Configuration' 50 page_title: 'Configuration'