diff --git a/doc/charts.rst b/doc/charts.rst
index 0839fbf293..a64281c3a5 100644
--- a/doc/charts.rst
+++ b/doc/charts.rst
@@ -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
diff --git a/doc/config.rst b/doc/config.rst
index e5a2696d72..0cf96db3e9 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -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
 ---------------------
diff --git a/doc/setup.rst b/doc/setup.rst
index 48d54c204a..c6c860571f 100644
--- a/doc/setup.rst
+++ b/doc/setup.rst
@@ -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/>`_.