aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs/en
diff options
context:
space:
mode:
Diffstat (limited to 'docs/en')
-rw-r--r--docs/en/developer/docker.rst6
-rw-r--r--docs/en/developer/translate.rst35
-rw-r--r--docs/en/index.rst5
-rw-r--r--docs/en/user/configuration.rst42
-rw-r--r--docs/en/user/create_account.rst11
-rw-r--r--docs/en/user/download_articles.rst5
-rw-r--r--docs/en/user/first_article.rst14
-rw-r--r--docs/en/user/import.rst24
-rw-r--r--docs/en/user/installation.rst145
-rw-r--r--docs/en/user/login.rst7
10 files changed, 247 insertions, 47 deletions
diff --git a/docs/en/developer/docker.rst b/docs/en/developer/docker.rst
index aece2984..8816cbcf 100644
--- a/docs/en/developer/docker.rst
+++ b/docs/en/developer/docker.rst
@@ -15,11 +15,11 @@ your system and up to date.
15Switch DBMS 15Switch DBMS
16----------- 16-----------
17 17
18By default, wallabag will start with a sqlite database. 18By default, wallabag will start with a SQLite database.
19Since wallabag provides support for Postgresql and MySQL, docker 19Since wallabag provides support for Postgresql and MySQL, docker
20containers are also available for these ones. 20containers are also available for these ones.
21 21
22In ``docker-compose.yml``, for the chosen DBMS uncomment : 22In ``docker-compose.yml``, for the chosen DBMS uncomment:
23 23
24- the container definition (``postgres`` or ``mariadb`` root level 24- the container definition (``postgres`` or ``mariadb`` root level
25 block) 25 block)
@@ -27,7 +27,7 @@ In ``docker-compose.yml``, for the chosen DBMS uncomment :
27- the container env file in the ``php`` container 27- the container env file in the ``php`` container
28 28
29In order to keep running Symfony commands on your host (such as 29In order to keep running Symfony commands on your host (such as
30``wallabag:install``), you also should : 30``wallabag:install``), you also should:
31 31
32- source the proper env files on your command line, so variables 32- source the proper env files on your command line, so variables
33 like ``SYMFONY__ENV__DATABASE_HOST`` will exist. 33 like ``SYMFONY__ENV__DATABASE_HOST`` will exist.
diff --git a/docs/en/developer/translate.rst b/docs/en/developer/translate.rst
index 85cf2563..33b0ebdb 100644
--- a/docs/en/developer/translate.rst
+++ b/docs/en/developer/translate.rst
@@ -1,31 +1,38 @@
1Translate wallabag 1Translate wallabag
2================== 2==================
3 3
4wallabag web application
5------------------------
6
4Translation files 7Translation files
5----------------- 8~~~~~~~~~~~~~~~~~
6 9
7.. note:: 10.. note::
8 11
9 As wallabag is mainly developed by a French team, please consider that french translation is the most updated one and please copy it to create your own translation. 12 As wallabag is mainly developed by a French team, please consider that french
13 translation is the most updated one and please copy it to create your own translation.
10 14
11You can find translation files here: https://github.com/wallabag/wallabag/tree/v2/src/Wallabag/CoreBundle/Resources/translations. 15You can find translation files here: https://github.com/wallabag/wallabag/tree/v2/src/Wallabag/CoreBundle/Resources/translations.
12 16
13You have to create ``messages.CODE.yml`` and ``validators.CODE.yml``, where CODE is the the ISO 639-1 code of your language (`see wikipedia <https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes>`__). 17You have to create ``messages.CODE.yml`` and ``validators.CODE.yml``, where CODE
18is the ISO 639-1 code of your language (`see wikipedia <https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes>`__).
14 19
15Other files to translate: 20Other files to translate:
16 21
17- https://github.com/wallabag/wallabag/tree/v2/app/Resources/CraueConfigBundle/translations. 22- https://github.com/wallabag/wallabag/tree/v2/app/Resources/CraueConfigBundle/translations.
18- https://github.com/wallabag/wallabag/tree/v2/app/Resources/FOSUserBundle/translations. 23- https://github.com/wallabag/wallabag/tree/v2/app/Resources/FOSUserBundle/translations.
19 24
20You have to create ``CraueConfigBundle.CODE.yml``. 25You have to create ``THE_TRANSLATION_FILE.CODE.yml`` files.
21 26
22Configuration file 27Configuration file
23------------------ 28~~~~~~~~~~~~~~~~~~
24 29
25You have to edit `app/config/config.yml 30You have to edit `app/config/config.yml
26<https://github.com/wallabag/wallabag/blob/v2/app/config/config.yml>`__ to display your language on Configuration page of wallabag (to allow users to switch to this new translation). 31<https://github.com/wallabag/wallabag/blob/v2/app/config/config.yml>`__ to display
32your language on Configuration page of wallabag (to allow users to switch to this new translation).
27 33
28Under the ``wallabag_core.languages`` section, you have to add a new line for with your translation. For example 34Under the ``wallabag_core.languages`` section, you have to add a new line with
35your translation. For example:
29 36
30:: 37::
31 38
@@ -36,6 +43,18 @@ Under the ``wallabag_core.languages`` section, you have to add a new line for wi
36 fr: 'Français' 43 fr: 'Français'
37 44
38 45
39For the first column (``en``, ``fr``, etc.), you have to add the ISO 639-1 code of your language (see above). 46For the first column (``en``, ``fr``, etc.), you have to add the ISO 639-1 code
47of your language (see above).
40 48
41For the second column, it's the name of your language. Just that. 49For the second column, it's the name of your language. Just that.
50
51wallabag documentation
52----------------------
53
54.. note::
55
56 Contrary to the web application, the main language for documentation is english.
57
58Documentation files are stored here: https://github.com/wallabag/wallabag/tree/v2/docs
59
60You need to respect the ``en`` folder structure when you create your own translation.
diff --git a/docs/en/index.rst b/docs/en/index.rst
index acd9b383..17e375d2 100644
--- a/docs/en/index.rst
+++ b/docs/en/index.rst
@@ -8,6 +8,10 @@ wallabag documentation
8**wallabag** is a read-it-later application: it saves a web page by 8**wallabag** is a read-it-later application: it saves a web page by
9keeping content only. Elements like navigation or ads are deleted. 9keeping content only. Elements like navigation or ads are deleted.
10 10
11.. note::
12
13 This documentation is about wallabag v2. If you want to read documentation for wallabag v1, `please have a look here <https://github.com/wallabag/documentation>`__.
14
11The main documentation for this application is organized into a couple sections: 15The main documentation for this application is organized into a couple sections:
12 16
13* :ref:`user-docs` 17* :ref:`user-docs`
@@ -19,6 +23,7 @@ The main documentation for this application is organized into a couple sections:
19 :maxdepth: 2 23 :maxdepth: 2
20 :caption: User documentation 24 :caption: User documentation
21 25
26 user/installation
22 user/create_account 27 user/create_account
23 user/login 28 user/login
24 user/configuration 29 user/configuration
diff --git a/docs/en/user/configuration.rst b/docs/en/user/configuration.rst
index 369c977a..70d960ff 100644
--- a/docs/en/user/configuration.rst
+++ b/docs/en/user/configuration.rst
@@ -3,7 +3,8 @@ Configuration
3 3
4Now you're logged in, it's time to configure your account as you want. 4Now you're logged in, it's time to configure your account as you want.
5 5
6Click on ``Config`` menu. You have five tabs: ``Settings``, ``RSS``, ``User information``, ``Password`` and ``Tagging rules``. 6Click on ``Config`` menu. You have five tabs: ``Settings``, ``RSS``,
7``User information``, ``Password`` and ``Tagging rules``.
7 8
8Settings 9Settings
9-------- 10--------
@@ -11,7 +12,9 @@ Settings
11Theme 12Theme
12~~~~~ 13~~~~~
13 14
14wallabag is customizable. You can choose your prefered theme here. You can also create a new one, a chapter is dedicated for this. The default theme is ``Material``, it's the theme used in the documentation screenshots. 15wallabag is customizable. You can choose your prefered theme here. You can also
16create a new one, a chapter will be dedicated for this. The default theme is
17``Material``, it's the theme used in the documentation screenshots.
15 18
16Items per page 19Items per page
17~~~~~~~~~~~~~~ 20~~~~~~~~~~~~~~
@@ -21,7 +24,8 @@ You can change the number of articles displayed on each page.
21Language 24Language
22~~~~~~~~ 25~~~~~~~~
23 26
24You can change the language of wallabag interface. 27You can change the language of wallabag interface. You need to logout for this change
28to take effect.
25 29
26RSS 30RSS
27--- 31---
@@ -43,41 +47,49 @@ You can change your name, your email address and enable ``Two factor authenticat
43Two factor authentication 47Two factor authentication
44~~~~~~~~~~~~~~~~~~~~~~~~~ 48~~~~~~~~~~~~~~~~~~~~~~~~~
45 49
46 Two-factor authentication (also known as 2FA) is a technology patented in 1984 that provides identification of users by means of the combination of two different components. 50 Two-factor authentication (also known as 2FA) is a technology patented in 1984
51 that provides identification of users by means of the combination of two different components.
47 52
48https://en.wikipedia.org/wiki/Two-factor_authentication 53https://en.wikipedia.org/wiki/Two-factor_authentication
49 54
50If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email. You have to put this code on the following form. 55If you enable 2FA, each time you want to login to wallabag, you'll receive
56a code by email. You have to put this code on the following form.
51 57
52.. image:: ../../img/user/2FA_form.png 58.. image:: ../../img/user/2FA_form.png
53 :alt: Two factor authentication 59 :alt: Two factor authentication
54 :align: center 60 :align: center
55 61
56If you don't want to receive a code each time you want to login, you can check the ``I'm on a trusted computer`` checkbox: wallabag will remember you for 15 days. 62If you don't want to receive a code each time you want to login, you can check
63the ``I'm on a trusted computer`` checkbox: wallabag will remember you for 15 days.
57 64
58Password 65Password
59-------- 66--------
60 67
61You can change your password here. 68You can change your password here (8 characters minimum).
62 69
63Tagging rules 70Tagging rules
64------------- 71-------------
65 72
66If you want to automatically assign a tag to new articles, this part of the configuration is for you. 73If you want to automatically assign a tag to new articles, this part
74of the configuration is for you.
67 75
68What does « tagging rules » mean? 76What does « tagging rules » mean?
69~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 77~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
70 78
71They are rules used by wallabag to automatically tag new entries. 79They are rules used by wallabag to automatically tag new entries.
72Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries. 80Each time a new entry is added, all the tagging rules will be used to add
81the tags you configured, thus saving you the trouble to manually classify your entries.
73 82
74How do I use them? 83How do I use them?
75~~~~~~~~~~~~~~~~~~ 84~~~~~~~~~~~~~~~~~~
76 85
77Let assume you want to tag new entries as *« short reading »* when the reading time is inferior to 3 minutes. 86Let assume you want to tag new entries as *« short reading »* when
78In that case, you should put « readingTime <= 3 » in the **Rule** field and *« short reading »* in the **Tags** field. 87the reading time is inferior to 3 minutes.
88In that case, you should put « readingTime <= 3 » in the **Rule** field
89and *« short reading »* in the **Tags** field.
79Several tags can added simultaneously by separating them by a comma: *« short reading, must read »*. 90Several tags can added simultaneously by separating them by a comma: *« short reading, must read »*.
80Complex rules can be written by using predefined operators: if *« readingTime >= 5 AND domainName = "github.com" »* then tag as *« long reading, github »*. 91Complex rules can be written by using predefined operators:
92if *« readingTime >= 5 AND domainName = "github.com" »* then tag as *« long reading, github »*.
81 93
82Which variables and operators can I use to write rules? 94Which variables and operators can I use to write rules?
83~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 95~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -96,4 +108,4 @@ language The entry's language != Not equal
96mimetype The entry's mime-type OR One rule or another 108mimetype The entry's mime-type OR One rule or another
97readingTime The estimated entry's reading time, in minutes AND One rule and another 109readingTime The estimated entry's reading time, in minutes AND One rule and another
98domainName The domain name of the entry matches Tests that a subject is matches a search (case-insensitive). Example: title matches "football" 110domainName The domain name of the entry matches Tests that a subject is matches a search (case-insensitive). Example: title matches "football"
99=========== ============================================== ======== ========== \ No newline at end of file 111=========== ============================================== ======== ==========
diff --git a/docs/en/user/create_account.rst b/docs/en/user/create_account.rst
index 11fe304c..f0110e55 100644
--- a/docs/en/user/create_account.rst
+++ b/docs/en/user/create_account.rst
@@ -7,13 +7,16 @@ On the login page, click on ``Register`` button.
7 :alt: Registration form 7 :alt: Registration form
8 :align: center 8 :align: center
9 9
10You have to fill the form. Please sure to type a valid email address, we'll send you an activation email. 10You have to fill the form. Please sure to type a valid email address,
11we'll send you an activation email.
11 12
12.. image:: ../../img/user/sent_email.png 13.. image:: ../../img/user/sent_email.png
13 :alt: Email was sent to activate account 14 :alt: Email was sent to activate account
14 :align: center 15 :align: center
15 16
16Check your inbox, you now have a new mail with a link like this ``http://wallabag/register/confirm/Ba19wokGovN-DdBQNfg4YgRkUQWRP4-k2g0Bk-hBTX4``. Click on it to activate your account. 17Check your inbox, you now have a new mail with a link like this
18``http://wallabag/register/confirm/Ba19wokGovN-DdBQNfg4YgRkUQWRP4-k2g0Bk-hBTX4``.
19Click on it to activate your account.
17 20
18Your account is now activated. 21Your account is now activated.
19 22
@@ -33,11 +36,11 @@ Make sure that all fields are well filled:
33* same passwords in two fields 36* same passwords in two fields
34 37
35I don't receive my activation email 38I don't receive my activation email
36~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 39~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
37 40
38Are you sure your email address was correct? Did you check your spams folder? 41Are you sure your email address was correct? Did you check your spams folder?
39 42
40When I click on the activation link, I've got this message: ``The user with confirmation token "DtrOPfbQeVkWf6N" does not exist``. 43When I click on the activation link, I've got this message: ``The user with confirmation token "DtrOPfbQeVkWf6N" does not exist``.
41~~~~~~~~~~~~~~~ 44~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
42 45
43You already enabled your account or the URL of the activation email is wrong. 46You already enabled your account or the URL of the activation email is wrong.
diff --git a/docs/en/user/download_articles.rst b/docs/en/user/download_articles.rst
index 21ab1995..4813776d 100644
--- a/docs/en/user/download_articles.rst
+++ b/docs/en/user/download_articles.rst
@@ -9,8 +9,9 @@ On the article view, click on this icon, in the sidebar:
9 :alt: download article 9 :alt: download article
10 :align: center 10 :align: center
11 11
12You can also download a full category in these formats. For example, on **Unread** view, click on this icon in the top bar: 12You can also download a full category (unread, starred, archive) in these formats.
13For example, on **Unread** view, click on this icon in the top bar:
13 14
14.. image:: ../../img/user/download_articles.png 15.. image:: ../../img/user/download_articles.png
15 :alt: download articles 16 :alt: download articles
16 :align: center \ No newline at end of file 17 :align: center
diff --git a/docs/en/user/first_article.rst b/docs/en/user/first_article.rst
index 6f94bbef..1400e1e8 100644
--- a/docs/en/user/first_article.rst
+++ b/docs/en/user/first_article.rst
@@ -10,20 +10,24 @@ The main purpose of wallabag is to save web articles. You have many ways to do i
10By using a bookmarklet 10By using a bookmarklet
11---------------------- 11----------------------
12 12
13On the ``Howto`` page, you have a ``Bookmarklet`` tab. Drag and drop the ``bag it!`` link to your bookmarks bar of your browser. 13On the ``Howto`` page, you have a ``Bookmarklet`` tab. Drag and drop the ``bag it!``
14link to your bookmarks bar of your browser.
14 15
15Now, each time you're reading an article on the web and you want to save it, click on the ``bag it!`` link in your bookmarks bar. The article is saved. 16Now, each time you're reading an article on the web and you want to save it,
17click on the ``bag it!`` link in your bookmarks bar. The article is saved.
16 18
17By using the classic form 19By using the classic form
18------------------------- 20-------------------------
19 21
20In the top bar of your screen, you have 3 icons. With the first one, a plus sign, you can easily save a new article. 22In the top bar of your screen, you have 3 icons. With the first one, a plus sign,
23you can easily save a new article.
21 24
22.. image:: ../../img/user/topbar.png 25.. image:: ../../img/user/topbar.png
23 :alt: Top bar 26 :alt: Top bar
24 :align: center 27 :align: center
25 28
26Click on it to display a new field, paste the article URL inside and press your ``Return`` key. The article is saved. 29Click on it to display a new field, paste the article URL inside and press your
30``Return`` key. The article is saved.
27 31
28By using a browser add-on 32By using a browser add-on
29------------------------- 33-------------------------
@@ -59,4 +63,4 @@ Windows Phone
59iOS 63iOS
60~~~ 64~~~
61 65
62*This application is not yet available for wallabag v2*. \ No newline at end of file 66*This application is not yet available for wallabag v2*.
diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst
index 37f375b2..d6054d39 100644
--- a/docs/en/user/import.rst
+++ b/docs/en/user/import.rst
@@ -29,7 +29,8 @@ You will have a ``Unread articles.json`` file.
29Import your data into wallabag 2.x 29Import your data into wallabag 2.x
30~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 30~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
31 31
32Click on ``Import`` link in the menu, select your export file on your computer and import it. 32Click on ``Import`` link in the menu, choose the right wallabag version,
33select your export file on your computer and import it.
33 34
34.. image:: ../../img/user/import_wllbg.png 35.. image:: ../../img/user/import_wllbg.png
35 :alt: Import from wallabag 1.x 36 :alt: Import from wallabag 1.x
@@ -40,24 +41,31 @@ All your wallabag articles will be imported.
40From Pocket 41From Pocket
41----------- 42-----------
42 43
43Create a new applicaton on Pocket 44Create a new application on Pocket
44~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 45~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
45 46
46To import your data from Pocket, we use the Pocket API. You need to create a new application on their developer website to continue. 47To import your data from Pocket, we use the Pocket API. You need to create
48a new application on their developer website to continue.
47 49
48* Create a new application `on the developer website <https://getpocket.com/developer/apps/new>`_ 50* Create a new application `on the developer website <https://getpocket.com/developer/apps/new>`_
49* Fill in the required fields: application name, application description, permissions (only **retrieve**), platform (**web**), accept the terms of service and submit your new application 51* Fill in the required fields: application name, application description,
52 permissions (only **retrieve**), platform (**web**), accept the terms of service
53 and submit your new application
50 54
51Pocket will give you a **Consumer Key** (for example, `49961-985e4b92fe21fe4c78d682c1`). You need to configure the ``pocket_consumer_key`` into the ``app/config/parameters.yml`` file in wallabag. 55Pocket will give you a **Consumer Key** (for example, `49961-985e4b92fe21fe4c78d682c1`).
56You need to configure the ``pocket_consumer_key`` into the ``app/config/parameters.yml`` file in wallabag.
52 57
53Now, all is fine to migrate from Pocket. 58Now, all is fine to migrate from Pocket.
54 59
55Import your data into wallabag 2.x 60Import your data into wallabag 2.x
56~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 61~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
57 62
58Click on ``Import`` link in the menu, on ``Import contents`` in Pocket section and then on ``Connect to Pocket and import data``. 63Click on ``Import`` link in the menu, on ``Import contents`` in Pocket section
64and then on ``Connect to Pocket and import data``.
59 65
60You need to authorize wallabag to interact with your Pocket account. Your data will be imported. Data import can be a demanding process for your server (we need to work on this import to improve it). 66You need to authorize wallabag to interact with your Pocket account.
67Your data will be imported. Data import can be a demanding process for your server
68(we need to work on this import to improve it).
61 69
62From Instapaper 70From Instapaper
63--------------- 71---------------
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
new file mode 100644
index 00000000..760fd4d2
--- /dev/null
+++ b/docs/en/user/installation.rst
@@ -0,0 +1,145 @@
1Install wallabag
2================
3
4Requirements
5------------
6
7wallabag is compatible with php >= 5.5
8
9You'll need the following extensions for wallabag to work. Some of these may already activated in your version of php, so you may not have to install all corresponding packages.
10
11- php-session
12- php-ctype
13- php-dom
14- pĥp-hash
15- php-simplexml
16- php-json
17- php-gd
18- php-mbstring
19- php-xml
20- php-tidy
21- php-iconv
22- php-curl
23- php-gettext
24- php-tokenizer
25
26wallabag uses PDO to connect to database, so you'll need one of:
27
28- php-pdo_mysql
29- php-pdo_sqlite
30- php-pdo_pgsql
31
32and it's corresponding database server.
33
34Installation
35------------
36
37wallabag uses a big number of libraries in order to function. These libraries must be installed with a tool called Composer. You need to install it if you don't already have.
38
39Install Composer:
40
41::
42
43 curl -s http://getcomposer.org/installer | php
44
45You can find specific instructions here : __ https://getcomposer.org/doc/00-intro.md
46
47To install wallabag itself, you must run these two commands:
48
49::
50
51 SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.*@alpha" --no-dev
52 php bin/console wallabag:install --env=prod
53
54To start php's build-in server and test if everything did install correctly, you can do:
55
56::
57
58 php bin/console server:run --env=prod
59
60And access wallabag at http://yourserverip:8000
61
62Installing on Apache
63--------------------
64
65Assuming you install wallabag in the /var/www/wallabag folder and that you want to use php as an Apache module, here's a vhost for wallabag:
66
67::
68
69 <VirtualHost *:80>
70 ServerName domain.tld
71 ServerAlias www.domain.tld
72
73 DocumentRoot /var/www/wallabag/web
74 <Directory /var/www/wallabag/web>
75 AllowOverride None
76 Order Allow,Deny
77 Allow from All
78
79 <IfModule mod_rewrite.c>
80 Options -MultiViews
81 RewriteEngine On
82 RewriteCond %{REQUEST_FILENAME} !-f
83 RewriteRule ^(.*)$ app.php [QSA,L]
84 </IfModule>
85 </Directory>
86
87 # uncomment the following lines if you install assets as symlinks
88 # or run into problems when compiling LESS/Sass/CoffeScript assets
89 # <Directory /var/www/wallabag>
90 # Options FollowSymlinks
91 # </Directory>
92
93 # optionally disable the RewriteEngine for the asset directories
94 # which will allow apache to simply reply with a 404 when files are
95 # not found instead of passing the request into the full symfony stack
96 <Directory /var/www/wallabag/web/bundles>
97 <IfModule mod_rewrite.c>
98 RewriteEngine Off
99 </IfModule>
100 </Directory>
101 ErrorLog /var/log/apache2/wallabag_error.log
102 CustomLog /var/log/apache2/wallabag_access.log combined
103 </VirtualHost>
104
105After reloading or restarting Apache, you should now be able to access wallabag at http://domain.tld.
106
107Installing on Nginx
108-------------------
109
110Assuming you install wallabag in the /var/www/wallabag folder, here's the recipe for wallabag :
111
112::
113
114 server {
115 server_name domain.tld www.domain.tld;
116 root /var/www/wallabag/web;
117
118 location / {
119 # try to serve file directly, fallback to app.php
120 try_files $uri /app.php$is_args$args;
121 }
122 location ~ ^/app\.php(/|$) {
123 fastcgi_pass unix:/var/run/php5-fpm.sock;
124 fastcgi_split_path_info ^(.+\.php)(/.*)$;
125 include fastcgi_params;
126 # When you are using symlinks to link the document root to the
127 # current version of your application, you should pass the real
128 # application path instead of the path to the symlink to PHP
129 # FPM.
130 # Otherwise, PHP's OPcache may not properly detect changes to
131 # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
132 # for more information).
133 fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
134 fastcgi_param DOCUMENT_ROOT $realpath_root;
135 # Prevents URIs that include the front controller. This will 404:
136 # http://domain.tld/app.php/some-path
137 # Remove the internal directive to allow URIs like this
138 internal;
139 }
140
141 error_log /var/log/nginx/wallabag_error.log;
142 access_log /var/log/nginx/wallabag_access.log;
143 }
144
145After reloading or restarting nginx, you should now be able to access wallabag at http://domain.tld.
diff --git a/docs/en/user/login.rst b/docs/en/user/login.rst
index 1b6b8875..1813f3d8 100644
--- a/docs/en/user/login.rst
+++ b/docs/en/user/login.rst
@@ -5,7 +5,8 @@ Your account is now enabled, congratulations!
5 5
6To login to wallabag, fill the form on login page. 6To login to wallabag, fill the form on login page.
7 7
8If you are on your personal computer and you want to stay connected, you can check the ``Keep me logged in`` checkbox: wallabag will remember you for one year. 8If you are on your personal computer and you want to stay connected,
9you can check the ``Keep me logged in`` checkbox: wallabag will remember you for one year.
9 10
10.. image:: ../../img/user/login_form.png 11.. image:: ../../img/user/login_form.png
11 :alt: Login form 12 :alt: Login form
@@ -17,4 +18,6 @@ Frequently asked questions
17I forgot my password 18I forgot my password
18~~~~~~~~~~~~~~~~~~~~ 19~~~~~~~~~~~~~~~~~~~~
19 20
20You can reset your password by clicking on ``Forgot your password?`` link, on the login page. Then, fill the form with your email address 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.