Removed affinity explanation from permission, add it in features

pages/10.DisHub/04.Permissions/docs.en.md

@@ -367,40 +367,6 @@ Just click on **Show** o **Don't show** for each connection to which to want to
 
 ----------
 
-## Affinity
-### What is it?
-When you create a connection, you set an affinity with it: that means you decide the degree of friendship or acquaintance you want to have with this channel.
-
-### How to set the affinity level of my connections?
-**By default, this is set to *All*.** If you want to change it, go on the **connection page** by clicking on the connection icon ![connection_icon](en/connection_icon.png)
-
-On connection that you want to modify, click on *Edit*
-![connection_disroot](en/connection_disroot.png)
-
-Then, click on **Set Affinity & Profile**.
-![affinity_set](en/set_affinity.gif)
-
-The slider appears : select the degree of friendship you want to set with the connnection. Think of this as a measure of how much you like or dislike it and how much you want to see this connection's posts.
-
-Even if you see *Me, Family, Friends*, you can set the slider anywhere between 1 (for people you like) and 99 (for people you don't care for). Don't forget to *Submit*.
-
-**Warning: affinity has no relation to permissions.**
-
-### What is it used for? The Affinity slider
-Once you've assigned a value to your connection, you can use the **affinity tool** on the **network page** ![network_icon](en/network_icon.png) to **filter content** based on the affinity level you set.
-
-Moving the slider from *Me* to *All* allows you to filter what you see on the network page: posts will only be shown from people who fall between this range.
-
-For example, setting the affinity tool slider to *friends* will allow you to see only the posts from your connections with an affinity set to *friend*.
-![affinity_filter](en/affinity_filter.gif)
-
-### How to enable the affinity slider?
-Go to the **Settings** and to the **Additional features** tab. Click on **Network and Stream Filtering**.
-Set **Affinity Tool** to on. Don't forget to *Submit*.
-![activate_affinity](en/activate_affinity.gif)
-
-----------
-
 <a name="tokens"></a>
 ## Guest Access Tokens
 ### What is it?

pages/10.DisHub/07.Features/Connection_filtering/docs.en.md

@@ -7,8 +7,42 @@ taxonomy:
 page-toc:
      active: false
 ---
+## Affinity
+### What is it?
+When you create a connection, you set an affinity with it: that means you decide the degree of friendship or acquaintance you want to have with this channel.
 
-You can filter exactly what you want or what you don't want in your activity stream. You do this by editing the connection and select the **Custom Filter** tab. In here you can set filters on what you want to appear and/or filters on what you don't want to appear  
+### How to set the affinity level of my connections?
+**By default, this is set to *All*.** If you want to change it, go on the **connection page** by clicking on the connection icon ![connection_icon](en/connection_icon.png)
+
+On connection that you want to modify, click on *Edit*
+![connection_disroot](en/connection_disroot.png)
+
+Then, click on **Set Affinity & Profile**.
+![affinity_set](en/set_affinity.gif)
+
+The slider appears : select the degree of friendship you want to set with the connnection. Think of this as a measure of how much you like or dislike it and how much you want to see this connection's posts.
+
+Even if you see *Me, Family, Friends*, you can set the slider anywhere between 1 (for people you like) and 99 (for people you don't care for). Don't forget to *Submit*.
+
+**Warning: affinity has no relation to permissions.**
+
+### What is it used for? The Affinity slider
+Once you've assigned a value to your connection, you can use the **affinity tool** on the **network page** ![network_icon](en/network_icon.png) to **filter content** based on the affinity level you set.
+
+Moving the slider from *Me* to *All* allows you to filter what you see on the network page: posts will only be shown from people who fall between this range.
+
+For example, setting the affinity tool slider to *friends* will allow you to see only the posts from your connections with an affinity set to *friend*.
+![affinity_filter](en/affinity_filter.gif)
+
+### How to enable the affinity slider?
+Go to the **Settings** and to the **Additional features** tab. Click on **Network and Stream Filtering**.
+Set **Affinity Tool** to on. Don't forget to *Submit*.
+![activate_affinity](en/activate_affinity.gif)
+
+----------
+
+## Custom Filter per connection
+You can filter exactly what you want to appear or not in your activity stream. You do this by editing the connection and select the **Custom Filter** tab. In here you can set filters on what you want to appear and/or filters on what you don't want to appear  
 ![ConnectionFilter](en/ConnectionFilter.gif)  
 
 For example you can filter: