From ac99bcb4c4b11e185e413d12467fa9aa462b1cca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Chapeaux?= Date: Sat, 27 Apr 2002 07:37:11 +0000 Subject: [PATCH] xhtml fixes --- ChangeLog | 3 ++ Documentation.html | 80 ++++++++++++++++++++++++---------------------- 2 files changed, 44 insertions(+), 39 deletions(-) diff --git a/ChangeLog b/ChangeLog index abe99ad1a..2044d81cc 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - Changelog $Id$ $Source$ +2002-04-27 Loïc Chapeaux + * Documentation.html: xhtml fixes. + 2002-04-26 Loïc Chapeaux * ## created 2.2.7 branch into the CVS tree ## * lang/nowegian.inc.php: updated thanks to Sven-Erik Andersen. diff --git a/Documentation.html b/Documentation.html index 8f9046971..8dae35f08 100755 --- a/Documentation.html +++ b/Documentation.html @@ -343,7 +343,8 @@ $cfg['Servers'][$i]['user'] and $cfg['Servers'][$i]['password'] fields.
But you don't need to setup a "controluser" here: - using the $cfg['Servers'][$i]['only_db'] might be enough.
+ using the $cfg['Servers'][$i]['only_db'] might be enough. +
In the ISP FAQ section, there is an entry explaining how to protect your configuration file.
@@ -389,14 +390,14 @@ use such a kind of code: 
 $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
-                   . $HTTP_HOST . (!empty($SERVER_PORT) ? ':' . $SERVER_PORT : '')
-                   . substr($PHP_SELF, 0, strrpos($PHP_SELF, '/')+1);
+                       . $HTTP_HOST . (!empty($SERVER_PORT) ? ':' . $SERVER_PORT : '')
+                       . substr($PHP_SELF, 0, strrpos($PHP_SELF, '/')+1);
 
     or
 
 $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
-                   . $SERVER_NAME . (!empty($SERVER_PORT) ? ':' . $SERVER_PORT : '')
-                   . substr($SCRIPT_NAME, 0, strrpos($SCRIPT_NAME, '/')+1);
+                       . $SERVER_NAME . (!empty($SERVER_PORT) ? ':' . $SERVER_PORT : '')
+                       . substr($SCRIPT_NAME, 0, strrpos($SCRIPT_NAME, '/')+1);
@@ -404,11 +405,11 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
Since version 1.4.2, phpMyAdmin supports the administration of multiple MySQL servers. - Therefore, a $cfg['Servers']-array has been added which contains the login - information for the different servers. The first + Therefore, a $cfg['Servers']-array has been added which contains + the login information for the different servers. The first $cfg['Servers'][$i]['host'] contains the hostname of the first - server, the second $cfg['Servers'][$i]['host'] the hostname of the - second server, etc. + server, the second $cfg['Servers'][$i]['host'] the hostname of + the second server, etc. If you have only one server to administer, simply leave free the hostname of the other $cfg['Server']-entries.

@@ -469,7 +470,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'

-
$cfg['Servers'][$i]['auth_type'] string ['http'|'cookie'|'config']
+
$cfg['Servers'][$i]['auth_type'] string ['http'|'cookie'|'config']
Whether config or cookie or http authentication should be used for this server. @@ -563,9 +564,9 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
  • then complete the two variables $cfg['Servers'][$i]['bookmarkdb'] and - $cfg['Servers'][$i]['bookmarktable'] with the database and - table names you've choosen so phpMyAdmin will be able to find - the bookmarks. + $cfg['Servers'][$i]['bookmarktable'] with the database + and table names you've choosen so phpMyAdmin will be able to + find the bookmarks.

    • @@ -632,11 +633,11 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
    $cfg['ServerDefault'] integer
    If you have more than one server configured, you can set - $cfg['ServerDefault'] to any one of them to autoconnect to that - server when phpMyAdmin is started, or set it to 0 to be given a list of - servers without logging in.
    - If you have only one server configured, $cfg['ServerDefault'] MUST - be set to that server. + $cfg['ServerDefault'] to any one of them to autoconnect to + that server when phpMyAdmin is started, or set it to 0 to be given a + list of servers without logging in.
    + If you have only one server configured, $cfg['ServerDefault'] + MUST be set to that server.

    @@ -1194,8 +1195,8 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://' systems, too.
    If you encounter this bug together with another OS and/or MySQL version or you know how to work around it, please post a message into - our bug tracker at SourceForge. + + our bug tracker at SourceForge.

    @@ -1284,8 +1285,8 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://' table, an error 404 (page not found) is displayed or, with http or cookie authentication, I'm asked to login again. What's wrong?
    - Check the value you set for the $cfg['PmaAbsoluteUri'] directive in - the phpMyAdmin configuration file. + Check the value you set for the $cfg['PmaAbsoluteUri'] directive + in the phpMyAdmin configuration file.

    @@ -1546,7 +1547,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'      CREATE TABLE countries (
           country_code char(1) NOT NULL default '',
           description varchar(10) NOT NULL default '',
    -        PRIMARY KEY (country_code)
    +        PRIMARY KEY (country_code)
         ) TYPE=MyISAM;

         INSERT INTO countries VALUES ('C', 'Canada');
    @@ -1556,7 +1557,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'        person_name varchar(32) NOT NULL default '',
           town_code varchar(5) default '0',
           country_code char(1) NOT NULL default '',
    -        PRIMARY KEY (id)
    +        PRIMARY KEY (id)
         ) TYPE=MyISAM;

         INSERT INTO persons VALUES (11, 'Marc', 'S', '');
    @@ -1567,7 +1568,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'        master_field varchar(32) NOT NULL default '',
           foreign_table varchar(32) NOT NULL default '',
           foreign_field varchar(32) NOT NULL default '',
    -        PRIMARY KEY (master_table,master_field)
    +        PRIMARY KEY (master_table,master_field)
         ) TYPE=MyISAM;

         INSERT INTO relation VALUES ('persons', 'town_code', 'towns', 'town_code');
    @@ -1576,7 +1577,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'      CREATE TABLE towns (
           town_code varchar(5) NOT NULL default '0',
           description varchar(30) NOT NULL default '',
    -        PRIMARY KEY (town_code)
    +        PRIMARY KEY (town_code)
         ) TYPE=MyISAM;

         INSERT INTO towns VALUES ('S', 'Sherbrooke');
    @@ -1584,20 +1585,21 @@ $cfg['PmaAbsoluteUri'] = (!empty($HTTPS) ? 'https' : 'http') . '://'
    Then test like this: -
      -
    • Click on your db name in the left frame
      • -
    • Choose "Query by example"
      • -
    • Use tables: persons, towns, countries
      • -
    • Click "Update query"
      • -
    • In the fields row, choose persons.person_name and click the - "Show" tickbox
      • -
    • 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
      • -
    • Click "Submit query"
      • -

    +
      +
    • Click on your db name in the left frame
      • +
    • Choose "Query by example"
      • +
    • Use tables: persons, towns, countries
      • +
    • Click "Update query"
      • +
    • In the fields row, choose persons.person_name and click the + "Show" tickbox
      • +
    • 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
      • +
    • Click "Submit query"
      • +
    +

    [phpMyAdmin project]