diff --git a/changelog.php b/changelog.php
index cdab79326b..9dc60b6a1a 100644
--- a/changelog.php
+++ b/changelog.php
@@ -79,7 +79,7 @@ $replaces = array(
// FAQ entries
'/FAQ ([0-9]+)\.([0-9a-z]+)/i'
- => 'FAQ \\1.\\2',
+ => 'FAQ \\1.\\2',
// linking bugs
'/bug\s*#?([0-9]{6,})/i'
diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index 8c87a44edc..6e4f912d86 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -538,14 +538,14 @@ class PMA_Util
/* Check if we have built local documentation */
if (defined('TESTSUITE')) {
/* Provide consistent URL for testsuite */
- return PMA_linkURL('https://docs.phpmyadmin.net/en/latest/' . $url);
+ return PMA_linkURL('http://docs.phpmyadmin.net/en/latest/' . $url);
} else if (file_exists('doc/html/index.html')) {
return './doc/html/' . $url;
} else if (defined('PMA_SETUP') && file_exists('../doc/html/index.html')) {
return '../doc/html/' . $url;
} else {
/* TODO: Should link to correct branch for released versions */
- return PMA_linkURL('https://docs.phpmyadmin.net/en/latest/' . $url);
+ return PMA_linkURL('http://docs.phpmyadmin.net/en/latest/' . $url);
}
}