Merge branch 'release'

.gitignore

@@ -10,6 +10,7 @@ config/plugins/admin.yaml
 config/security.yaml
 config/plugins/git-sync.yaml
 localhost/config/*
+config/site.yaml
 
 
 # OS Generated

pages/02.general/01.adguard-ad-filters/docs.en.md

@@ -14,6 +14,7 @@ visible: true
 *   [Filter for useful ads](#useful)
 *   [Russian filter](#russian)
 *   [German filter](#german)
+*   [French filter](#french)
 *   [Japanese filter](#japanese)
 *   [Dutch filter](#dutch)
 *   [Spanish/Portuguese filter](#spanish)
@@ -114,6 +115,16 @@ Filter that enables removing of the ads from websites with German content. Orig
 
 
 
+<a name="french"></a>
+
+## French filter
+
+Filter that enables removing of the ads from websites with French content. Originally based on the [Liste FR](https://forums.lanik.us/viewforum.php?f=91) filter. Modified by us according to the complaints from users. This filter is licensed under the [Creative Commons Attribution-ShareAlike 3.0 Unported](https://creativecommons.org/licenses/by-sa/3.0/) license.
+
+[View all the rules](https://filters.adtidy.org/extension/chromium/filters/16.txt)
+
+
+
 <a name="japanese"></a>
 
 ## Japanese filter

pages/02.general/01.adguard-ad-filters/docs.ru.md

@@ -14,6 +14,7 @@ visible: true
 *   [Фильтр полезной рекламы](#useful)
 *   [Русский фильтр](#russian)
 *   [Немецкий фильтр](#german)
+*   [Французский фильтр](#french)
 *   [Японский фильтр](#japanese)
 *   [Голландский фильтр](#dutch)
 *   [Испано-Португальский фильтр](#spanish)
@@ -114,6 +115,16 @@ visible: true
 
 
 
+<a id="french"></a>
+
+## Французский фильтр
+
+Фильтр, позволяющий убрать рекламу с сайтов на французском языке. Изначально основан на фильтре [Liste FR](https://forums.lanik.us/viewforum.php?f=91). Дорабатывается нами исходя из жалоб и сообщений пользователей. Фильтр опубликован под лицензией [Creative Commons Attribution-ShareAlike 3.0 Unported](https://creativecommons.org/licenses/by-sa/3.0/).
+
+[Посмотреть все правила](https://filters.adtidy.org/extension/chromium/filters/16.txt)
+
+
+
 <a id="japanese"></a>
 
 ## Японский фильтр

pages/02.general/useful-ads/docs.en.md

@@ -0,0 +1,49 @@
+---
+title: 'What is "Useful ads"?'
+published: false
+visible: false
+---
+
+## Useful ads
+
+**Disclaimer.** The term *'Useful ads'* doesn't imply that we have any kind of 'acceptable ads' program like Adblock Plus and some other adblockers, where they take money for leaving certain ads unblocked. This is not the case. We are not being paid for showing these ads, and we call them 'useful' and not 'acceptable' for a reason - they can be, in fact, helpful. This only refers to search ads and self-promotional ads.
+
+Just to make it absolutely clear - this is **completely optional**. You can turn off the display of these ads at any time with no penalty whatsoever. Further we will explain which ads we consider useful.
+
+### Search ads and why we consider them useful
+
+Search ads are ads that you see among the results of a search query when using an online search engine like Google, Bing, DuckDuckGo etc. 
+
+<img .......>
+
+These ads are always contextual, i.e. they are targeted to match whatever keywords you had used when you made the query. It helps you to find exactly what you are searching for. Moreover, search ads are often more relevant and helpful than the rest of the search results due to being manually moderated.  
+
+Another argument in defense of search ads is that they are much less intrusive than many other ad formats.
+
+### What is websites' self-promotion?
+
+Basically, when an ad on a website is promoting this very website or other websites/social media/etc closely related to it, such ad is considered a self-promoting.
+
+<img .......>
+
+Our stance here is very similar to EasyList policy regarding self-promoting ads. According to our [filter policy](https://kb.adguard.com/general/adguard-filter-policy) we should not block these ads (but we also shouldn't unblock them if it would lead to another third-party ad to be shown).
+
+Partly, this is due to ethical reasons, but mostly because such ads are rarely too intrusive and are often useful for the visitor of the website (who is supposedly interested in this website's content). 
+
+### What ads are on the list?
+
+When you enable 'Useful ads', the search ads in the following search engines are unblocked:
+
+* Google
+* Yahoo
+* Bing
+* Ask
+* Yandex
+* DuckDuckGo
+* StartPage.
+
+As well as all self-promoting ads that satisfy our filter policy.
+
+### Summary
+
+'Allow useful ads' is a 100% optional feature that can be helpful in some cases, and if you don't like it, you are free to disable it at any time. There are no and will never be any types of ads or individual ads included in there, which do not fall under one of the two categories described above.