+
+```
+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 ```wanted
+wanted content
+unwanted content
+wanted
+wanted content
+wanted
+unwanted content
+wanted content
+```. 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 ```
``` 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:
-```
- --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
-
-```
-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_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 wanted
-wanted content
-unwanted content
-wanted
-wanted content
-wanted
-unwanted content
-wanted content
-