Minor changes (syntax/spelling)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@317178 c90b9560-bf6c-de11-be94-00142212c4b1
This commit is contained in:
Philip Olson 2011-09-23 05:44:44 +00:00
parent 4728692c64
commit dd129200c4
5 changed files with 29 additions and 29 deletions

View file

@ -51,35 +51,35 @@
<itemizedlist>
<listitem>
<para>
Transparent and therefore easy to use
Transparent and therefore easy to use.
</para>
<para>
<itemizedlist>
<listitem>
<para>
supports all PHP MySQL extensions
Supports all of the PHP MySQL extensions.
</para>
</listitem>
<listitem>
<para>
no API changes
A consistent <acronym>API</acronym>.
</para>
</listitem>
<listitem>
<para>
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.
</para>
</listitem>
<listitem>
<para>
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.
</para>
</listitem>
<listitem>
<para>
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.
</para>
</listitem>
</itemizedlist>
@ -94,12 +94,12 @@
<itemizedlist>
<listitem>
<para>
Automatic detection of SELECT, supports SQL hints to overrule automatism
Automatic detection of SELECT, by supporting SQL hints to overrule automatism.
</para>
</listitem>
<listitem>
<para>
user-defined
User-defined.
</para>
</listitem>
</itemizedlist>
@ -114,17 +114,17 @@
<itemizedlist>
<listitem>
<para>
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.
</para>
</listitem>
<listitem>
<para>
Random: choose random slave for every slave request.
Random: choose a random slave for every slave request.
</para>
</listitem>
<listitem>
<para>
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.
</para>
</listitem>
<listitem>
@ -188,7 +188,7 @@
<para>
The shortcut <literal>mysqlnd_ms</literal>
stands for <literal>mysqlnd master slave plugin</literal>. 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.
</para>
</section>

View file

@ -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
<filename>CHANGES</filename> 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.
</para>
@ -34,18 +34,18 @@
</para>
<para>
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.
</para>
<para>
Freature changes
Feature changes
<itemizedlist>
<listitem>
<para>
Introduction of (chainable) filter concept
Added the (chainable) filter concept:
<itemizedlist>
<listitem>
<simpara>
@ -60,17 +60,17 @@
</listitem>
<listitem>
<simpara>
New powerful JSON based configuration syntax.
New powerful <acronym>JSON</acronym> based configuration syntax.
</simpara>
</listitem>
<listitem>
<simpara>
Lazy connections improved: security relevant, state changing commands covered
Lazy connections improved: security relevant, state changing commands covered.
</simpara>
</listitem>
<listitem>
<simpara>
Support for (native) prepared statements
Support for (native) prepared statements.
</simpara>
</listitem>
</itemizedlist>
@ -92,13 +92,13 @@
</para>
<para>
Users of the function <function>mysqlnd_ms_set_user_pick_server</function> 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 <literal>user</literal> filter. You can no longer set a callback function
using <function>mysqlnd_ms_set_user_pick_server</function> at runtime but have to
configure it in the plugins configuration file. The <literal>user</literal>
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 <constant>E_RECOVERABLE_ERROR</constant> level error like

View file

@ -82,7 +82,7 @@
the user connection may change. The applications must be aware of this.
</para>
<para>
The following listshows what the connection state consists of.
The following list shows what the connection state consists of.
</para>
<para>
<itemizedlist>
@ -152,7 +152,7 @@
<para>
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.
</para>
<para>
Please, do not miss the MySQL reference manual chapter on

View file

@ -328,7 +328,7 @@ $mysqli->close();
</example>
</para>
<para>
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 <literal>SET @myrole='master'</literal> does not begin
with the string <literal>SELECT</literal>. 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();
<para>
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.
</para>
<para>

View file

@ -39,7 +39,7 @@
is used to set the plugins configuration file.
</para>
<para>
The configuration file minics standard <literal>php.ini</literal> format.
The configuration file mimics standard the <literal>php.ini</literal> format.
It consists of one or more sections. Every section defines its own unit
of settings. There is no global section for setting defaults.
</para>
@ -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