aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs/en/user
diff options
context:
space:
mode:
Diffstat (limited to 'docs/en/user')
-rw-r--r--docs/en/user/configuration.rst2
-rw-r--r--docs/en/user/installation.rst2
-rw-r--r--docs/en/user/migration.rst36
3 files changed, 22 insertions, 18 deletions
diff --git a/docs/en/user/configuration.rst b/docs/en/user/configuration.rst
index f681d874..f4c55dea 100644
--- a/docs/en/user/configuration.rst
+++ b/docs/en/user/configuration.rst
@@ -108,7 +108,7 @@ Variable Meaning Operator Meaning
108title Title of the entry <= Less than… 108title Title of the entry <= Less than…
109url URL of the entry < Strictly less than… 109url URL of the entry < Strictly less than…
110isArchived Whether the entry is archived or not => Greater than… 110isArchived Whether the entry is archived or not => Greater than…
111isStared Whether the entry is starred or not > Strictly greater than… 111isStarred Whether the entry is starred or not > Strictly greater than…
112content The entry's content = Equal to… 112content The entry's content = Equal to…
113language The entry's language != Not equal to… 113language The entry's language != Not equal to…
114mimetype The entry's mime-type OR One rule or another 114mimetype The entry's mime-type OR One rule or another
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 2c6a2f5f..58d9fb7e 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -226,7 +226,7 @@ Assuming you install wallabag in the /var/www/wallabag folder, here's the recipe
226 dir-listing.activate = "disable" 226 dir-listing.activate = "disable"
227 227
228 url.rewrite-if-not-file = ( 228 url.rewrite-if-not-file = (
229 "^/([^?])(?:\?(.))?" => "/app.php?$1&$2", 229 "^/([^?]*)(?:\?(.*))?" => "/app.php?$1&$2",
230 "^/([^?]*)" => "/app.php?=$1", 230 "^/([^?]*)" => "/app.php?=$1",
231 ) 231 )
232 232
diff --git a/docs/en/user/migration.rst b/docs/en/user/migration.rst
index e141ae40..42062796 100644
--- a/docs/en/user/migration.rst
+++ b/docs/en/user/migration.rst
@@ -24,20 +24,38 @@ After creating an user account on your new wallabag v2 instance, you must head o
24 :alt: Import from wallabag v1 24 :alt: Import from wallabag v1
25 :align: center 25 :align: center
26 26
27From wallabag 2.x
28-----------------
29
30From the previous wallabag instance on which you were before, go to `All articles`, then export these articles as json.
31
32.. image:: ../../img/user/export_v2.png
33 :alt: Export depuis wallabag v2
34 :align: center
35
36From your new wallabag instance, create your user account and click on the link in the menu to proceed to import. Choose import from wallabag v2 and select your json file to upload it.
37
38.. note::
39 If you encounter issues during the export or the import, don't hesitate to `ask for support <https://www.wallabag.org/pages/support.html>`__.
40
27Import via command-line interface (CLI) 41Import via command-line interface (CLI)
28~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 42---------------------------------------
29 43
30If you have a CLI access on your web server, you can execute this command to import your wallabag v1 export: 44If you have a CLI access on your web server, you can execute this command to import your wallabag v1 export:
31 45
32:: 46::
33 47
34 bin/console wallabag:import-v1 1 ~/Downloads/wallabag-export-1-2016-04-05.json --env=prod 48 bin/console wallabag:import 1 ~/Downloads/wallabag-export-1-2016-04-05.json --env=prod
35 49
36Please replace values: 50Please replace values:
37 51
38* ``1`` is the user identifier in database (The ID of the first user created on wallabag is 1) 52* ``1`` is the user identifier in database (The ID of the first user created on wallabag is 1)
39* ``~/Downloads/wallabag-export-1-2016-04-05.json`` is the path of your wallabag v1 export 53* ``~/Downloads/wallabag-export-1-2016-04-05.json`` is the path of your wallabag v1 export
40 54
55If you want to mark all these entries as read, you can add the ``--markAsRead`` option.
56
57To import a wallabag v2 file, you need to add the option ``--importer=v2``.
58
41You'll have this in return: 59You'll have this in return:
42 60
43:: 61::
@@ -46,17 +64,3 @@ You'll have this in return:
46 403 imported 64 403 imported
47 0 already saved 65 0 already saved
48 End : 05-04-2016 11:36:09 --- 66 End : 05-04-2016 11:36:09 ---
49
50From wallabag 2.x
51-----------------
52
53From the previous wallabag instance on which you were before, go to `All articles`, then export these articles as json.
54
55.. image:: ../../img/user/export_v2.png
56 :alt: Export depuis wallabag v2
57 :align: center
58
59From your new wallabag instance, create your user account and click on the link in the menu to proceed to import. Choose import from wallabag v2 and select your json file to upload it.
60
61.. note::
62 If you encounter issues during the export or the import, don't hesitate to `ask for support <https://www.wallabag.org/pages/support.html>`__.