Merge pull request #14058 from ibennetch/doc-pr

Improvements to the phrasing of the documentation.

2 files changed, 9 insertions, 9 deletions

diff --git a/doc/intro.rst b/doc/intro.rst
index 43dbbf1768..d81b00e0ee 100644
--- a/doc/intro.rst
+++ b/doc/intro.rst
@@ -3,18 +3,17 @@
 Introduction
 ============
 
-phpMyAdmin can manage a whole MySQL server (needs a super-user) as
-well as a single database. To accomplish the latter you'll need a
-properly set up MySQL user who can read/write only the desired
-database. It's up to you to look up the appropriate part in the MySQL
-manual.
+phpMyAdmin is a free software tool written in PHP that is intended to handle the
+administration of a MySQL or MariaDB database server. You can use phpMyAdmin to
+perform most administration tasks, including creating a database, running queries,
+and adding user accounts.
 
 Supported features
 ------------------
 
 Currently phpMyAdmin can:
 
-* browse and drop databases, tables, views, columns and indexes
+* create, browse, edit, and drop databases, tables, views, columns, and indexes
 * display multiple results sets through stored procedures or queries
 * create, copy, drop, rename and alter databases, tables, columns and
   indexes
@@ -29,7 +28,7 @@ Currently phpMyAdmin can:
 * import data and :term:`MySQL` structures from :term:`OpenDocument` spreadsheets, as
   well as :term:`XML`, :term:`CSV`, and :term:`SQL` files
 * administer multiple servers
-* manage MySQL users and privileges
+* add, edit, and remove MySQL user accounts and privileges
 * check referential integrity in MyISAM tables
 * using Query-by-example (QBE), create complex queries automatically
   connecting required tables
diff --git a/doc/settings.rst b/doc/settings.rst
index 9d4e3d2ae3..be36b80d7f 100644
--- a/doc/settings.rst
+++ b/doc/settings.rst
@@ -1,7 +1,8 @@
 Configuring phpMyAdmin
 ----------------------
 
-phpMyAdmin has quite a lot of configuration settings, those are described in
+There are many configuration settings that can be used to customize the
+interface. Those settings are described in
 :ref:`config`. There are several layers of the configuration.
 
 The global settings can be configured in :file:`config.inc.php` as described in
@@ -11,7 +12,7 @@ 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
-are temporarily stored in the session data, these are valid only until you
+are temporarily stored in the session data; these are valid only until you
 logout.
 
 You can also save the user configuration for further use, either download them