Fixes to documentation:

* Remove old references
* Remove "added in" or "new in" if it's quite an old feature
* Some language improvements

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>

Author: ibennetch

docs/charts.rst

@@ -3,9 +3,7 @@
 Charts
 ======
 
-.. versionadded:: 3.4.0
-
-Since phpMyAdmin version 3.4.0, you can easily generate charts from a SQL query
+You can easily generate charts from a SQL query
 by clicking the "Display chart" link in the "Query results operations" area.
 
 .. image:: images/query_result_operations.png

docs/config.rst

@@ -4,17 +4,17 @@ Import and export
 Import
 ++++++
 
-To import data, go to the "Import" tab in phpMyAdmin. To import data into a
+To import data, go to the :guilabel:`Import` tab in phpMyAdmin. To import data into a
 specific database or table, open the database or table before going to the
-"Import" tab.
+:guilabel:`Import` tab.
 
 In addition to the standard Import and Export tab, you can also import an SQL
 file directly by dragging and dropping it from your local file manager to the
 phpMyAdmin interface in your web browser.
 
 If you are having troubles importing big files, please consult :ref:`faq1_16`.
 
-You can import using following methods:
+You can import using any of these methods:
 
 Form based upload
 
@@ -274,15 +274,15 @@ including table names or headers.
 OpenDocument Spreadsheet
 ------------------------
 
-Open standard for spreadsheet data, which is being widely adopted. Many recent
+Open standard for spreadsheet data, which has being widely adopted. Many recent
 spreadsheet programs, such as LibreOffice, OpenOffice, Microsoft Office or
 Google Docs can handle this format.
 
 OpenDocument Text
 -----------------
 
-New standard for text data which is being widely adopted. Most recent word
-processors (such as LibreOffice, OpenOffice, Microsoft Word, AbiWord or KWord)
+Open standard for text data which has being widely adopted. Most recent word
+processors (such as LibreOffice, OpenOffice, Microsoft Word, AbiWord or Google Docs)
 can handle this.
 
 PDF
@@ -315,12 +315,12 @@ file, for large tables you avoid the error "Got a packet bigger than
 Data Options
 ~~~~~~~~~~~~
 
-**Complete inserts** adds the column names to the SQL dump. This parameter
+:guilabel:`Complete inserts` adds the column names to the SQL dump. This parameter
 improves the readability and reliability of the dump. Adding the column names
 increases the size of the dump, but when combined with Extended inserts it's
 negligible.
 
-**Extended inserts** combines multiple rows of data into a single INSERT query.
+:guilabel:`Extended inserts` combines multiple rows of data into a single INSERT query.
 This will significantly decrease filesize for large SQL dumps, increases the
 INSERT speed when imported, and is generally recommended.
 

docs/faq.rst

@@ -1,12 +1,12 @@
 Security policy
 ===============
 
-The phpMyAdmin developer team is putting lot of effort to make phpMyAdmin as
-secure as possible. But still web application like phpMyAdmin can be vulnerable
-to a number of attacks and new ways to exploit are still being explored.
+The phpMyAdmin developer team is putting lot of effort in to making phpMyAdmin as
+secure as possible. Still, web applications like phpMyAdmin can be vulnerable
+to a number of attacks and new exploits are constantly being explored.
 
 For every reported vulnerability we issue a phpMyAdmin Security Announcement
-(PMASA) and it get's assigned a CVE ID as well. We might group similar
+(PMASA) and it gets assigned a CVE ID as well. We might group similar
 vulnerabilities to one PMASA (eg. multiple XSS vulnerabilities can be announced
 under one PMASA).
 
@@ -15,8 +15,8 @@ If you think you've found a vulnerability, please see :ref:`reporting-security`.
 Typical vulnerabilities
 -----------------------
 
