From 5a4a3e70acee94c16431f9c0011c3db95b9d0d64 Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Thu, 28 Apr 2016 21:11:24 -0400 Subject: [PATCH] Fix minor typos Signed-off-by: Isaac Bennetch --- doc/config.rst | 12 ++++++------ doc/import_export.rst | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/config.rst b/doc/config.rst index 1004615ff3..2cf927bd3a 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -2976,13 +2976,13 @@ Developer Examples -------- -See following configuration snippets for usual setups of phpMyAdmin. +See following configuration snippets for typical setups of phpMyAdmin. Basic example +++++++++++++ Example configuration file, which can be copied to :file:`config.inc.php` to -get some core configuration layout, it is distributed with phpMyAdmin as +get some core configuration layout; it is distributed with phpMyAdmin as :file:`config.sample.inc.php`. Please note that it does not contain all configuration options, only the most frequently used ones. @@ -2991,7 +2991,7 @@ configuration options, only the most frequently used ones. .. warning:: - Don't use the controluser 'pma' if not existing yet and don't use 'pmapass' + Don't use the controluser 'pma' if it does not yet exist and don't use 'pmapass' as password. @@ -3000,7 +3000,7 @@ configuration options, only the most frequently used ones. Example for signon authentication +++++++++++++++++++++++++++++++++ -This example uses :file:`examples/signon.php` to demostrate usage of :ref:`auth_signon`: +This example uses :file:`examples/signon.php` to demonstrate usage of :ref:`auth_signon`: .. code-block:: php @@ -3016,8 +3016,8 @@ This example uses :file:`examples/signon.php` to demostrate usage of :ref:`auth_ Example for IP address limited autologin ++++++++++++++++++++++++++++++++++++++++ -If you want to automatically login when accessing phpMyAdmin locally while ask -for password when remotely, you can achieve it using following snippet: +If you want to automatically login when accessing phpMyAdmin locally while asking +for a password when accessing remotely, you can achieve it using following snippet: .. code-block:: php diff --git a/doc/import_export.rst b/doc/import_export.rst index 4be231a2ca..0ba2d2770c 100644 --- a/doc/import_export.rst +++ b/doc/import_export.rst @@ -136,7 +136,7 @@ CSV for Microsoft Excel ----------------------- This is just preconfigured version of CSV export which can be imported into -most english versions of Microsoft Excel. Some localised versions (like +most English versions of Microsoft Excel. Some localised versions (like "Danish") are expecting ";" instead of "," as field separator. Microsoft Word 2000