Sync with trunk.

2006-10-17 09:27:57 +00:00
parent e9cb0da294
commit 0f9f3e4c95
2 changed files with 36 additions and 29 deletions
--- a/3
+++ b/3
@@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$

+2006-10-10 Michal Čihař  <michal@cihar.com>
+    * Documentation.html: Sync with trunk.
+
 2006-10-14 Marc Delisle  <lem9@users.sourceforge.net>
    * libraries/Table.class.php: bug #1567316, renaming a db containing view
      (but still some work to ensure proper sequence of renaming)
--- a/Documentation.html
+++ b/Documentation.html
@@ -39,6 +39,8 @@
            phpMyAdmin homepage</a></li>
    <li><a href="https://sf.net/projects/phpmyadmin/">
            SourceForge phpMyAdmin project page</a></li>
+    <li><a href="http://wiki.cihar.com">
+            Official phpMyAdmin wiki</a></li>
    <li>Local documents:
        <ul><li>Version history: <a href="changelog.php">ChangeLog</a></li>
            <li>General notes: <a href="readme.php">README</a></li>
@@ -688,7 +690,7 @@ GRANT ALL PRIVILEGES ON user_base.* TO 'real_user'@localhost IDENTIFIED BY 'real
        id="cfg_Servers_nopassword">$cfg['Servers'][$i]['nopassword']</span> boolean
    </dt>
    <dd>
-        Allow attempt to login without password when login with password
+        Allow attempt to log in without password when a login with password
        fails. This can be used together with http authentication, when
        authentication is done some other way and phpMyAdmin gets user name
        from auth and uses empty password for connecting to MySQL. Password
@@ -1457,6 +1459,7 @@ ALTER TABLE `pma_column_comments`
        them.<br />
        See <tt>themes/themename/layout.inc.php</tt>.</dd>

+
    <dt id="cfg_FontFamily">$cfg['FontFamily'] string</dt>
    <dd>You put here a valid CSS font family value, for example
    <tt>arial, sans-serif</tt>.<br />
@@ -1872,8 +1875,8 @@ ALTER TABLE `pma_column_comments`
        to the end of every page displayed in the main window with profiling
        statistics for that page.<br />
        You may need to increase the maximum execution time for this to
-	complete successfully. <i>Profiling was removed from the code
-	for version 2.9.0 due to licensing issues.</i></dd>
+	complete successfully.<i>Profiling was removed from the code for
+	version 2.9.0 due to licensing issues.</i></dd>

    <dt id="cfg_DBG_profile_threshold">$cfg['DBG']['profile']['threshold'] float (units in milliseconds)</dt>
    <dd><b>DEVELOPERS ONLY!</b><br />
@@ -2231,7 +2234,7 @@ ALTER TABLE `pma_column_comments`
    time there is no better fix): remove or comment the <tt>DOCTYPE</tt>
    declarations (2 lines) from the scripts <i>libraries/header.inc.php</i>,
    <i>libraries/header_printview.inc.php</i>, <i>index.php</i>,
-    <i>left.php</i> and <i>libraries/common.lib.php</i>.</p>
+    <i>navigation.php</i> and <i>libraries/common.lib.php</i>.</p>

 <h4 id="faq1_7">
    <a href="#faq1_7">1.7 How can I GZip or Bzip a dump or a
@@ -2567,7 +2570,7 @@ SetInputFilter PHP
 </pre>

 <h4 id="faq1_30">
-    <a href="#faq1_30">1.30 I get the error &quot;left.php: Missing hash&quot;.</a></h4>
+    <a href="#faq1_30">1.30 I get the error &quot;navigation.php: Missing hash&quot;.</a></h4>

 <p> This problem is known to happen when the server is running Turck MMCache
    but upgrading MMCache to version 2.3.21 solves the problem.</p>
@@ -2830,7 +2833,7 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
 <h4 id="login_bug">
    <a href="#login_bug">3.1 When using
    <abbr title="HyperText Transfer Protocol">HTTP</abbr> authentication, an user
-    who logged out can not relogin in with the same nick.</a></h4>
+    who logged out can not log in again in with the same nick.</a></h4>

 <p> This is related to the authentication mechanism (protocol) used by
    phpMyAdmin. To bypass this problem: just close all the opened
@@ -3046,7 +3049,7 @@ RewriteRule .* - [E=REMOTE_USER:%{HTTP:Authorization},L]
        and/or
        <a href="#cfg_Servers_controlpass" class="configrule">$cfg['Servers'][$i]['controlpass']</a>
        are wrong.</li>
-    <li>The username/password you specify in the login-dialog are invalid.</li>
+    <li>The username/password you specify in the login dialog are invalid.</li>
    <li>You have already setup a security mechanism for the
        phpMyAdmin-directory, eg. a .htaccess file. This would interfere with
        phpMyAdmin's authentication, so remove it.</li>
@@ -3757,9 +3760,9 @@ chmod o+rwx tmp
    <a href="#faq7_2">7.2 I want to translate the messages to a new language or upgrade an
    existing language, where do I start?</a></h4>

-<p> Always use the current CVS version of your language file.
+<p> Always use the current SVN version of your language file.
    For a new language, start from <i>english-iso-8859-1.inc.php</i>. If you
-    don't  know how to get the CVS version, please ask one of the developers.
+    don't  know how to get the SVN version, please ask one of the developers.
    <br />
    Please note that we try not to use HTML entities like &amp;eacute; in
    the translations, since we define the right character set in the file.
@@ -3778,19 +3781,20 @@ chmod o+rwx tmp

 <p> The following method is preferred for new developers:</p>

-<ol><li>fetch the current CVS tree over anonymous CVS:<br />
-        <tt>cvs -d:pserver:anonymous@phpmyadmin.cvs.sourceforge.net:/cvsroot/phpmyadmin login</tt><br />
-        [Password: simply press the Enter key]<br />
-        <tt>cvs -z3 -d:pserver:anonymous@phpmyadmin.cvs.sourceforge.net:/cvsroot/phpmyadmin checkout phpMyAdmin</tt><br />
-        [This will create a new sub-directory named phpMyAdmin]</li>
+<ol><li>fetch the current SVN tree over anonymous SVN:<br />
+    <tt>svn co https://svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin</tt><br />
+    </li>
    <li>add your stuff</li>
-    <li>put the modified files (tar'ed and gzip'ed) inside the patch tracker of
-        the
-        <a href="http://sf.net/projects/phpmyadmin/">phpMyAdmin SourceForge account</a>.
+    <li>generate patch with your changes:
+    <tt>svn diff</tt><br />
+    </li>
+    <li>put the patch inside the <a
+        href="https://sourceforge.net/tracker/?group_id=23067&atid=377410">patch
+        tracker of the phpMyAdmin project</a>.
    </li>
 </ol>

-<p> Write access to the CVS tree is granted only to experienced developers who
+<p> Write access to the SVN tree is granted only to experienced developers who
    have already contributed something useful to phpMyAdmin.<br />
    Also, have a look at the <a href="#developers">Developers section</a>.</p>