30 Jun
2010
30 Jun
'10
9:36 a.m.
The branch, master has been updated
via 63b6abb326a5795850e9dfeb469873db38bc92a4 (commit)
via b2fdf039db1ec34aea802b722bf5ce51b12c1f0b (commit)
from 0f9dfaca8605b9aa1f01bee92ada6d482d3f2886 (commit)
- Log -----------------------------------------------------------------
commit 63b6abb326a5795850e9dfeb469873db38bc92a4
Merge: 0f9dfaca8605b9aa1f01bee92ada6d482d3f2886 b2fdf039db1ec34aea802b722bf5ce51b12c1f0b
Author: Marc Delisle <marc(a)infomarc.info>
Date: Wed Jun 30 09:36:11 2010 -0400
Merge branch 'QA_3_3'
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index 460915a..3c12424 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -946,7 +946,8 @@ since this link provides funding for phpMyAdmin.
table. To allow the usage of this functionality:
<ul><li>set up <a href="#pmadb">pmadb</a> and
the linked-tables infrastructure</li>
<li>put the table name in
-
<tt>$cfg['Servers'][$i]['table_info']</tt></li>
+ <tt>$cfg['Servers'][$i]['table_info']</tt>
(e.g.
+ 'pma_table_info')</li>
<li>then for each table where you want to use this feature,
click "Structure/Relation view/Choose column to
display"
to choose the column.</li>
@@ -1005,7 +1006,8 @@ since this link provides funding for phpMyAdmin.
<ul><li>set up <a href="#pmadb">pmadb</a> and
the linked-tables
infrastructure</li>
<li>put the table name in
-
<tt>$cfg['Servers'][$i]['column_info']</tt></li>
+ <tt>$cfg['Servers'][$i]['column_info']</tt>
(e.g.
+ 'pma_column_info')</li>
<li>to update your PRE-2.5.0 Column_comments Table use this:
<pre>
@@ -1045,6 +1047,7 @@ ALTER TABLE `pma_column_comments`
<ul><li>set up <a href="#pmadb">pmadb</a> and
the linked-tables
infrastructure</li>
<li>put the table name in
<tt>$cfg['Servers'][$i]['history']</tt>
+ (e.g. 'pma_history')
</li>
</ul>
</dd>
@@ -1075,7 +1078,7 @@ ALTER TABLE `pma_column_comments`
<ul>
<li>set up <a href="#pmadb">pmadb</a> and the
linked-tables infrastructure</li>
- <li>put the table name in
<tt>$cfg['Servers'][$i]['tracking']</tt></li>
+ <li>put the table name in
<tt>$cfg['Servers'][$i]['tracking']</tt> (e.g.
'pma_tracking')</li>
</ul>
</dd>
@@ -1147,7 +1150,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
<ul><li>set up <a href="#pmadb">pmadb</a> and
the linked-tables
infrastructure</li>
- <li>put the table name in
<tt>$cfg['Servers'][$i]['designer_coords']</tt>
+ <li>put the table name in
<tt>$cfg['Servers'][$i]['designer_coords']</tt> (e.g.
'pma_designer_coords')
</li>
</ul>
</dd>
hooks/post-receive
--
phpMyAdmin