diff --git a/README b/README
index 2c4ac2dfca..fb56a5b256 100644
--- a/README
+++ b/README
@@ -22,7 +22,7 @@ Copyright (C) 2001-2012
     Garvin Hicking <me_at_supergarv.de>
     Michael Keck <mkkeck_at_users.sourceforge.net>
     Sebastian Mendel <cybot_tm_at_users.sourceforge.net>
-    [check Documentation.txt/.html file for more details]
+    [check documentation for more details]
 
 License
 -------
@@ -50,7 +50,7 @@ Summary
 -------
 
 phpMyAdmin is intended to handle the administration of MySQL over the web.
-For a summary of features, please see the Documentation.txt/.html file.
+For a summary of features, please see the documentation in the doc folder.
 
 Download
 --------
@@ -60,7 +60,7 @@ You can get the newest version at http://www.phpmyadmin.net/.
 More Information
 ----------------
 
-Please see the Documentation.txt/.html file.
+Please see the documentation in the doc folder.
 
 Support
 -------
@@ -80,5 +80,5 @@ Please, don't send us emails with question like "How do I compile PHP with
 MySQL-support". We just don't have the time to be your free help desk.
 
 Please send your questions to the appropriate mailing lists / forums.  Before
-contacting us, please read the Documentation.html (esp. the FAQ part).
+contacting us, please read the documentation (especially the FAQ part).
 
diff --git a/changelog.php b/changelog.php
index 6fd3b050e4..a46ed76928 100644
--- a/changelog.php
+++ b/changelog.php
@@ -76,7 +76,7 @@ $replaces = array(
 
     // FAQ entries
     '/FAQ ([0-9]+)\.([0-9a-z]+)/i'
-    => '<a href="./Documentation.html#faq\\1_\\2">FAQ \\1.\\2</a>',
+    => '<a href="https://phpmyadmin.readthedocs.org/en/latest/faq.html#faq\\1-\\2">FAQ \\1.\\2</a>',
 
     // linking bugs
     '/bug\s*#?([0-9]{6,})/i'
diff --git a/config.sample.inc.php b/config.sample.inc.php
index 2a29eedc6d..54b809a893 100644
--- a/config.sample.inc.php
+++ b/config.sample.inc.php
@@ -4,8 +4,8 @@
  * phpMyAdmin sample configuration, you can use it as base for
  * manual configuration. For easier setup you can use setup/
  *
- * All directives are explained in Documentation.html and on phpMyAdmin
- * wiki <http://wiki.phpmyadmin.net>.
+ * All directives are explained in documentation in the doc/ folder
+ * or at <http://phpmyadmin.readthedocs.org/>.
  *
  * @package PhpMyAdmin
  */
@@ -135,7 +135,7 @@ $cfg['SaveDir'] = '';
 //$cfg['QueryHistoryMax'] = 100;
 
 /*
- * You can find more configuration options in Documentation.html
- * or here: http://wiki.phpmyadmin.net/pma/Config
+ * You can find more configuration options in the documentation
+ * in the doc/ folder or at <http://phpmyadmin.readthedocs.org/>.
  */
 ?>
diff --git a/examples/create_tables.sql b/examples/create_tables.sql
index 37b8e770ad..c3a62a20af 100644
--- a/examples/create_tables.sql
+++ b/examples/create_tables.sql
@@ -1,5 +1,5 @@
 -- --------------------------------------------------------
--- SQL Commands to set up the pmadb as described in Documentation.html.
+-- SQL Commands to set up the pmadb as described in the documentation.
 -- 
 -- This file is meant for use with MySQL 5 and above!
 -- 
diff --git a/examples/create_tables_drizzle.sql b/examples/create_tables_drizzle.sql
index d78c67ab73..21c24ca2bc 100644
--- a/examples/create_tables_drizzle.sql
+++ b/examples/create_tables_drizzle.sql
@@ -1,5 +1,5 @@
 -- --------------------------------------------------------
--- SQL Commands to set up the pmadb as described in Documentation.html.
+-- SQL Commands to set up the pmadb as described in the documentation.
 -- 
 -- This file is meant for use with Drizzle 2011.03.13 and above!
 -- 
diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php
index 0ec396b74f..2d33a24580 100644
--- a/libraries/Tracker.class.php
+++ b/libraries/Tracker.class.php
@@ -11,7 +11,6 @@ if (! defined('PHPMYADMIN')) {
 
 /**
  * This class tracks changes on databases, tables and views.
- * For more information please see phpMyAdmin/Documentation.html
  *
  * @package PhpMyAdmin
  *
@@ -82,10 +81,10 @@ class PMA_Tracker
         'RENAME TABLE','DROP TABLE','CREATE INDEX','DROP INDEX',
         'CREATE VIEW','ALTER VIEW','DROP VIEW'
     );
-    
-    
+
+
     /**
-     * Initializes settings. See phpMyAdmin/Documentation.html.
+     * Initializes settings.
      *
      * @static
      *
@@ -262,7 +261,7 @@ class PMA_Tracker
         include_once "libraries/plugin_interface.lib.php";
         $export_sql_plugin = PMA_getPlugin(
             "export",
-            "sql",    
+            "sql",
             'libraries/plugins/export/',
             array(
                 'export_type' => $export_type,
@@ -446,7 +445,7 @@ class PMA_Tracker
     static private function _changeTracking($dbname, $tablename,
         $version, $new_state
     ) {
-        
+
         $sql_query = " UPDATE " . self::$pma_table .
         " SET `tracking_active` = '" . $new_state . "' " .
         " WHERE `db_name` = '" . PMA_Util::sqlAddSlashes($dbname) . "' " .