diff --git a/ChangeLog b/ChangeLog
index 75f2fcf379..118f373c1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,7 @@ phpMyAdmin - ChangeLog
 - issue #11914 Fix autoloading of phpseclib
 - issue #11880 Fixed rendering of missing extension error
 - issue #11923 Errors on Structure tab when user only has select access on certain columns
+- issue #11972 Missing documentation for $cfg['Servers'][$i]['favorite'] and $cfg['NumFavoriteTables']
 
 4.5.5.0 (not yet released)
 - issue        Undefined index: is_ajax_request
diff --git a/doc/config.rst b/doc/config.rst
index 5b2f316261..d08b84f245 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -727,7 +727,6 @@ Server connection settings
     of recent tables shown. When you select a table from the list, it will jump to
     the page specified in :config:option:`$cfg['NavigationTreeDefaultTabTable']`.
 
-
     Without configuring the storage, you can still access the recently used tables,
     but it will disappear after you logout.
 
@@ -739,6 +738,34 @@ Server connection settings
 
     This feature can be disabled by setting the configuration to ``false``.
 
+.. _favorite:
+.. config:option:: $cfg['Servers'][$i]['favorite']
+
+    :type: string or false
+    :default: ``''``
+
+    Since release 4.2.0 you can show a list of selected tables in the
+    navigation panel. It helps you to jump to the table directly, without
+    the need to select the database, and then select the table. When you
+    select a table from the list, it will jump to the page specified in
+    :config:option:`$cfg['NavigationTreeDefaultTabTable']`.
+    
+    You can add tables to this list or remove tables from it in database
+    structure page by clicking on the star icons next to table names. Using
+    :config:option:`$cfg['NumFavoriteTables']` you can configure the maximum
+    number of favorite tables shown.
+
+    Without configuring the storage, you can still access the favorite tables,
+    but it will disappear after you logout.
+
+    To allow the usage of this functionality persistently:
+
+    * set up :config:option:`$cfg['Servers'][$i]['pmadb']` and the phpMyAdmin configuration storage
+    * put the table name in :config:option:`$cfg['Servers'][$i]['favorite']` (e.g.
+      ``pma__favorite``)
+
+    This feature can be disabled by setting the configuration to ``false``.
+
 .. _table_uiprefs:
 .. config:option:: $cfg['Servers'][$i]['table_uiprefs']
 
@@ -1595,6 +1622,14 @@ Navigation panel setup
     The maximum number of recently used tables shown in the navigation
     panel. Set this to 0 (zero) to disable the listing of recent tables.
 
+.. config:option:: $cfg['NumFavoriteTables']
+
+    :type: integer
+    :default: 10
+
+    The maximum number of favorite tables shown in the navigation
+    panel. Set this to 0 (zero) to disable the listing of favorite tables.
+
 .. config:option:: $cfg['ZeroConf']
 
     :type: boolean