diff --git a/doc/config.rst b/doc/config.rst index 6707144308..217be5ced7 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -1585,7 +1585,7 @@ Generic settings This is not a security measure as there will be always ways to circumvent this. If you want to prohibit users from dropping databases, - revoke them corresponding DROP privilege. + revoke their corresponding DROP privilege. Defines whether normal users (non-administrator) are allowed to delete their own database or not. If set as false, the link :guilabel:`Drop @@ -2773,7 +2773,7 @@ webserver. If you cannot avoid having this directory published by webserver, limit access to it either by web server configuration (for example using .htaccess or web.config files) or place at least an empty :file:`index.html` file there, so that directory listing is not possible. However as long as the -directory is accessible by web server, attacker can guess filenames to download +directory is accessible by web server, an attacker can guess filenames to download the files. .. config:option:: $cfg['UploadDir'] @@ -2801,7 +2801,7 @@ the files. .. warning:: Please see top of this chapter (:ref:`web-dirs`) for instructions how - to setup this directory and how to make it's usage secure. + to setup this directory and how to make its usage secure. .. seealso:: @@ -2823,7 +2823,7 @@ the files. .. warning:: Please see top of this chapter (:ref:`web-dirs`) for instructions how - to setup this directory and how to make it's usage secure. + to setup this directory and how to make its usage secure. .. config:option:: $cfg['TempDir'] @@ -2862,7 +2862,7 @@ the files. .. warning:: Please see top of this chapter (:ref:`web-dirs`) for instructions how - to setup this directory and how to make it's usage secure. + to setup this directory and how to make its usage secure. Various display setting ----------------------- diff --git a/doc/privileges.rst b/doc/privileges.rst index 2ce1f42cc4..6a7b8c37d1 100644 --- a/doc/privileges.rst +++ b/doc/privileges.rst @@ -60,15 +60,15 @@ will see in the phpMyAdmin navigation. .. warning:: - This feature only limits what user sees, he is still able to use all the + This feature only limits what a user sees, he is still able to use all the functions. So this can not be considered as a security limitation. Should you want to limit what users can do, use MySQL privileges to achieve that. With this feature enabled, the :guilabel:`User accounts` management interface gains -second tab for managing :guilabel:`User groups`, where you can define what each +a second tab for managing :guilabel:`User groups`, where you can define what each group will view (see image below) and you can then assign each user to one of -groups. Users will be presented by simplified user interface, what might be -useful for inexperienced users who could be overwhelmed by all features +these groups. Users will be presented with a simplified user interface, which might be +useful for inexperienced users who could be overwhelmed by all the features phpMyAdmin provides. .. image:: images/usergroups.png