typo

ChangeLog

@@ -684,7 +684,7 @@ $Source$
     * header.inc.php3: removed db_stats link.
 
 2002-04-29 Marc Delisle  <lem9@users.sourceforge.net>
-    * tbl_qbe.php3: corrections from Mike Beck for better joints
+    * tbl_qbe.php3: corrections from Mike Beck for better joins
       when more than one table is the master in a relation
     * tbl_properties_links.php3, tbl_properties_operations.php3,
       new tbl_properties_options.php3, lang/*: new Options page
@@ -763,10 +763,10 @@ $Source$
     * tbl_printview.php3; tbl_qbe.php3: coding standards and warnings.
 
 2002-04-26 Marc Delisle  <lem9@users.sourceforge.net>
-    * tbl_qbe.php3: automatic joints from Relation table, thanks
+    * tbl_qbe.php3: automatic joins from Relation table, thanks
       to Mike Beck (mike.beck at ibmiller.de)
       (experimental: some things remain to be tested)
-    * Documentation.html: example for automatic joints
+    * Documentation.html: example for automatic joins
     * tbl_qbe.php3, tbl_printview.php3, libraries/display_tbl.lib.php3,
       Documentation.html: rename fields in the relation table
 

Documentation.html

@@ -635,7 +635,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
               integrity (display missing foreign keys) for each described key;
            </li>
            <li>
-              in query-by-example, create automatic joints (see an example in
+              in query-by-example, create automatic joins (see an example in
               the FAQ, section &quot;Using phpMyAdmin&quot;);
            </li>
            <li>
@@ -1974,7 +1974,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
     <li>Do the same for towns.description and countries.descriptions in the
         other 2 columns</li>
     <li>Click &quot;Update query&quot; and you will see in the query box that
-        the correct joints have been generated</li>
+        the correct joins have been generated</li>
     <li>Click &quot;Submit query&quot;</li>
 </ul>
 <br />

Documentation.txt

@@ -1,5 +1,5 @@
 
-                      phpMyAdmin 2.3.0-rc1 Documentation
+                      phpMyAdmin 2.3.0-rc2 Documentation
                                        
      * Sourceforge phpMyAdmin project page   [ http://www.phpmyadmin.net/
        ]
@@ -7,8 +7,8 @@
           + Version history: ChangeLog
           + General notes: README
           + License: LICENSE
-     * Documentation version: $Id: Documentation.html,v 1.263 2002/06/19
+     * Documentation version: $Id: Documentation.html,v 1.268 2002/06/25
-       20:39:01 lem9 Exp $
+       12:49:39 lem9 Exp $
    ______________________________________________________________________
    
    Top  -  Requirements  -  Introduction  -  Installation  -
@@ -361,7 +361,7 @@ CRIPT_NAME'], '/')+1);
           + display links on the table properties page, to check
             referential integrity (display missing foreign keys) for each
             described key;
-          + in query-by-example, create automatic joints (see an example
+          + in query-by-example, create automatic joins (see an example
             in the FAQ, section "Using phpMyAdmin");
           + enable you to get a PDF schema of your database (also uses
             the table_coords table).
@@ -388,6 +388,10 @@ CRIPT_NAME'], '/')+1);
             you want to use this feature, click "Structure/Relation
             view/" and choose foreign fields.
             
+          Please note that in the current (2.3.0) version, master_db must
+          be the same as foreign_db. Those fields have been put in place
+          for a future development of the cross-db relations.
+          
    $cfg['Servers'][$i]['table_info'] string
           Since release 2.3.0 you can describe, in a special 'table_info'
           table, which field is to be displayed as a tooltip when moving
@@ -579,6 +583,10 @@ CRIPT_NAME'], '/')+1);
           coded password value in the configuration file, end users can't
           be allowed to change their passwords.
           
+   $cfg['SuggestDBName'] boolean
+          Defines whether to suggest a database name on the "Create
+          Database" form or to keep the textfield empty.
+          
    $cfg['LoginCookieRecall'] boolean
           Define whether the previous login should be recalled or not in
           cookie authentication mode.
@@ -1228,7 +1236,7 @@ FAQ - Frequently Asked Questions
      * Do the same for towns.description and countries.descriptions in
        the other 2 columns
      * Click "Update query" and you will see in the query box that the
-       correct joints have been generated
+       correct joins have been generated
      * Click "Submit query"
        
    How can I use the "display field" feature?