From e70505d77fae263be1506f351aea5afb1949f221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 14 Nov 2012 13:50:33 +0100 Subject: [PATCH 1/2] This is now called users --- doc/setup.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/setup.rst b/doc/setup.rst index 7e30ae4fd1..32dc95c780 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:: From b159fff3b4c3c506bbe0f78563b286e51620a244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 14 Nov 2012 13:52:23 +0100 Subject: [PATCH 2/2] We no longer provide other that utf-8 languages --- doc/setup.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/setup.rst b/doc/setup.rst index 32dc95c780..32eec9ae8d 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -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