Fix missing references in docs

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2016-10-18 09:55:15 +02:00
parent 4fc27b8e8e
commit 21beba716a
3 changed files with 16 additions and 3 deletions

View File

@ -34,7 +34,7 @@ Pie chart
Query results for a simple pie chart can be generated with:
.. code-block:: sql
.. code-block:: mysql
SELECT 'Food' AS 'expense', 
   1250 AS 'amount' UNION

View File

@ -833,7 +833,7 @@ Server connection settings
``pma__column_info``)
* to update your PRE-2.5.0 Column\_comments table use this: and
remember that the Variable in :file:`config.inc.php` has been renamed from
:config:option:`$cfg['Servers'][$i]['column\_comments']` to
:samp:`$cfg['Servers'][$i]['column\_comments']` to
:config:option:`$cfg['Servers'][$i]['column\_info']`
.. code-block:: mysql
@ -2291,7 +2291,13 @@ Export and import settings
* ``custom-no-form`` same as ``custom`` but does not display the option
of using quick export
.. config:option:: $cfg['Export']['charset']
:type: string
:default: ``''``
Defines charset for generated export. By default no charset conversion is
done assuming UTF-8.
.. config:option:: $cfg['Import']
@ -2302,6 +2308,13 @@ Export and import settings
items are similar to texts seen on import page, so you can easily
identify what they mean.
.. config:option:: $cfg['Import']['charset']
:type: string
:default: ``''``
Defines charset for import. By default no charset conversion is done
assuming UTF-8.
Tabs display settings
---------------------

View File

@ -209,7 +209,7 @@ By default, :ref:`cookie` is used, but if :envvar:`PMA_USER` and
The credentials you need to login are stored in the MySQL server, in case
of Docker image there are various ways to set it (for example
:envvar:`MYSQL_ROOT_PASSWORD` when starting MySQL container). Please check
:samp:`MYSQL_ROOT_PASSWORD` when starting MySQL container). Please check
documentation for `MariaDB container <https://hub.docker.com/r/_/mariadb/>`_
or `MySQL container <https://hub.docker.com/r/_/mysql/>`_.