Merge pull request #2578 from wallabag/questionmark-icon

[github/wallabag/wallabag.git] / docs / en / user / migration.rst

diff --git a/docs/en/user/migration.rst b/docs/en/user/migration.rst
index 9e7d1a1eb5ed7cf63c98700ec214887234eb7986..420627969b70a018b5bfc3b8ab3f17a1c61ab244 100644 (file)
--- a/docs/en/user/migration.rst
+++ b/docs/en/user/migration.rst
@@ -1,5 +1,5 @@
-Migrate wallabag
-================
+Migrate from v1 or v2
+=====================
 
 From wallabag 1.x
 -----------------
@@ -16,7 +16,7 @@ If you were using wallabag v1.x, you need to export your data before migrating t
 .. note::
     If you encounter issues during the export or the import, don't hesitate to `ask for support <https://www.wallabag.org/pages/support.html>`__.
 
-When you have retrieved the json file containing your entries, you can install wallabag v2 if needed by following `the standard procedure <http://doc.wallabag.org/en/v2/user/installation.html>`__.
+When you have retrieved the json file containing your entries, you can install wallabag v2 if needed by following `the standard procedure <http://doc.wallabag.org/en/master/user/installation.html>`__.
 
 After creating an user account on your new wallabag v2 instance, you must head over to the `Import` section and select `Import from wallabag v1`. Select your json file and upload it.
 
@@ -24,7 +24,6 @@ After creating an user account on your new wallabag v2 instance, you must head o
    :alt: Import from wallabag v1
    :align: center
 
-
 From wallabag 2.x
 -----------------
 
@@ -38,3 +37,30 @@ From your new wallabag instance, create your user account and click on the link
 
 .. note::
     If you encounter issues during the export or the import, don't hesitate to `ask for support <https://www.wallabag.org/pages/support.html>`__.
+
+Import via command-line interface (CLI)
+---------------------------------------
+
+If you have a CLI access on your web server, you can execute this command to import your wallabag v1 export:
+
+::
+
+    bin/console wallabag:import 1 ~/Downloads/wallabag-export-1-2016-04-05.json --env=prod
+
+Please replace values:
+
+* ``1`` is the user identifier in database (The ID of the first user created on wallabag is 1)
+* ``~/Downloads/wallabag-export-1-2016-04-05.json`` is the path of your wallabag v1 export
+
+If you want to mark all these entries as read, you can add the ``--markAsRead`` option.
+
+To import a wallabag v2 file, you need to add the option ``--importer=v2``.
+
+You'll have this in return:
+
+::
+
+    Start : 05-04-2016 11:36:07 ---
+    403 imported
+    0 already saved
+    End : 05-04-2016 11:36:09 ---