From fa04bddd01f164f8423de2bffa76dc72d78b09c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 3 May 2016 20:51:23 +0200 Subject: Move some parts in FAQ --- docs/en/index.rst | 2 +- docs/en/user/create_account.rst | 21 --------------------- docs/en/user/faq.rst | 25 +++++++++++++++++++++++++ docs/en/user/import.rst | 41 ++--------------------------------------- docs/en/user/login.rst | 10 ---------- docs/en/user/migration.rst | 4 ++-- 6 files changed, 30 insertions(+), 73 deletions(-) (limited to 'docs/en') diff --git a/docs/en/index.rst b/docs/en/index.rst index cd0948c2..6d2ce8f3 100644 --- a/docs/en/index.rst +++ b/docs/en/index.rst @@ -27,13 +27,13 @@ The main documentation for this application is organized into a couple sections: user/installation user/upgrade user/migration + user/import user/create_account user/login user/configuration user/first_article user/errors_during_fetching user/annotations - user/import user/download_articles user/filters user/tags 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. .. image:: ../../img/user/activated_account.png :alt: Welcome on board! :align: center - -Frequently asked questions --------------------------- - -I can't valid the registration form -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Make sure that all fields are well filled: - -* valid email address -* same passwords in two fields - -I don't receive my activation email -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Are you sure your email address was correct? Did you check your spams folder? - -When I click on the activation link, I've got this message: ``The user with confirmation token "DtrOPfbQeVkWf6N" does not exist``. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -You 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 `Read the documentation about composer to know how to install it `__. + +I can't valid the registration form +----------------------------------- + +Make sure that all fields are well filled: + +* valid email address +* same passwords in two fields + +I don't receive my activation email +----------------------------------- + +Are you sure your email address was correct? Did you check your spams folder? + +When I click on the activation link, I've got this message: ``The user with confirmation token "DtrOPfbQeVkWf6N" does not exist``. +---------------------------------------------------------------------------------------------------------------------------------- + +You already enabled your account or the URL of the activation email is wrong. + +I forgot my password +-------------------- + +You can reset your password by clicking on ``Forgot your password?`` link, +on the login page. Then, fill the form with your email address or your username, +you'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 @@ -Migrate to wallabag -=================== - -From wallabag -------------- - -Export your data from your wallabag 1.x -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -On your config page, click on ``JSON export`` in the ``Export your wallabag data`` section. - -.. image:: ../../img/user/export_wllbg_1.png - :alt: Export from wallabag 1.x - :align: center - -You will have a ``wallabag-export-1-1970-01-01.json`` file. - -Export your data from your wallabag 2.x -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -On the export sidebar, click on ``JSON``. - -.. image:: ../../img/user/export_wllbg_2.png - :alt: Export from wallabag 2.x - :align: center - -You will have a ``Unread articles.json`` file. - -Import your data into wallabag 2.x -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Click on ``Import`` link in the menu, choose the right wallabag version, -select your export file on your computer and import it. - -.. image:: ../../img/user/import_wllbg.png - :alt: Import from wallabag 1.x - :align: center - -All your wallabag articles will be imported. +Migrate from a third service +============================ From Pocket ----------- 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 .. image:: ../../img/user/login_form.png :alt: Login form :align: center - -Frequently asked questions --------------------------- - -I forgot my password -~~~~~~~~~~~~~~~~~~~~ - -You can reset your password by clicking on ``Forgot your password?`` link, -on the login page. Then, fill the form with your email address or your username, -you'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 @@ -Migrate wallabag -================ +Migrate from v1 or v2 +===================== From wallabag 1.x ----------------- -- cgit v1.2.3