From 9535cdc2465e8524d1e2734e40889fdeec70176c Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 10 Dec 2005 14:39:29 +0000 Subject: [PATCH] cleanup --- ChangeLog | 2 ++ Documentation.html | 70 ++++++++++++++++++++++------------------------ 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39ae1bfca..27b10682a 100755 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ $Source$ 2005-12-10 Marc Delisle * tbl_properties_structure.php, lang/*: new $strBrowseDistinctValues + * Documentation.html: anchors and formatting cleanup, + thanks to Cédric Corazza 2005-12-09 Michal Čihař * libraries/auth/http.auth.lib.php: Simplify code, use getenv, support for diff --git a/Documentation.html b/Documentation.html index 6f3ec6b8a..c3e774b96 100755 --- a/Documentation.html +++ b/Documentation.html @@ -548,7 +548,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';
-
+ $cfg['Servers'][$i]['controluser'] string
$cfg['Servers'][$i]['controlpass'] string
@@ -608,7 +608,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'; for more information.
-
+ $cfg['Servers'][$i]['user'] string
$cfg['Servers'][$i]['password'] string
@@ -619,7 +619,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'; cookie authentication is used and should be empty.
-
+ $cfg['Servers'][$i]['only_db'] string or array
@@ -657,7 +657,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';
-
+ $cfg['Servers'][$i]['pmadb'] string
@@ -676,7 +676,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';
-
+ $cfg['Servers'][$i]['bookmarktable'] string
@@ -688,11 +688,11 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';
  • set up pmadb and the linked-tables infrastructure
  • enter the table name in $cfg['Servers'][$i]['bookmarktable']
    • -
    +
    -
    + $cfg['Servers'][$i]['relation'] string
    @@ -728,7 +728,6 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'; table_coords table). -
    The keys can be numeric or character.

    @@ -745,14 +744,14 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'; tables where you want to use this feature, click "Structure/Relation view/" and choose foreign fields. -
    + Please note that in the current version, master_db must be the same as foreign_db. Those fields have been put in future development of the cross-db relations.
    -
    + $cfg['Servers'][$i]['table_info'] string
    @@ -774,11 +773,11 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'; click "Structure/Relation view/Choose field to display" to choose the field. -
    + Usage tip: Display field.
    -
    + $cfg['Servers'][$i]['table_coords'] string
    $cfg['Servers'][$i]['pdf_pages'] string
    @@ -799,12 +798,12 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'; $cfg['Servers'][$i]['table_coords'] and $cfg['Servers'][$i]['pdf_pages'] -
    + Usage tips: PDF output.
    -
    + $cfg['Servers'][$i]['column_info'] string
    @@ -844,7 +843,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';
    -
    + $cfg['Servers'][$i]['history'] string
    @@ -892,8 +891,8 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'; Whether to allow root access, This is just simplification of rules below.
    -
    - $cfg['Servers'][$i]['AllowDeny']['order'] string + + $cfg['Servers'][$i]['AllowDeny']['order'] string
    If your rule order is empty, then IP authentication is disabled. @@ -918,8 +917,8 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'; setting any order.
    -
    - $cfg['Servers'][$i]['AllowDeny']['rules'] array of strings + + $cfg['Servers'][$i]['AllowDeny']['rules'] array of strings
    The general format for the rules is as such:
    @@ -1047,7 +1046,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'; Defaults to TRUE.
    -
    + $cfg[AllowArbitraryServer] boolean
    If enabled allows you to login to arbitrary server using cookie auth. @@ -1202,7 +1201,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';
    Defines whether BLOB or BINARY fields are protected from editing when browsing a table's content or not. - Valid values are:
    + Valid values are:
    • FALSE to allow editing of all fields;
    • 'blob' to allow editing of all fields except BLOBS;
      • @@ -1243,7 +1242,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';
      If there are fewer items than this in the set of foreign keys, then a drop-down box of foreign keys is presented, in the style described by the - $cfg[ForeignKeyDropdownOrder] setting. + $cfg[ForeignKeyDropdownOrder] setting.
      $cfg[ForeignKeyDropdownOrder] array
      @@ -1397,7 +1396,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';
      You can select here which functions will be used for character set conversion. - Possible values are:
      + Possible values are:
      • auto - automatically use available one (first is tested iconv, then recode)
        • @@ -1426,7 +1425,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';
        Specifies whether GD >= 2 is available. If yes it can be used for MIME transformations.
        - Possible values are:
        + Possible values are:
        • auto - automatically detect, this is a bit expensive @@ -1544,7 +1543,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'; click.
        -
        + $cfg[CtrlArrowsMoving] boolean
        @@ -1588,7 +1587,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';
        -
        + $cfg[DefaultPropDisplay] string
        When editing/creating new columns in a table all fields normally get @@ -1850,14 +1849,14 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'; applicable to $cfg['DefaultQueryTable'].
        -
        $cfg[SQP]['fmtType'] string [html|none]
        +
        $cfg[SQP]['fmtType'] string [html|none]
        The main use of the new SQL Parser is to pretty-print SQL queries. By default we use HTML to format the query, but you can disable this by setting this variable to 'none'.
        -
        $cfg[SQP]['fmtInd'] float
        +
        $cfg[SQP]['fmtInd'] float
        $cfg[SQP]['fmtIndUnit'] string [em|px|pt|ex]
        For the pretty-printing of SQL queries, under some cases the part of a @@ -1868,7 +1867,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'; used via stylesheets.
        -
        $cfg[SQP]['fmtColor'] array of string tuples
        +
        $cfg[SQP]['fmtColor'] array of string tuples
        This array is used to define the colours for each type of element of the pretty-printed SQL queries. The tuple format is
        @@ -1876,7 +1875,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'; If you specify an empty string for the color of a class, it is ignored in creating the stylesheet. You should not alter the class names, only the colour strings.
        - Class name key:
        + Class name key:
        • comment Applies to all comment sub-classes
        • comment_mysql Comments as "#...\n"
          • @@ -1925,7 +1924,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'; here, and it will be used in place of the anonymous login.
        -
        $cfg[DBG]['enable'] boolean
        +
        $cfg[DBG]['enable'] boolean
        DEVELOPERS ONLY!
        Enable the DBG extension for debugging phpMyAdmin. Required for profiling @@ -1935,7 +1934,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'; Developers section.
        -
        $cfg[DBG]['profile']['enable'] boolean
        +
        $cfg[DBG]['profile']['enable'] boolean
        DEVELOPERS ONLY!
        Enable profiling support for phpMyAdmin. This will append a chunk of data @@ -1945,7 +1944,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost'; complete successfully.
        -
        $cfg[DBG]['profile']['threshold'] float (units in milliseconds)
        +
        $cfg[DBG]['profile']['threshold'] float (units in milliseconds)
        DEVELOPERS ONLY!
        When profiling data is displayed, this variable controls the threshold of @@ -2064,7 +2063,6 @@ clicking on the 'Structure' link for a table). There click on "Change" (or change icon) and there you will see three new fields at the end of the line. They are called 'MIME-type', 'Browser transformation' and 'Transformation options'.

        -
        • The field 'MIME-type' is a dropdown field. You have the options to leave that field @@ -2932,7 +2930,7 @@ RewriteRule ^([a-zA-Z0-9_]+)$ index.php?db=$1 [R] contain your chosen theme name, that will be visible in user interface
        • make a new screenshot of your theme and save it under "your_theme_name/screen.png"
        -
        +

        In theme directory there is file info.inc.php which contains theme verbose name, theme generation and theme version. These versions and @@ -3635,7 +3633,7 @@ RewriteRule ^([a-zA-Z0-9_]+)$ index.php?db=$1 [R] the correct joins have been generated

      • Click "Submit query"
      -
      +