From dd129200c4414c99d5279d9c19b1c60165a24f9b Mon Sep 17 00:00:00 2001 From: Philip Olson Date: Fri, 23 Sep 2011 05:44:44 +0000 Subject: [PATCH] Minor changes (syntax/spelling) git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@317178 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/mysqlnd_ms/book.xml | 28 ++++++++++++++-------------- reference/mysqlnd_ms/changes.xml | 18 +++++++++--------- reference/mysqlnd_ms/concepts.xml | 4 ++-- reference/mysqlnd_ms/quickstart.xml | 4 ++-- reference/mysqlnd_ms/setup.xml | 4 ++-- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/reference/mysqlnd_ms/book.xml b/reference/mysqlnd_ms/book.xml index 7453af1662..47d4bbee28 100755 --- a/reference/mysqlnd_ms/book.xml +++ b/reference/mysqlnd_ms/book.xml @@ -51,35 +51,35 @@ - Transparent and therefore easy to use + Transparent and therefore easy to use. - supports all PHP MySQL extensions + Supports all of the PHP MySQL extensions. - no API changes + A consistent API. - very little, if any, application changes required, dependent on the usage scenario required + Little to no application changes required, dependent on the required usage scenario. - lazy connections: connections to master and slave servers are not - opened before a SQL statement is run + Lazy connections: connections to master and slave servers are not + opened before a SQL statement is executed. - optional, automatic use of master after first write in a web request to - lower the possible impact of replication lag + Optional: automatic use of master after the first write in a web request, to + lower the possible impact of replication lag. @@ -94,12 +94,12 @@ - Automatic detection of SELECT, supports SQL hints to overrule automatism + Automatic detection of SELECT, by supporting SQL hints to overrule automatism. - user-defined + User-defined. @@ -114,17 +114,17 @@ - Round Robin: choose different slave in round robin fashion for every slave request. + Round Robin: choose a different slave in round-robin fashion for every slave request. - Random: choose random slave for every slave request. + Random: choose a random slave for every slave request. - Random once (sticky): choose random slave once to run all slave requests for the duration of a web request. + Random once (sticky): choose a random slave once to run all slave requests for the duration of a web request. @@ -188,7 +188,7 @@ The shortcut mysqlnd_ms stands for mysqlnd master slave plugin. The name - was choosen for a quick-and-dirty proof-of-concept. In the beginning + was chosen for a quick-and-dirty proof-of-concept. In the beginning the developers did not expect to continue using the code base. diff --git a/reference/mysqlnd_ms/changes.xml b/reference/mysqlnd_ms/changes.xml index d90d826cf2..e1c2b1f714 100644 --- a/reference/mysqlnd_ms/changes.xml +++ b/reference/mysqlnd_ms/changes.xml @@ -11,7 +11,7 @@ distribution for a more complete list of changes. If you are eager to learn about all changes, even smaller ones that do not make it into the CHANGES file, you may want to monitor PECL commit messages. - To do you, you could, for example, subsribe to the PECL commit message mailing + To do you, you could, for example, subscribe to the PECL commit message mailing list. @@ -34,18 +34,18 @@ The 1.1 and 1.0 series expose a similar, although not identical, feature - set to the user, as can be guessed from the release motto/theme. Interally, + set to the user, as can be guessed from the release motto/theme. Internally, the 1.1 series has been refactored significantly to prepare for future feature additions. A new configuration file format has been introduced and, limitations have been lifted. Code quality and quality assurance have been improved. - Freature changes + Feature changes - Introduction of (chainable) filter concept + Added the (chainable) filter concept: @@ -60,17 +60,17 @@ - New powerful JSON based configuration syntax. + New powerful JSON based configuration syntax. - Lazy connections improved: security relevant, state changing commands covered + Lazy connections improved: security relevant, state changing commands covered. - Support for (native) prepared statements + Support for (native) prepared statements. @@ -92,13 +92,13 @@ Users of the function mysqlnd_ms_set_user_pick_server need to - update their code. The function has been removed in favour of a + update their code. The function has been removed in favor of a new user filter. You can no longer set a callback function using mysqlnd_ms_set_user_pick_server at runtime but have to configure it in the plugins configuration file. The user filter will pass the same arguments to the callback as before. Therefore, you can continue to use the same procedural function as a callback.callback - It is no longer possibe to use static class methods or class methods of + It is no longer possible to use static class methods or class methods of an object instance as a callback. Trying to do so, will make any function executing a statement handled by the plugin emit a E_RECOVERABLE_ERROR level error like diff --git a/reference/mysqlnd_ms/concepts.xml b/reference/mysqlnd_ms/concepts.xml index 80efd9ce41..80d7815aec 100755 --- a/reference/mysqlnd_ms/concepts.xml +++ b/reference/mysqlnd_ms/concepts.xml @@ -82,7 +82,7 @@ the user connection may change. The applications must be aware of this. - The following listshows what the connection state consists of. + The following list shows what the connection state consists of. @@ -152,7 +152,7 @@ Connection switches happen right before queries are run. The plugin does not switch the current connection until the moment in time when - the next statement is executed. + the next statement is executed. Please, do not miss the MySQL reference manual chapter on diff --git a/reference/mysqlnd_ms/quickstart.xml b/reference/mysqlnd_ms/quickstart.xml index da1d2f472a..f0fb0e9c4e 100755 --- a/reference/mysqlnd_ms/quickstart.xml +++ b/reference/mysqlnd_ms/quickstart.xml @@ -328,7 +328,7 @@ $mysqli->close(); - The example openes a load balanced connection and executes two statements. + The example opens a load balanced connection and executes two statements. The first statement SET @myrole='master' does not begin with the string SELECT. Therefore the plugin does not recognize it as a read-only query which shall be run on a slave. The @@ -366,7 +366,7 @@ $mysqli->close(); SQL hints are standard compliant SQL comments. Because SQL comments are supposed to be ignored by SQL processing systems they - do not infere with other programs such as the MySQL Server, the MySQL Proxy + do not interfere with other programs such as the MySQL Server, the MySQL Proxy or a firewall. diff --git a/reference/mysqlnd_ms/setup.xml b/reference/mysqlnd_ms/setup.xml index 8bc81b1e1a..0f4d83ba7c 100755 --- a/reference/mysqlnd_ms/setup.xml +++ b/reference/mysqlnd_ms/setup.xml @@ -39,7 +39,7 @@ is used to set the plugins configuration file. - The configuration file minics standard php.ini format. + The configuration file mimics standard the php.ini format. It consists of one or more sections. Every section defines its own unit of settings. There is no global section for setting defaults. @@ -271,7 +271,7 @@ slave[] = mysql_slave_2 only. Lazy connections opened in the future are not affected. If, for example, the connection character set is changed using a PHP MySQL API call, the plugin will change the character set of all - currently opened connection. It will not remeber the character set + currently opened connection. It will not remember the character set change to apply it on lazy connections opened in the future. As a result the internal connection pool would hold connections using different character sets. This is not desired. Remember that character