diff --git a/doc/setup.rst b/doc/setup.rst
index 7e30ae4fd1..32eec9ae8d 100644
--- a/doc/setup.rst
+++ b/doc/setup.rst
@@ -5,7 +5,7 @@ Installation
 
 phpMyAdmin does not apply any special security methods to the MySQL
 database server. It is still the system administrator's job to grant
-permissions on the MySQL databases properly. phpMyAdmin's "Privileges"
+permissions on the MySQL databases properly. phpMyAdmin's :guilabel:`Users`
 page can be used for this.
 
 .. warning::
@@ -23,10 +23,8 @@ Quick Install
 
 #. Choose an appropriate distribution kit from the phpmyadmin.net
    Downloads page. Some kits contain only the English messages, others
-   contain all languages in UTF-8 format (this should be fine in most
-   situations), others contain all languages and all character sets.
-   We'll assume you chose a kit whose name looks like ``phpMyAdmin-x.x.x
-   -all-languages.tar.gz``.
+   contain all languages. We'll assume you chose a kit whose name 
+   looks like ``phpMyAdmin-x.x.x -all-languages.tar.gz``.
 #. Untar or unzip the distribution (be sure to unzip the subdirectories):
    ``tar -xzvf phpMyAdmin_x.x.x-all-languages.tar.gz`` in your
    webserver's document root. If you don't have direct access to your