diff --git a/faq.rst b/faq.rst
index c7f2c1bbf1..0ad471ea9f 100644
--- a/faq.rst
+++ b/faq.rst
@@ -1737,7 +1737,7 @@ name), but the following variables can be used:
 ``@SERVER@``
     MySQL server name
 ``@VERBOSE@``
-    Verbose MySQL server name as defined in :ref:`cfg_Servers_verbose`
+    Verbose MySQL server name as defined in :config:option:`$cfg['Servers'][$i]['verbose']`
 ``@VSERVER@``
     Verbose MySQL server name if set, otherwise normal
 ``@DATABASE@``
diff --git a/setup.rst b/setup.rst
index 73037b7581..6fbbf7c3f1 100644
--- a/setup.rst
+++ b/setup.rst
@@ -299,7 +299,7 @@ the database *user_base*:
    
 What the user may now do is controlled entirely by the MySQL user management
 system. With HTTP or cookie authentication mode, you don't need to fill the
-user/password fields inside the :ref:`cfg_Servers`.
+user/password fields inside the :config:option:`$cfg['Servers']`.
 
 
 ':abbr:`HTTP (HyperText Transfer Protocol)`' authentication mode