From 8a153086a17cbc97423290b4fe7cfdf6f75e64a1 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 7 Jul 2010 06:13:06 -0400
Subject: [PATCH 1/3] revert to previous value and add a comment in default
 configuration file

---
 libraries/config.default.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/config.default.php b/libraries/config.default.php
index eea22aa41..1f2e35ba8 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -580,11 +580,12 @@ $cfg['Confirm'] = true;
 $cfg['LoginCookieRecall'] = true;
 
 /**
- * validity of cookie login (in seconds; 1800 seconds is 30 minutes)
+ * validity of cookie login (in seconds; 1440 matches php.ini's
+ * session.gc_maxlifetime)
  *
  * @global integer $cfg['LoginCookieValidity']
  */
-$cfg['LoginCookieValidity'] = 1800;
+$cfg['LoginCookieValidity'] = 1440;
 
 /**
  * how long login cookie should be stored (in seconds)

From 3d23bcf1daf93f8ffb462112e0b62260a7c62e76 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 7 Jul 2010 07:03:31 -0400
Subject: [PATCH 2/3] improve English

---
 Documentation.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 1afb49715..79ca8b1e6 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1346,8 +1346,8 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
     <dd>Define how long is login cookie valid. Please note that php
         configuration option <a href="http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime">session.gc_maxlifetime</a> 
         might limit session validity and if session is lost, login cookie is
-        also invalidated. So it is good idea to set <code>session.gc_maxlifetime</code> 
-        at least as high is $cfg['LoginCookieValidity'] is set.</dd>
+        also invalidated. So it is a good idea to set <code>session.gc_maxlifetime</code> 
+        not lower than the value of $cfg['LoginCookieValidity'].</dd>
 
     <dt id="cfg_LoginCookieStore">$cfg['LoginCookieStore'] integer [number of seconds]</dt>
     <dd>Define how long is login cookie should be stored in browser. Default 0

From 104b0ee99ac77845511c91dcaefe4f315c3c4435 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 7 Jul 2010 09:44:44 -0400
Subject: [PATCH 3/3] remove reference to some old stuff

---
 Documentation.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 79ca8b1e6..5155da9c7 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -396,7 +396,7 @@ rm -rf config                      # remove not needed directory
         In cookie mode, the password is stored, encrypted with the blowfish
         algorithm, in a temporary cookie.</li>
 
-    <li>Note: starting with phpMyAdmin 2.6.1, this section is only applicable if
+    <li>Note: this section is only applicable if
         your MySQL server is running with <tt>--skip-show-database</tt>.<br /><br />
 
         For '<abbr title="HyperText Transfer Protocol">HTTP</abbr>' and 'cookie'
@@ -715,7 +715,7 @@ since this link provides funding for phpMyAdmin.
     <dd>This special account is used for 2 distinct purposes: to make possible
         all relational features (see
         <a href="#pmadb" class="configrule">$cfg['Servers'][$i]['pmadb']</a>)
-        and, for a MySQL server previous to 4.1.2 or running with
+        and, for a MySQL server running with
         <tt>--skip-show-database</tt>, to enable a multi-user installation
         (<abbr title="HyperText Transfer Protocol">HTTP</abbr> or cookie
         authentication mode).<br /><br />