documentation utilisateur / user doc (#2948)

* Update 04_Subscriptions.md

- ajouter un flux
- import/export

* Update 04_Subscriptions.md

* Update 04_Subscriptions.md

* Update 04_Subscriptions.md

Translated in english from https://github.com/Saimyx/FreshRSS/edit/master/docs/fr/users/04_Subscriptions.md

* Update 04_Subscriptions.md

* Update docs/en/users/04_Subscriptions.md

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* Update docs/en/users/04_Subscriptions.md

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* Update docs/en/users/04_Subscriptions.md

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* Update docs/en/users/04_Subscriptions.md

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* Update docs/en/users/04_Subscriptions.md

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* Update docs/en/users/04_Subscriptions.md

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* Update docs/en/users/04_Subscriptions.md

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* Update docs/en/users/04_Subscriptions.md

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* Update docs/en/users/04_Subscriptions.md

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* Update docs/en/users/04_Subscriptions.md

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* Update docs/en/users/04_Subscriptions.md

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* Update docs/en/users/04_Subscriptions.md

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* Update docs/fr/users/04_Subscriptions.md

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* Update 04_Subscriptions.md

* Update docs/en/users/04_Subscriptions.md

* Update docs/en/users/04_Subscriptions.md

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* Update docs/en/users/04_Subscriptions.md

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* Update docs/en/users/04_Subscriptions.md

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* Update docs/en/users/04_Subscriptions.md

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* Language improvements

* Language improvements

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>

1 files changed, 34 insertions, 8 deletions

diff --git a/docs/en/users/04_Subscriptions.md b/docs/en/users/04_Subscriptions.md
index be8efe0a6..a9e03e86d 100644
--- a/docs/en/users/04_Subscriptions.md
+++ b/docs/en/users/04_Subscriptions.md
@@ -1,19 +1,45 @@
 # Adding a feed
 
-**TODO**
+ 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.
+ 4. (optional): You can select the category for your feed. By default, it will be in “Uncategorized”.
 
 # Import and export
-
-**TODO**
-
+See [SQLite export/import]( https://github.com/FreshRSS/FreshRSS/tree/master/cli) as an alternative.
+
+## Export
+
+ 1. To export your list of feeds, go to “Subscriptions management”.
+ 2. Click on “Import / export”
+ 3. You can select for your export:
+    1. the list of feeds
+    2. labelled articles
+    3. favourite articles
+    4. and finally, you can select feeds you want to export (by default, all feeds are selected)
+ 4. Click on “export”.
+
+ ## Import
+ 
+  1. Go to the page “Import / export”.
+  2. Click on “Browse” and select your OPML or archive file on your computer.
+  3. Click on “Import”
+  
 # Use bookmarklet
 
 Bookmarklets are little scripts that you can execute to perform various tasks. FreshRSS offers a bookmarklet for subscribing to newsfeeds.
 
- 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.
+ 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
 
-**TODO**
+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”.