[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5328-gf95dc8d

[Marc Delisle]

The branch, master has been updated
       via  f95dc8d8a1ee0221e330d72fe4f2857f52b2f463 (commit)
       via  3d23bcf1daf93f8ffb462112e0b62260a7c62e76 (commit)
      from  d4f6b5c4ba7932c7ada66080d2a5351cc046447c (commit)


- Log -----------------------------------------------------------------
commit f95dc8d8a1ee0221e330d72fe4f2857f52b2f463
Merge: d4f6b5c4ba7932c7ada66080d2a5351cc046447c 3d23bcf1daf93f8ffb462112e0b62260a7c62e76
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jul 7 07:04:04 2010 -0400

    Merge branch 'QA_3_3'

-----------------------------------------------------------------------

Summary of changes:
 Documentation.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation.html b/Documentation.html
index 7e945db..755308b 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1361,8 +1361,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


hooks/post-receive
-- 
phpMyAdmin