From 0ee484b92e6b6c1dd50a0c95b7ee2f93d96c9126 Mon Sep 17 00:00:00 2001
From: Philip Olson <philip@php.net>
Date: Fri, 8 Mar 2013 08:26:43 +0000
Subject: [PATCH] Misc updates

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@329701 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mysqlnd_ms/concepts.xml  |  7 +++----
 reference/mysqlnd_qc/constants.xml | 16 +++++-----------
 reference/mysqlnd_qc/setup.xml     | 25 +++++++++++--------------
 3 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/reference/mysqlnd_ms/concepts.xml b/reference/mysqlnd_ms/concepts.xml
index 2c70040d93..b5cea6244c 100755
--- a/reference/mysqlnd_ms/concepts.xml
+++ b/reference/mysqlnd_ms/concepts.xml
@@ -1409,7 +1409,7 @@ version = 5.6.2-m5-log
   <note>
    <title>Version requirement</title>
    <para>
-    The feature requires used of PECL/mysqlnd_ms 1.3.0-beta or later
+    The feature requires use of PECL/mysqlnd_ms 1.3.0-beta or later,
     and PECL/mysqlnd_qc 1.1.0-alpha or newer. PECL/mysqlnd_ms must be
     compiled to support the feature. PHP 5.4.0 or newer is required.
    </para>
@@ -1417,9 +1417,8 @@ version = 5.6.2-m5-log
   <note>
    <title>Setup: extension load order</title>
    <para>
-    If using shared extensions builds and loading extensions by help of the
-    <literal>extension</literal> configuration directive you must load PECL/mysqlnd_ms
-    into PHP prior to loading PECL/mysqlnd_qc into PHP.
+	PECL/mysqlnd_ms must be loaded before PECL/mysqlnd_qc, when using shared
+	extensions.
    </para>
   </note>
   <note>
diff --git a/reference/mysqlnd_qc/constants.xml b/reference/mysqlnd_qc/constants.xml
index 99b2d8ad50..219e0a049f 100644
--- a/reference/mysqlnd_qc/constants.xml
+++ b/reference/mysqlnd_qc/constants.xml
@@ -178,13 +178,11 @@ $pdo_mysql->query("SELECT id, title FROM news");
   <emphasis role="bold">Other</emphasis>
  </para>
  <para>
-  The plugins version number can be obtained using
-  <constant>MYSQLND_QC_VERSION</constant> or
-  <constant>MYSQLND_QC_VERSION_ID</constant>.
-  <constant>MYSQLND_QC_VERSION</constant>
-  is the string representation of the numerical version number
-  <constant>MYSQLND_QC_VERSION_ID</constant>, which is an integer such as 10000.
-  Developers can calculate the version number as follows.
+  The plugin version number can be obtained using either
+  <constant>MYSQLND_QC_VERSION</constant>, which is the string representation 
+  of the numerical version number, or <constant>MYSQLND_QC_VERSION_ID</constant>, 
+  which is an integer such as 10000. Developers can calculate the version number 
+  as follows.
  </para>
  <para>
    <informaltable>
@@ -248,10 +246,6 @@ $pdo_mysql->query("SELECT id, title FROM news");
  </para>
 </appendix>
 
-
-
-
-
 <!-- Keep this comment at the end of the file
 Local variables:
 mode: sgml
diff --git a/reference/mysqlnd_qc/setup.xml b/reference/mysqlnd_qc/setup.xml
index 2d50a67e81..1cf1f07b01 100644
--- a/reference/mysqlnd_qc/setup.xml
+++ b/reference/mysqlnd_qc/setup.xml
@@ -11,34 +11,31 @@
   </para>
   <para>
    PECL/mysqlnd_qc is a mysqlnd plugin. It plugs into the mysqlnd library.
-   To use you plugin with a PHP MySQL extension  (<link linkend="ref.mysqli">mysqli</link>,
-   <link linkend="ref.mysql">mysql</link>, <link linkend="ref.pdo-mysql">PDO_MYSQL</link>)
-   it is necessary to enable use of the mysqlnd library by the PHP MySQL extension
-   in question. Please refer to the extensions manual sections for details.
+   To use you this plugin with a PHP MySQL extension, the extension (<link linkend="ref.mysqli">mysqli</link>,
+   <link linkend="ref.mysql">mysql</link>, or <link linkend="ref.pdo-mysql">PDO_MYSQL</link>)
+   must enable the mysqlnd library.
   </para>
   <para>
-   For using
-   <literal>
-    <link linkend="ref.apc">APC</link>
-   </literal> storage handler with PECL/mysqlnd_qc 1.0
+   For using the <link linkend="ref.apc">APC</link> storage handler with PECL/mysqlnd_qc 1.0
    <literal>APC 3.1.3p1-beta</literal> or newer.
    PECL/mysqlnd_qc 1.2 has been tested with <literal>APC 3.1.13-beta</literal>.
    The APC storage handler cannot be used with a shared build. You cannot use the PHP
-   configuration directive <literal>extension</literal> to load APC and PECL/mysqlnd_qc
-   extensions if PECL/mysqlnd_qc shall use APC as a storage handler. For using
-   the APC storage handler you have to compile PHP with APC and PECL/mysqlnd_qc
-   built-in statically to PHP.
+   configuration directive <literal>extension</literal> to load the APC and PECL/mysqlnd_qc
+   extensions if PECL/mysqlnd_qc will use APC as a storage handler. For using
+   the APC storage handler, you have to statically compile PHP with APC and PECL/mysqlnd_qc
+   support into PHP.
   </para>
   <para>
    For using
    <literal>MEMCACHE</literal> storage handler:
-   <literal>libmemcache 0.38</literal> or newer.
+   Use <literal>libmemcache 0.38</literal> or newer.
    PECL/mysqlnd_qc 1.2 has been tested with <literal>libmemcache 1.4.0</literal>.
   </para>
   <para>
    For using
    <literal>sqlite</literal> storage handler:
-   <literal>sqlite3</literal> bundled with PHP.
+   Use the <link linkend="book.sqlite3">sqlite3</link> extension that 
+   bundled with PHP.
   </para>
  </section>