[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5_1-7257-g2c345d1

[Marc Delisle]

The branch, master has been updated
       via  2c345d10873d4be23b3e1b5e80f86b669b1510d6 (commit)
      from  82acbb2ba3c9aed9f934650575666920e2fd9bab (commit)


- Log -----------------------------------------------------------------
commit 2c345d10873d4be23b3e1b5e80f86b669b1510d6
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Aug 21 08:09:24 2010 -0400

    credit for user preferences; new terminology (configuration storage)

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

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

diff --git a/Documentation.html b/Documentation.html
index 7077d2a..0b0a29b 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1155,7 +1155,8 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         To allow the usage of this functionality:
 
         <ul>
-            <li>set up <a href="#pmadb">pmadb</a> and the linked-tables infrastructure</li>
+            <li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin
+            configuration storage</li>
             <li>put the table name in <tt>$cfg['Servers'][$i]['userconfig']</tt></li>
         </ul>
     </dd>
@@ -4831,9 +4832,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
   <li>BLOBstreaming support</li>
 </ul></li>
 
-<li>Piotr Przybylski (Google Summer of Code 2008)
+<li>Piotr Przybylski (Google Summer of Code 2008 and 2010)
 <ul>
   <li>improved setup script</li>
+  <li>user preferences</li>
 </ul></li>
 
 <li>Derek Schaefer (Google Summer of Code 2009)


hooks/post-receive
-- 
phpMyAdmin