The branch, master has been updated via e05ced2a2163c05fea8c21795b01d62fae2e8165 (commit) via 122d86c1c5ef058f45b993fd55908d165d5decc7 (commit) from 3c05f0792d9375f0f9dc3a4d6f7bf772bf4323ae (commit)

- Log ----------------------------------------------------------------- commit e05ced2a2163c05fea8c21795b01d62fae2e8165 Merge: 3c05f0792d9375f0f9dc3a4d6f7bf772bf4323ae 122d86c1c5ef058f45b993fd55908d165d5decc7 Author: Marc Delisle marc@infomarc.info Date: Tue Jun 8 12:41:56 2010 -0400

Merge branch 'QA_3_3'

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

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

diff --git a/ChangeLog b/ChangeLog index 0189e96..2a60fbe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,8 @@ $Id$ "Would you like to delete..." option - bug [privileges] List of tables not shown when the db name has a wildcard - bug #3011126 [display] Edit link missing after long query +- patch #3013264 [doc] FAQ 1.40 uses a comma instead of a period, + thanks to Isaac Bennetch - ibennetch

3.3.3.0 (2010-05-10) - patch #2982480 [navi] Do not group if there would be one table in group, diff --git a/Documentation.html b/Documentation.html index 659cd68..d1d589d 100644 --- a/Documentation.html +++ b/Documentation.html @@ -3141,7 +3141,7 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L] in your Apache configuration. See <a href="http://httpd.apache.org/docs/2.0/mod/mod_ssl.html#ssloptions">http://httpd.apache.org/docs/2.0/mod/mod_ssl.html#ssloptions</a>.</p>

<h4 id="faq1_40"> - <a href="#faq1_40">1.40 When accessing phpMyAdmin via an Apache reverse proxy, cookie login does not work,</a></h4> + <a href="#faq1_40">1.40 When accessing phpMyAdmin via an Apache reverse proxy, cookie login does not work.</a></h4>

<p>To be able to use cookie auth Apache must know that it has to rewrite the set-cookie headers.<br /> Example from the Apache 2.2 documentation:</p>

hooks/post-receive