6 files changed, 141 insertions, 192 deletions
diff --git a/docs/en/users/03_Main_view.md b/docs/en/users/03_Main_view.md
index c5800081c..3771a381a 100644
--- a/docs/en/users/03_Main_view.md
+++ b/docs/en/users/03_Main_view.md
@@ -1,14 +1,36 @@
+FreshRSS has three primary viewing modes: Normal, Global, and Reader view.
+
 # Normal view
 
-**TODO**
+Normal view will allow you to view articles in a compressed view. They can be separated by category or individual feed, or viewed in the "main stream" containing all feeds. Clicking a feed in the sidebar (mobile users will need to click the folder icon to open it) will open that feed's view. 
+
+## Article List
+
+By default, the normal view includes six items per article. From left to right:
+* **Read status:** An envalope icon to show if the article has been read or not. Closed envalopes are unread, open envalopes are read. Clicking on the icon will toggle the read status.
+* **Favourite status:** A star icon to show if the article has been favourited or not. Filled stars are favourited, empty stars are not. Clicking on the icon will toggle the favourite status.
+* **Feed name:** The name of the feed that the article is from. Clicking the feed name will move to that feed's view in normal view.
+* **Article title:** The title of the article. Clicking will open the article for viewing within FreshRSS. 
+* **Article date/time:** The time the article was posted.
+* **Link to original article:** A globe icon that can be clicked to go to the article on the original website.
+
+## Normal View Sidebar
+
+Clicking the gear icon next to an individual feed will display additional options for that feed. 
+* **Filter:** Run the defined filter to mark articles as read
+* **Statistics:** View statistics about the feed
+* **See website:** Open the feed's website in another tab
+* **Manage:** Configure the feed
+* **Actualize:** Force-update the feed
+* **Mark as read:** Mark all items in the feed as read
 
 # Global view
 
-**TODO**
+Global view allows quick views of feed's statuses at once. Feeds and categories are shown with the number of unread articles next to them. Clicking a feed's name will open it in a view similar to normal view. 
 
 # Reader view
 
-**TODO**
+Reader view will display a feed will all articles already open for reading. Feeds can be switched by clicking the folder icon at the top to bring up the category/feed sidebar.
 
 # Refreshing feeds
 
diff --git a/docs/en/users/04_Subscriptions.md b/docs/en/users/04_Subscriptions.md
index b18272518..bfb3eabe4 100644
--- a/docs/en/users/04_Subscriptions.md
+++ b/docs/en/users/04_Subscriptions.md
@@ -1,11 +1,92 @@
 # Adding a feed
 
  1. To add a feed, copy the URL of its RSS or Atom file (for instance, the Framablog RSS URL is `https://framablog.org/feed/`). FreshRSS is able to automatically find the address of the feed for websites that are declaring it in a standard way.
- 2. On FreshRSS, click “Subscriptions management”.
- 3. Paste the URL in “Add an RSS feed” below the page title.
+ 2. In FreshRSS, click the "**+**" button next to “Subscriptions management”.
+ 3. Paste the URL in the “Feed URL” field.
  4. (optional): You can select the category for your feed. By default, it will be in “Uncategorized”.
+ 5. (optional): If the subscription requires credentials, you can enter them in the "HTTP username" and "HTTP password" fields. 
+ 6. (optional): You can set a timeout for the feed request if the feed requires it.
+ 7. (optional): You can choose to ignore SSL certificate errors (such as with self-signed certificates) by setting "Verify SSL security" to "No". This is not recommended, and it is better to either add the root certificate to the FreshRSS server or to fix the SSL certificate problems on the feed hosting server.
 