-In this section, we will describe typical vulnerabilities, which can appear in
-our code base. This list is by no means complete, it is intended to show
+In this section, we will describe typical vulnerabilities which can appear in
+our code base. This list is by no means complete; it is intended to show
 typical attack surface.
 
 Cross-site scripting (XSS)
@@ -29,7 +29,7 @@ content to trick an other user of that database into executing something. This
 could for example be a piece of JavaScript code that would do any number of
 nasty things.
 
-phpMyAdmin tries to escape all userdata before it is rendered into html for the
+phpMyAdmin tries to escape all user data before it is rendered into html for the
 browser.
 
 .. seealso::
@@ -42,14 +42,14 @@ Cross-site request forgery (CSRF)
 An attacker would trick a phpMyAdmin user into clicking on a link to provoke
 some action in phpMyAdmin. This link could either be sent via email or some
 random website. If successful this the attacker would be able to perform some
-action with the users privileges.
+action with the user's privileges.
 
-To mitigate this phpMyAdmin requires a token to be sent on sensitive requests.
+To mitigate this, phpMyAdmin requires a token to be sent on sensitive requests.
 The idea is that an attacker does not poses the currently valid token to
 include in the presented link.
 
 The token is regenerated for every login, so it's generally valid only for
-limited time, what makes it harder for attacker to obtain valid one.
+limited time, which makes it harder for attacker to obtain valid one.
 
 .. seealso::
 
@@ -58,9 +58,9 @@ limited time, what makes it harder for attacker to obtain valid one.
 SQL injection
 +++++++++++++
 
-As the whole purpose of phpMyAdmin is to preform sql queries, this is not our
+As the whole purpose of phpMyAdmin is to preform SQL queries, this is not our
 first concern. SQL injection is sensitive to us though when it concerns the
-mysql control connection. This controlconnection can have additional privileges
+mysql control connection. This control connection can have additional privileges
 which the logged in user does not poses. E.g. access the :ref:`linked-tables`.
 
 User data that is included in (administrative) queries should always be run
@@ -78,7 +78,7 @@ This is caused by need to work in stateless environment, where there is no way
 to protect against such kind of things.
 
 To mitigate this, you can use Captcha or utilize external tools such as
-fail2ban, this is more details described in :ref:`securing`.
+fail2ban, this is described in more detail in :ref:`securing`.
 
 .. seealso::
 

docs/import_export.rst

@@ -10,8 +10,9 @@ The global settings can be configured in :file:`config.inc.php` as described in
 system wide settings.
 
 On top of this there are user settings which can be persistently stored in
-:ref:`linked-tables`, possibly automatically configured through
-:ref:`zeroconf`.  If the :ref:`linked-tables` are not configured, the settings
+:ref:`linked-tables`, which could automatically be configured through
+:ref:`zeroconf`.  If the :ref:`linked-tables` are not configured and
+zeroconf fails or is disabled, the settings
 are temporarily stored in the session data; these are valid only until you
 logout.
 

docs/security.rst

@@ -964,7 +964,7 @@ If you already had this infrastructure and:
 and then create new tables by importing :file:`resources/sql/create_tables.sql`.
 
 You can use your phpMyAdmin to create the tables for you. Please be
-aware that you may need special (administrator) privileges to create
+aware that you may need administrator privileges to create
 the database and tables, and that the script may need some tuning,
 depending on the database name.
 
@@ -976,9 +976,9 @@ You will also need to have a controluser
 (:config:option:`$cfg['Servers'][$i]['controluser']` and
 :config:option:`$cfg['Servers'][$i]['controlpass']` settings)
 with the proper rights to those tables. For example you can create it
-using following statement:
+using the following statement:
 
-And for any MariaDB version:
+For any MariaDB version:
 
 .. code-block:: mysql
 
@@ -1055,17 +1055,16 @@ Using authentication modes
 
 :term:`HTTP` and cookie authentication modes are recommended in a **multi-user
 environment** where you want to give users access to their own database and
