aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs/en/user
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-05-03 20:51:23 +0200
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-05-03 20:51:23 +0200
commitfa04bddd01f164f8423de2bffa76dc72d78b09c9 (patch)
tree84b9017f42d0e0ca7798ebd4cf6eccd285ac8094 /docs/en/user
parente546a2d6eb3075b4c13f22cc0957bfc96b8e14d9 (diff)
downloadwallabag-fa04bddd01f164f8423de2bffa76dc72d78b09c9.tar.gz
wallabag-fa04bddd01f164f8423de2bffa76dc72d78b09c9.tar.zst
wallabag-fa04bddd01f164f8423de2bffa76dc72d78b09c9.zip
Move some parts in FAQ
Diffstat (limited to 'docs/en/user')
-rw-r--r--docs/en/user/create_account.rst21
-rw-r--r--docs/en/user/faq.rst25
-rw-r--r--docs/en/user/import.rst41
-rw-r--r--docs/en/user/login.rst10
-rw-r--r--docs/en/user/migration.rst4
5 files changed, 29 insertions, 72 deletions
diff --git a/docs/en/user/create_account.rst b/docs/en/user/create_account.rst
index f0110e55..2e883c88 100644
--- a/docs/en/user/create_account.rst
+++ b/docs/en/user/create_account.rst
@@ -23,24 +23,3 @@ Your account is now activated.
23.. image:: ../../img/user/activated_account.png 23.. image:: ../../img/user/activated_account.png
24 :alt: Welcome on board! 24 :alt: Welcome on board!
25 :align: center 25 :align: center
26
27Frequently asked questions
28--------------------------
29
30I can't valid the registration form
31~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
32
33Make sure that all fields are well filled:
34
35* valid email address
36* same passwords in two fields
37
38I don't receive my activation email
39~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
40
41Are you sure your email address was correct? Did you check your spams folder?
42
43When I click on the activation link, I've got this message: ``The user with confirmation token "DtrOPfbQeVkWf6N" does not exist``.
44~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
45
46You already enabled your account or the URL of the activation email is wrong.
diff --git a/docs/en/user/faq.rst b/docs/en/user/faq.rst
index 04fb25e3..1e36dc26 100644
--- a/docs/en/user/faq.rst
+++ b/docs/en/user/faq.rst
@@ -8,3 +8,28 @@ It seems you have a problem with your ``composer`` installation. Try to uninstal
8 8
9`Read the documentation about composer to know how to install it 9`Read the documentation about composer to know how to install it
10<https://getcomposer.org/doc/00-intro.md>`__. 10<https://getcomposer.org/doc/00-intro.md>`__.
11
12I can't valid the registration form
13-----------------------------------
14
15Make sure that all fields are well filled:
16
17* valid email address
18* same passwords in two fields
19
20I don't receive my activation email
21-----------------------------------
22
23Are you sure your email address was correct? Did you check your spams folder?
24
25When I click on the activation link, I've got this message: ``The user with confirmation token "DtrOPfbQeVkWf6N" does not exist``.
26----------------------------------------------------------------------------------------------------------------------------------
27
28You already enabled your account or the URL of the activation email is wrong.
29
30I forgot my password
31--------------------
32
33You can reset your password by clicking on ``Forgot your password?`` link,
34on the login page. Then, fill the form with your email address or your username,
35you'll receive an email to reset your password.
diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst
index d6054d39..84f07be2 100644
--- a/docs/en/user/import.rst
+++ b/docs/en/user/import.rst
@@ -1,42 +1,5 @@
1Migrate to wallabag 1Migrate from a third service
2=================== 2============================
3
4From wallabag
5-------------
6
7Export your data from your wallabag 1.x
8~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
9
10On your config page, click on ``JSON export`` in the ``Export your wallabag data`` section.
11
12.. image:: ../../img/user/export_wllbg_1.png
13 :alt: Export from wallabag 1.x
14 :align: center
15
16You will have a ``wallabag-export-1-1970-01-01.json`` file.
17
18Export your data from your wallabag 2.x
19~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
20
21On the export sidebar, click on ``JSON``.
22
23.. image:: ../../img/user/export_wllbg_2.png
24 :alt: Export from wallabag 2.x
25 :align: center
26
27You will have a ``Unread articles.json`` file.
28
29Import your data into wallabag 2.x
30~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
31
32Click on ``Import`` link in the menu, choose the right wallabag version,
33select your export file on your computer and import it.
34
35.. image:: ../../img/user/import_wllbg.png
36 :alt: Import from wallabag 1.x
37 :align: center
38
39All your wallabag articles will be imported.
40 3
41From Pocket 4From Pocket
42----------- 5-----------
diff --git a/docs/en/user/login.rst b/docs/en/user/login.rst
index 1813f3d8..e66089bd 100644
--- a/docs/en/user/login.rst
+++ b/docs/en/user/login.rst
@@ -11,13 +11,3 @@ you can check the ``Keep me logged in`` checkbox: wallabag will remember you for
11.. image:: ../../img/user/login_form.png 11.. image:: ../../img/user/login_form.png
12 :alt: Login form 12 :alt: Login form
13 :align: center 13 :align: center
14
15Frequently asked questions
16--------------------------
17
18I forgot my password
19~~~~~~~~~~~~~~~~~~~~
20
21You can reset your password by clicking on ``Forgot your password?`` link,
22on the login page. Then, fill the form with your email address or your username,
23you'll receive an email to reset your password.
diff --git a/docs/en/user/migration.rst b/docs/en/user/migration.rst
index e97c6315..e141ae40 100644
--- a/docs/en/user/migration.rst
+++ b/docs/en/user/migration.rst
@@ -1,5 +1,5 @@
1Migrate wallabag 1Migrate from v1 or v2
2================ 2=====================
3 3
4From wallabag 1.x 4From wallabag 1.x
5----------------- 5-----------------