Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6

phpmyadmin · Feb 18, 2016 · fa385aa · fa385aa
2 parents e6ca1ee + 4a402c3
commit fa385aa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/doc/config.rst b/doc/config.rst
@@ -41,7 +41,7 @@ Basic settings
     :type: string
     :default: ``''``
 
-    .. versionremoved:: 4.6.0
+    .. deprecated:: 4.6.0
 
         This setting is no longer available since phpMyAdmin 4.6.0. Please
         adjust your webserver instead.
@@ -1306,7 +1306,7 @@ Generic settings
     :type: boolean
     :default: false
 
-    .. versionremoved:: 4.6.0
+    .. deprecated:: 4.6.0
 
         This setting is no longer available since phpMyAdmin 4.6.0. Please
         adjust your webserver instead.