From 061d53df35c6851b109ce2715e080841fe076ab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Mon, 12 Nov 2012 14:39:01 +0100
Subject: [PATCH] Group cookie parameters to one section

---
 doc/config.rst | 65 ++++++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/doc/config.rst b/doc/config.rst
index 4b7c73e0db..acbf6aa77b 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -104,22 +104,6 @@ Basic settings
 
     Show warning about incomplete translations on certain threshold.
 
-.. config:option:: $cfg['blowfish_secret']
-
-    :type: string
-    :default: ``''``
-
-    The "cookie" auth\_type uses blowfish algorithm to encrypt the
-    password. If you are using the "cookie" auth\_type, enter here a
-    random passphrase of your choice. It will be used internally by the
-    blowfish algorithm: you won’t be prompted for this passphrase. There
-    is no maximum length for this secret. 
-
-    Since version 3.1.0 phpMyAdmin
-    can generate this on the fly, but it makes a bit weaker security as
-    this generated secret is stored in session and furthermore it makes
-    impossible to recall user name from cookie.
-
 Server connection settings
 --------------------------
 
@@ -1154,6 +1138,40 @@ Generic settings
     Whether a warning ("Are your really sure...") should be displayed when
     you're about to lose data.
 
+.. config:option:: $cfg['UseDbSearch']
+
+    :type: boolean
+    :default: true
+
+    Define whether the "search string inside database" is enabled or not.
+
+.. config:option:: $cfg['IgnoreMultiSubmitErrors']
+
+    :type: boolean
+    :default: false
+
+    Define whether phpMyAdmin will continue executing a multi-query
+    statement if one of the queries fails. Default is to abort execution.
+
+Cookie authentication options
+-----------------------------
+
+.. config:option:: $cfg['blowfish_secret']
+
+    :type: string
+    :default: ``''``
+
+    The "cookie" auth\_type uses blowfish algorithm to encrypt the
+    password. If you are using the "cookie" auth\_type, enter here a
+    random passphrase of your choice. It will be used internally by the
+    blowfish algorithm: you won’t be prompted for this passphrase. There
+    is no maximum length for this secret. 
+
+    Since version 3.1.0 phpMyAdmin
+    can generate this on the fly, but it makes a bit weaker security as
+    this generated secret is stored in session and furthermore it makes
+    impossible to recall user name from cookie.
+
 .. config:option:: $cfg['LoginCookieRecall']
 
     :type: boolean
@@ -1196,21 +1214,6 @@ Generic settings
     otherwise only for current one. Setting this to false makes it easy to
     forget to log out from other server, when you are using more of them.
 
-.. config:option:: $cfg['UseDbSearch']
-
-    :type: boolean
-    :default: true
-
-    Define whether the "search string inside database" is enabled or not.
-
-.. config:option:: $cfg['IgnoreMultiSubmitErrors']
-
-    :type: boolean
-    :default: false
-
-    Define whether phpMyAdmin will continue executing a multi-query
-    statement if one of the queries fails. Default is to abort execution.
-
 .. _AllowArbitraryServer:
 .. config:option:: $cfg['AllowArbitraryServer']