-# Import and export
+# Subscription management
+
+The "Subscription management" submenu allows categories and feeds to be configured. Feeds can be moved between categories by drag-and-drop, or in the individual feed's settings. Hovering over a feed/category will cause a gear icon to appear. Clicking the icon will bring up the settings for that item. 
+
+## Category Settings
+
+### Information 
+
+* **Title:** Name of category
+  * **Display position:** Defines the order of categories. Lower numbers get priority, non-numbered items come last, and equally numbered items will sort by alphabetical order.
+
+### Archiving
+
+If "Purge Policy" has "By default" selected, then the [default purge policy](./05_Configuration.md) is used and the other options are not displayed. Category options will override the default policy, but they will not override feed-specific options.
+
+## Feed Settings
+
+
+These fields will be auto-filled when adding a feed, but they can be modified later. **Visibility** will define if the feed is displayed in the main feed, only in specific categories, or not at all.
+
+### Archival
+
+This section will let you override the default settings for feed archiving and update frequency.
+
+### Login
+
+Some feeds require a username/password submitted over HTTP. These usually aren't needed for feeds.
+
+### Advanced
+
+#### Retrieve a truncated feed from within FreshRSS
+
+This question comes up regularly, so we'll try to clarify how one can retrieve a truncated RSS feed with FreshRSS. Please note that the process is absolutely not user friendly, but it works. :)
+
+Please be aware that this way you'll generate much more traffic to the originating sites, and they might block you accordingly. FreshRSS performance is also negatively affected, because you'll have to fetch the full article content one by one. So it's a feature to use sparingly!
+
+The  "Article CSS selector on original website" corresponds to the "path" consisting of IDs and classes (which in HTML, matches the id and class attributes) to retrieve only the interesting part that corresponds to the article. Ideally, this path starts with an id (which is unique to the page). The basics are explained [here](https://developer.mozilla.org/en-US/docs/Learn/CSS/Building_blocks/Selectors).
+
+##### Example: Rue89
+
+To find this path, you have to go to the address of one of the truncated articles (for example, http://www.rue89.com/2013/10/15/prof-maths-jai-atteint-lextase-dihn-pedagogie-inversee-246635). You look have to look for the "block" of HTML that corresponds to article content (in the source code!).
+
+Here we find that the block that encompasses nothing but the content of the article is ```<div class="content clearfix">```. We'll only use the `.content` class here. Nevertheless, as said above, it's best to start the path with an id. If we go back to the parent block, we find ```<div id="article">``` and that's perfect! The path will be ```#article .content```.
+
+##### Add the corresponding classes to the article CSS path on the feed configuration page. Examples:
+
+*  Rue89: ```#article .content```
+*  PCINpact: ```#actu_content```
+*  Lesnumériques: ```article#body div.text.clearfix```
+*  Phoronix: ```#main .content```
+
+##### Combining CSS Classes
+Let's say we have an article which contains ads, and we do not want to have those ads retrieved by FreshRSS. Example HTML:
+```
+<div id="article">
+<h2>wanted</h2>
+<p class="content">wanted content</p>
+<p class="ad">unwanted content</p>
+<h2>wanted</h2>
+<p class="content">wanted content</p>
+<h2>wanted</h2>
+<p class="ad">unwanted content</p>
+<p class="content">wanted content</p>
+</div>
+```
+In this case it's possible to combine multiple CSS selectors with a comma: ```#article p.content, #article h2```
+
+#### Retrieve a truncated feed with external tools
+
+Complementary tools can be used to retrieve full article content, such as:
+
+* [RSS-Bridge](https://github.com/RSS-Bridge/rss-bridge)
+* [Full-Text RSS](https://bitbucket.org/fivefilters/full-text-rss)
+
+### Filter
+
+Articles can be automatically marked as read based on some search terms. See [filtering](./03_Main_view.md#filtering-articles) for more information on how to create these filters.
+
+# Import / export
 See [SQLite export/import]( https://github.com/FreshRSS/FreshRSS/tree/master/cli) as an alternative.
 
 ## Export
@@ -19,7 +100,7 @@ See [SQLite export/import]( https://github.com/FreshRSS/FreshRSS/tree/master/cli
     4. and finally, you can select feeds you want to export (by default, all feeds are selected)
  4. Click on “export”.
 
- ## Import
+## Import
  
   1. Go to the page “Import / export”.
   2. Click on “Browse” and select your OPML or archive file on your computer.
@@ -39,14 +120,3 @@ Bookmarklets are little scripts that you can execute to perform various tasks. F
  1. Open “Subscriptions management”.
  2. Click on “Subscription tools”.
  3. Drag the “Subscribe” button to your bookmark toolbar or right click and choose your browser’s “Bookmark link” action.
-
-# Feed management
-
-You can manage your feeds within different categories. A feed cannot be in multiple categories.
-
- 1. Open “Subscriptions management”.
- 2. You can add a category:
-    1. Type the name of your category in “New category”
-    2. Click on “Submit”
- 3. You can move a feed on the category you want with drag & drop
- 4. (optional): If you want the articles of a feed to be visible solely within its category and not in the main view, in the “Visibility” option, select “Show in its category”.
diff --git a/docs/en/users/05_Configuration.md b/docs/en/users/05_Configuration.md
index ba8c5006b..660a26bda 100644
--- a/docs/en/users/05_Configuration.md
+++ b/docs/en/users/05_Configuration.md
@@ -66,11 +66,27 @@ If you don't use those buttons because you never browse on mobile or because you
 
 # Reading
 
-**TODO**
+## Number of articles per page
+
+This setting defines the number of articles to display at once before needing to load more. In normal and reading view, more articles are loaded automatically. In global view, a button will appear at the bottom of the list. 
+
+## Articles to display
+
+The status of articles to display when loading FreshRSS. "Adjust showing" will display only unread articles by default, but will display all articles when there are no unread articles to show. 
+
+## Use "lazy load" mode to load images
+
+This will set images to load as they are viewed. This can save data, but will can cause images to load in later.
 
 # Archival
 
-**TODO**
+## Archiving
+
+These are the global options for fetching and retaining articles from feeds. They can be overwridden by individual feed's settings.
+
+## Maintenance 
+
+This allows for purging/optimizing the current user's articles in the database. 
 
 # Sharing
 
@@ -93,6 +109,8 @@ To remove an item from the list, follow those simple steps:
  1. Press the ```❌``` button next to the share method you want to remove.
  1. Submit your changes.
 
+
+
 # Shortcuts
 
 To ease the use of the application, FreshRSS comes with a lot of predefined keyboard shortcuts.
@@ -122,6 +140,14 @@ You can only change user query titles or drop them.
 
 At the moment, there is no helper to build a user query from here.
 
+# Profile
+
+You can change your email address or password here. The authentication token is required for accessing the aggregated RSS feed for a user. A blank token will disable accessing the RSS feed without being logged in. 
+
+# Extensions
+
+Extensions can be managed from this menu. Note that while extensions can be removed from the web interface, they cannot be added from it. 
+
 # Users
 
 **TODO**
@@ -145,62 +171,3 @@ Require user marie
 
 More information can be found in the [Apache documentation](http://httpd.apache.org/docs/trunk/howto/auth.html#gettingitworking).
 
-# Subscription management
-
-## Information
-
-**TODO**
-
-## Archival
-
-**TODO**
-
-## Login
-
-**TODO**
-
-## Advanced
-
-### Retrieve a truncated stream from within FreshRSS
-
-This question comes up regularly, so we'll try to clarify how one can retrieve a truncated RSS feed with FreshRSS. Please note that the process is absolutely not user friendly, but it works. :)
-
-Please be aware that this way you'll generate much more traffic to the originating sites, and they might block you accordingly. FreshRSS performance is also negatively affected, because you'll have to fetch the full article content one by one. So it's a feature to use sparingly!
-
-What's meant by "CSS path of articles on the original site" actually corresponds to the "path" consisting of IDs and classes (which in HTML, matches the id and class attributes) to retrieve only the interesting part that corresponds to the article. Ideally, this path starts with an id (which is unique to the page).
-
-#### Example: Rue89
-
-To find this path, you have to go to the address of one of the truncated articles (for example, http://www.rue89.com/2013/10/15/prof-maths-jai-atteint-lextase-dihn-pedagogie-inversee-246635). You look have to look for the "block" of HTML that corresponds to article content (in the source code!).
-
-Here we find that the block that encompasses nothing but the content of the article is ```<div class="content clearfix">```. We'll only use the `.content` class here. Nevertheless, as said above, it's best to start the path with an id. If we go back to the parent block, we find ```<div id="article">``` and that's perfect! The path will be ```#article .content```.
-
-#### Add the corresponding classes to the article CSS path on the feed configuration page. Examples:
-
-*  Rue89: ```#article .content```
-*  PCINpact: ```#actu_content```
-*  Lesnumériques: ```article#body div.text.clearfix```
-*  Phoronix: ```#main .content```
-
-#### Combining CSS Classes
-Let's say we have an article which contains ads within its content, and we do not want to have those ads retrieved by FreshRSS. Example Source Code:
-```
-<div id='article'>
-<h2>wanted</h2>
-<p class='content'>wanted content</p>
-<p class='ad'>unwanted content</p>
-<h2>wanted</h2>
-<p class='content'>wanted content</p>
-<h2>wanted</h2>
-<p class='ad'>unwanted content</p>
-<p class='content'>wanted content</p>
-</div>
-```
-In this case it's possible to combine multiple CSS selectors with a comma: ```#article p.content, #article h2```
-
-### Retrieve a truncated stream with external tools
-
-Complimentary tools can be used to retrieve full article content, such as:
-
-* [RSS-Bridge](https://github.com/RSS-Bridge/rss-bridge)
-* [Full-Text RSS](https://bitbucket.org/fivefilters/full-text-rss)
diff --git a/docs/en/users/06_Fever_API.md b/docs/en/users/06_Fever_API.md
deleted file mode 100644
index 0a0da90a5..000000000
--- a/docs/en/users/06_Fever_API.md
+++ /dev/null
@@ -1,110 +0,0 @@
-# FreshRSS - Fever API implementation
-
-See the [page about our Google Reader compatible API](06_Mobile_access.md) for another possibility
-and general aspects of API access.
-
-## RSS clients
-
-There are many RSS clients that support the Fever API, but they seem to understand the Fever API a bit differently.
-If your favourite client doesn't work properly with this API, please create an issue and we'll have a look.
-But we can **only** do that for free clients.
-
-### Usage & Authentication
-
-Before you can start using this API, you have to enable and setup API access, which is [documented here](https://freshrss.github.io/FreshRSS/en/users/06_Mobile_access.html),
-and then reset the user’s API password.
-
-Then point your mobile application to the `fever.php` address (e.g. `https://freshrss.example.net/api/fever.php`).
-
-## Compatible clients
-
-| App                                                                                | Platform            | License                                            |
-|:----------------------------------------------------------------------------------:|:-------------------:|:--------------------------------------------------------:|
-|[Fluent Reader](https://hyliu.me/fluent-reader/)                                    |Windows, Linux, macOS|[BSD-3-Clause](https://github.com/yang991178/fluent-reader/blob/master/LICENSE)|
-|[Readably](https://play.google.com/store/apps/details?id=com.isaiasmatewos.readably)|Android              |Closed Source                                             |
-|[Fiery Feeds](https://apps.apple.com/app/fiery-feeds-rss-reader/id1158763303)       |iOS                  |Closed Source                                             |
-|[Unread](https://apps.apple.com/app/unread-rss-reader/id1252376153)                 |iOS                  |Closed Source                                             |
-|[Reeder](https://www.reederapp.com/)                                                |iOS                  |Closed Source                                              |
-|[ReadKit](https://apps.apple.com/app/readkit/id588726889)                           |macOS                |Closed Source                                              |
-
-## Features
-
-The following features are implemented:
-
-* fetching categories
-* fetching feeds
-* fetching RSS items (new, favorites, unread, by_id, by_feed, by_category, since)
-* fetching favicons
-* setting read marker for item(s)
-* setting starred marker for item(s)
-* setting read marker for feed
-* setting read marker for category
-* supports FreshRSS extensions, which use the `entry_before_display` hook
-
-The following features are not supported:
-
-* **Hot Links** aka **hot** as there is nothing in FreshRSS yet that is similar or could be used to simulate it.
-
-## Testing and debugging
-
-If this API does not work as expected in your RSS reader, you can test it manually with a tool like [Postman](https://www.getpostman.com/).
-
-Configure a POST request to the URL https://freshrss.example.net/api/fever.php?api which should give you the result:
-```json
-{
-	"api_version": 3,
-	"auth": 0
-}
-```
-Great, the base setup seems to work!
-
-Now lets try an authenticated call. Fever uses an `api_key`, which is the MD5 hash of `"$username:$apiPassword"`.
-Assuming the user is `kevin` and the password `freshrss`, here is a command-line example to compute the resulting `api_key`
-
-```sh
-api_key=`echo -n "kevin:freshrss" | md5sum | cut -d' ' -f1`
-```
-
-Add a body to your POST request encoded as `form-data` and one key named `api_key` with the value `your-password-hash`:
-
-```sh
-curl -s -F "api_key=$api_key" 'https://freshrss.example.net/api/fever.php?api'
-```
-
-This should give:
-```json
-{
-	"api_version": 3,
-	"auth": 1,
-	"last_refreshed_on_time": "1520013061"
-}
-```
-Perfect, you're now authenticated and you can start testing the more advanced features. To do so, change the URL and append the possible API actions to your request parameters. Please refer to the [original Fever documentation](https://feedafever.com/api) for more information.
-
-Some basic calls are:
-
-* https://freshrss.example.net/api/fever.php?api&items
-* https://freshrss.example.net/api/fever.php?api&feeds
-* https://freshrss.example.net/api/fever.php?api&groups
-* https://freshrss.example.net/api/fever.php?api&unread_item_ids
-* https://freshrss.example.net/api/fever.php?api&saved_item_ids
-* https://freshrss.example.net/api/fever.php?api&items&since_id=some_id
-* https://freshrss.example.net/api/fever.php?api&items&max_id=some_id
-* https://freshrss.example.net/api/fever.php?api&mark=item&as=read&id=some_id
-* https://freshrss.example.net/api/fever.php?api&mark=item&as=unread&id=some_id
-
-Replace `some_id` with a real ID from your `freshrss_username_entry` database.
-
-### Debugging
-
-If nothing helps and your client is still misbehaving, you can add the following lines to the beginning of the `fever.api` file to determine the cause of the problems:
-
-```php
-file_put_contents(__DIR__ . '/fever.log', $_SERVER['HTTP_USER_AGENT'] . ': ' . json_encode($_REQUEST) . PHP_EOL, FILE_APPEND);
-```
-
-Then use your RSS client to query the API and afterwards check the file `fever.log`.
-
-## Credits
-
-This plugin was inspired by the [tinytinyrss-fever-plugin](https://github.com/dasmurphy/tinytinyrss-fever-plugin).
diff --git a/docs/en/users/06_Mobile_access.md b/docs/en/users/06_Mobile_access.md
index 1becaf324..d635c5620 100644
--- a/docs/en/users/06_Mobile_access.md
+++ b/docs/en/users/06_Mobile_access.md
@@ -30,7 +30,7 @@ See the [page about the Fever compatible API](06_Fever_API.md) for another possi
 	* With __Apache__:
 		* If you get *FAIL getallheaders!*, the combination of your PHP version and your Web server does not provide access to [`getallheaders`](http://php.net/getallheaders)
 			* Turn on Apache `mod_setenvif` (often enabled by default), or `mod_rewrite` with the following procedure:
-				* Allow [`FileInfo` in `.htaccess`](http://httpd.apache.org/docs/trunk/mod/core.html#allowoverride): see the [server setup](../admins/02_Installation.md) again.
+				* Allow [`FileInfo` in `.htaccess`](http://httpd.apache.org/docs/trunk/mod/core.html#allowoverride): see the [server setup](../admins/03_Installation.md) again.
 				* Enable [`mod_rewrite`](http://httpd.apache.org/docs/trunk/mod/mod_rewrite.html):
 					* With Debian / Ubuntu: `sudo a2enmod rewrite`
 	* With __nginx__:
diff --git a/docs/en/users/07_Frequently_Asked_Questions.md b/docs/en/users/07_Frequently_Asked_Questions.md
index ff49226c9..c5f039f17 100644
--- a/docs/en/users/07_Frequently_Asked_Questions.md
+++ b/docs/en/users/07_Frequently_Asked_Questions.md
@@ -13,7 +13,7 @@ Of course, ```/i``` has a purpose! It's used for performance and usability:
 
 To increase security, FreshRSS is hosted in two sections. The first section is public (the `./p` folder) and the second section is private (everything else). Therefore the `robots.txt` file is located in the `./p` sub-folder.
 
-As explained in the [security section](/en/User_documentation/Installation/Security), it's highly recommended to make only the public section available at the domain level. With that configuration, `./p` is the root folder for http://demo.freshrss.org/, thus making `robots.txt` available at the root of the application.
+As explained in the [security section](../admins/09_AccessControl.html), it's highly recommended to make only the public section available at the domain level. With that configuration, `./p` is the root folder for http://demo.freshrss.org/, thus making `robots.txt` available at the root of the application.
 
 The same principle applies to `favicon.ico` and `.htaccess`.
 
@@ -37,7 +37,7 @@ Since the [1.8.0](https://github.com/FreshRSS/FreshRSS/releases/tag/1.8.0) relea
 ```sh
 ./cli/update_user.php --user <username> --password <password>
 ```
-For more information on that matter, please refer to the [dedicated documentation](../../cli/README.md).
+For more information on that matter, please refer to the [dedicated documentation](https://github.com/FreshRSS/FreshRSS/blob/master/cli/README.md).
 
 ## Permissions under SELinux