-don't want them to play around with others. Nevertheless, be aware that MS
-Internet Explorer seems to be really buggy about cookies, at least till version
-6. Even in a **single-user environment**, you might prefer to use :term:`HTTP`
+don't want them to play around with others.
+Even in a **single-user environment**, you might prefer to use :term:`HTTP`
 or cookie mode so that your user/password pair are not in clear in the
 configuration file.
 
 :term:`HTTP` and cookie authentication
 modes are more secure: the MySQL login information does not need to be
 set in the phpMyAdmin configuration file (except possibly for the
 :config:option:`$cfg['Servers'][$i]['controluser']`).
-However, keep in mind that the password travels in plain text unless
+However, keep in mind that the password travels in plain text between your browser and the server unless
 you are using the HTTPS protocol. In cookie mode, the password is
 stored, encrypted with the AES algorithm, in a temporary cookie.
 
@@ -1130,6 +1129,7 @@ HTTP authentication mode
 Cookie authentication mode
 --------------------------
 
+* The recommended and most popular authentication type.
 * Username and password are stored in cookies during the session and password
   is deleted when it ends.
 * With this mode, the user can truly log out of phpMyAdmin and log
@@ -1208,9 +1208,7 @@ Config authentication mode
   loading the phpMyAdmin site. This is by design but could allow any
   user to access your installation. Use of some restriction method is
   suggested, perhaps a :term:`.htaccess` file with the HTTP-AUTH directive or disallowing
-  incoming HTTP requests at one’s router or firewall will suffice (both
-  of which are beyond the scope of this manual but easily searchable
-  with Google).
+  incoming HTTP requests at one's router or firewall.
 
 .. _securing:
 
@@ -1227,13 +1225,13 @@ are always ways to make your installation more secure:
 * Ensure your PHP setup follows recommendations for production sites, for example
   `display_errors <https://www.php.net/manual/en/errorfunc.configuration.php#ini.display-errors>`_
   should be disabled.
-* Remove the ``tests`` directory from phpMyAdmin, unless you are developing and need a test suite.
-* Remove the ``setup`` directory from phpMyAdmin, you will probably not
+* Remove the :file:`tests/` directory from phpMyAdmin, unless you are developing and need a test suite.
+* Remove the :file:`public/setup/` directory from phpMyAdmin, you will probably not
   use it after the initial setup.
 * Properly choose an authentication method - :ref:`cookie`
   is probably the best choice for shared hosting.
-* Deny access to auxiliary files in :file:`./libraries/` or
-  :file:`./templates/` subfolders in your webserver configuration.
+* Deny access to auxiliary files in :file:`libraries/` or
+  :file:`resources/templates/` subfolders in your webserver configuration.
   Such configuration prevents from possible path exposure and cross side
   scripting vulnerabilities that might happen to be found in that code. For the
   Apache webserver, this is often accomplished with a :term:`.htaccess` file in
@@ -1248,6 +1246,8 @@ are always ways to make your installation more secure:
   phpMyAdmin, you can use :config:option:`$cfg['Servers'][$i]['AllowDeny']['rules']` to limit them
   or :config:option:`$cfg['Servers'][$i]['AllowRoot']` to deny root user access.
 * Enable :ref:`2fa` for your account.
+* Consider hiding connection errors from the login page by setting
+  :config:option:`$cfg['Servers'][$i]['hide_connection_errors']` to ``true``.
 * Consider hiding phpMyAdmin behind an authentication proxy, so that
   users need to authenticate prior to providing MySQL credentials
   to phpMyAdmin. You can achieve this by configuring your web server to request

docs/settings.rst

@@ -14,7 +14,7 @@ Introduction
 ++++++++++++
 
 To enable transformations, you have to set up the ``column_info``
-table and the proper directives. Please see the :ref:`config` on how to do so.
+table and the proper configuration directives. Please see the :ref:`config` on how to do so.
 
 phpMyAdmin has two different types of transformations: browser display
 transformations, which affect only how the data is shown when browsing