diff --git a/Documentation.html b/Documentation.html
index b2408be83..5605a39aa 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -420,6 +420,22 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
+
$cfg['PmaNoRelation_DisableWarning'] boolean
+
+ Starting with version 2.3.0 phpMyAdmin offers a lot of features to work
+ with master / foreign - tables. These features require the PMA
+ administrator to set up a special database for PMA (see
+ $cfg['Servers'][$i]['pmadb']).
+ Its contents and use will be explained further down.
+ If you tried to set this up and it does not work for you have a look on
+ the "Structure" page of one database where you would like to
+ use it. You will find a link that will analyze why those features have
+ been disabled.
+ If you do not want to use those features set this variable to
+ TRUE to stop this message from appearing.
+
+
+
$cfg['Servers'] array
Since version 1.4.2, phpMyAdmin supports the administration of multiple
@@ -1260,54 +1276,6 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
- $cfg['UseSyntaxColoring'] boolean
-
- Introduced in 2.3.0, phpMyAdmin is now able to show SQL in syntax
- coloring.
- To use this feature set this value to TRUE (the default).
- If not everything you want is colored or to influence where a newline
- is inserted see the configuration arrays $cfg['keywords'] and
- $cfg['additional'].
- Note: for version 2.3.0, syntax coloring is non functional.
-
-
-
- $cfg['colorFunctions'] string [HTML color]
-
- If you use syntax coloring then this defines the color of
- function names. e.g. all that are found in $cfg['Functions'].
-
-
-
- $cfg['colorKeywords'] string [HTML color]
-
- If you use syntax coloring then this defines the color of
- keywords. e.g. all that are found in $cfg['keywords'].
-
-
-
- $cfg['colorStrings'] string [HTML color]
-
- If you use syntax coloring then this defines the color of
- strings. e.g. all that are between ' or "
-
-
-
- $cfg['colorColType'] string [HTML color]
-
- If you use syntax coloring then this defines the color of
- column types. e.g. all that are found in $cfg['ColumnTypes'].
-
-
-
- $cfg['colorAdd'] string [HTML color]
-
- If you use syntax coloring then this defines the color of
- additional keywords that do not get a newline. e.g. all that
- are found in $cfg['additional'].
-
-
-
$cfg['ColumnTypes'] array
All possible types of a MySQL column. In most cases you don't need to
@@ -1337,30 +1305,6 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
- $cfg['additional'] array
-
- A list of additional keywords that is used for syntax coloring. All
- keywords that are in this list will not get a new line before
- them.
- Usually you won't need to change those.
-
-
-
- $cfg['PmaNoRelation_DisableWarning'] boolean
-
- Starting with version 2.3.0 phpMyAdmin offers a lot of features to work
- with master / foreign - tables. These features require the PMA
- administrator to set up a special database for PMA (see
- $cfg['Servers'][$i]['pmadb']).
- Its contents and use will be explained further down.
- If you tried to set this up and it does not work for you have a look on
- the "Structure" page of one database where you would like to
- use it. You will find a link that will analyze why those features have
- been disabled.
- If you do not want to use those features set this variable to
- TRUE to stop this message from appearing.
-
-
@@ -2106,7 +2050,7 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
For example, x=100 and y=200 means that the table will be at 200 mm
down and 100 mm right from the upper left corner.
Actually if you have a width of more than 300 or a height of more than
- 100 than it will automatically be scaled but 300*100 is a good start to
+ 200 than it will automatically be scaled but 300*100 is a good start to
have an idea of what coordinates to use.
After every table you submitted you will have the possibility to submit
more tables
@@ -2124,36 +2068,6 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://'
saving the file under the name it offers).
-
-
- I don't like the way syntax coloring displays my query!
-
- There is two things about the way how the syntax coloring works that
- you can easily change yourself:
-
-
- -
- number of newlines within your statement
- All words that are in $cfg['keywords'] will get a newline in
- front of them, all words in $cfg['additional'] won't.
- So say you don't like to have a newline in front of every
- WHERE, you need to remove it from the
- $cfg['keywords'] array and enter it in the
- $cfg['additional'] array instead.
-
- -
- colors
- The colors are easily changed using the variables
-
- - $cfg['colorFunctions']
- - $cfg['colorKeywords']
- - $cfg['colorStrings']
- - $cfg['colorColType']
- - $cfg['colorAdd']
-
-
-
-
phpMyAdmin is changing the type of one of my columns!