Merge remote-tracking branch 'origin/master' into 2.3

diff --git a/app/config/config.yml b/app/config/config.yml
index 73bf0a0d2cdcc3518c486c67dbc7331db7b9e543..9792616ec97e0182b8a0d3060215702af1630c41 100644 (file)
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -59,7 +59,7 @@ wallabag_core:
     action_mark_as_read: 1
     list_mode: 0
     fetching_error_message: |
-        wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
+        wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
     api_limit_mass_actions: 10
 
 wallabag_user:

diff --git a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
index 6494f348061a442dc6e9361f4013cd66591df2e9..77dfd5bf91404544d5ddbd2232adb429da3fa94f 100644 (file)
--- a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
+++ b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
@@ -12,7 +12,7 @@ use Wallabag\CoreBundle\Helper\RuleBasedTagger;
 
 class ContentProxyTest extends \PHPUnit_Framework_TestCase
 {
-    private $fetchingErrorMessage = 'wallabag can\'t retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.';
+    private $fetchingErrorMessage = 'wallabag can\'t retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.';
 
     public function testWithBadUrl()
     {