[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-19918-g4ba58c7

[Marc Delisle]

The branch, master has been updated
       via  4ba58c71d51cdc2c3863a3aad867c28228977914 (commit)
       via  22aaa6d9c5f75178de75b1f582cc65afef40970a (commit)
       via  3b785592282105780330c99432f5529c3dbe7b49 (commit)
      from  1a3fe624940d9101adab7fda1ad05b35f5631f20 (commit)


- Log -----------------------------------------------------------------
commit 4ba58c71d51cdc2c3863a3aad867c28228977914
Merge: 1a3fe62 22aaa6d
Author: Marc Delisle <marc at infomarc.info>
Date:   Mon Sep 26 12:31:18 2011 -0400

    Fix merge conflicts

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

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

diff --git a/Documentation.html b/Documentation.html
index 293728c..af27b89 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -4271,7 +4271,7 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal');
     <a href="#faq6_22">6.22 Bookmarks: Can I execute a default bookmark
     automatically when entering Browse mode for a table?</a></h4>
 
-<p> Yes. If a bookmark has the same label as a table name, it will be executed.
+<p> Yes. If a bookmark has the same label as a table name and it's not a public bookmark, it will be executed.
 </p>
 
 <h4 id="faq6_23">


hooks/post-receive
-- 
phpMyAdmin