diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-19 15:30:49 +0100 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-11-19 15:30:49 +0100 |
| commit | 68003139e133835805b143b62c4407f19b495dab (patch) | |
| tree | 9a71a15d021330fb6d55cc338f125161ddfc61dd /docs/en/user/create_account.rst | |
| parent | bbd4ae7b56d9db744482a5630abad350f2d819af (diff) | |
| parent | cb1a6590c0e58c56d0612066501b3a586b103ed5 (diff) | |
| download | wallabag-68003139e133835805b143b62c4407f19b495dab.tar.gz wallabag-68003139e133835805b143b62c4407f19b495dab.tar.zst wallabag-68003139e133835805b143b62c4407f19b495dab.zip | |
Merge remote-tracking branch 'origin/master' into 2.2
# Conflicts:
# .editorconfig
# docs/de/index.rst
# docs/de/user/import.rst
# docs/en/index.rst
# docs/en/user/configuration.rst
# docs/en/user/import.rst
# docs/fr/index.rst
# docs/fr/user/import.rst
# src/Wallabag/CoreBundle/Command/InstallCommand.php
# src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
# src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
# web/bundles/wallabagcore/themes/baggy/css/style.min.css
# web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
# web/bundles/wallabagcore/themes/material/css/style.min.css
# web/bundles/wallabagcore/themes/material/js/material.min.js
Diffstat (limited to 'docs/en/user/create_account.rst')
| -rw-r--r-- | docs/en/user/create_account.rst | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/docs/en/user/create_account.rst b/docs/en/user/create_account.rst index 2e883c88..8c43867d 100644 --- a/docs/en/user/create_account.rst +++ b/docs/en/user/create_account.rst | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | Create an account | 1 | Create an account and authentication |
| 2 | ================= | 2 | ==================================== |
| 3 | |||
| 4 | Register | ||
| 5 | -------- | ||
| 3 | 6 | ||
| 4 | On the login page, click on ``Register`` button. | 7 | On the login page, click on ``Register`` button. |
| 5 | 8 | ||
| @@ -23,3 +26,17 @@ Your account is now activated. | |||
| 23 | .. image:: ../../img/user/activated_account.png | 26 | .. image:: ../../img/user/activated_account.png |
| 24 | :alt: Welcome on board! | 27 | :alt: Welcome on board! |
| 25 | :align: center | 28 | :align: center |
| 29 | |||
| 30 | Login | ||
| 31 | ----- | ||
| 32 | |||
| 33 | Your account is now enabled, congratulations! | ||
| 34 | |||
| 35 | To login to wallabag, fill the form on login page. | ||
| 36 | |||
| 37 | If you are on your personal computer and you want to stay connected, | ||
| 38 | you can check the ``Keep me logged in`` checkbox: wallabag will remember you for one year. | ||
| 39 | |||
| 40 | .. image:: ../../img/user/login_form.png | ||
| 41 | :alt: Login form | ||
| 42 | :align: center | ||