From 5a5255d2befe4319d3ae4793f29577a783dd8a07 Mon Sep 17 00:00:00 2001
From: Ulf Wendel <uw@php.net>
Date: Thu, 7 Mar 2013 10:51:41 +0000
Subject: [PATCH] Mostly QC related notes

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@329688 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mysqlnd_ms/changes.xml    | 17 ++++++++++++++++-
 reference/mysqlnd_ms/concepts.xml   | 16 +++++++++++++++-
 reference/mysqlnd_ms/quickstart.xml |  9 +++------
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/reference/mysqlnd_ms/changes.xml b/reference/mysqlnd_ms/changes.xml
index 16200725fe..4b4f260f9e 100644
--- a/reference/mysqlnd_ms/changes.xml
+++ b/reference/mysqlnd_ms/changes.xml
@@ -24,7 +24,7 @@
     </listitem>
     <listitem>
      <simpara>
-      Motto/theme: Tweaking based on user feedback
+      Motto/theme: Sharding support, improved transaction support
      </simpara>
     </listitem>
    </itemizedlist>
@@ -144,6 +144,21 @@
 
  <section xml:id="mysqlnd-ms.changes-one-four">
   <title xmlns="http://docbook.org/ns/docbook">PECL/mysqlnd_ms 1.4 series</title>
+  <para>
+   1.4.2-stable
+   <itemizedlist>
+    <listitem>
+     <simpara>
+      Release date: 08/2012
+     </simpara>
+    </listitem>
+    <listitem>
+     <simpara>
+      Motto/theme: Tweaking based on user feedback
+     </simpara>
+    </listitem>
+   </itemizedlist>
+  </para>
   <para>
    1.4.1-beta
    <itemizedlist>
diff --git a/reference/mysqlnd_ms/concepts.xml b/reference/mysqlnd_ms/concepts.xml
index 8dfd0116ed..2c70040d93 100755
--- a/reference/mysqlnd_ms/concepts.xml
+++ b/reference/mysqlnd_ms/concepts.xml
@@ -1410,10 +1410,24 @@ version = 5.6.2-m5-log
    <title>Version requirement</title>
    <para>
     The feature requires used of PECL/mysqlnd_ms 1.3.0-beta or later
-    and PECL/mysqlnd_qc 1.1.0-alpha or new. PECL/mysqlnd_ms must be
+    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>
   </note>
+  <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.
+   </para>
+  </note>
+  <note>
+   <title>Feature stability</title>
+   <para>
+    The cache integration is of beta quality.
+   </para>
+  </note>
   <note>
    <title>Suitable MySQL clusters</title>
    <para>
diff --git a/reference/mysqlnd_ms/quickstart.xml b/reference/mysqlnd_ms/quickstart.xml
index 00da3b8a44..678258d101 100755
--- a/reference/mysqlnd_ms/quickstart.xml
+++ b/reference/mysqlnd_ms/quickstart.xml
@@ -1519,13 +1519,10 @@ var_dump($res->fetch_assoc());
  <section xml:id="mysqlnd-ms.quickstart.cache">
   <title>Cache integration</title>
   <note>
-   <title>Version requirement and dependencies</title>
+   <title>Version requirement, dependencies and status</title>
    <para>
-    Cache integration is available as of PECL/mysqlnd_ms 1.3.0-beta (under development).
-    <link linkend="book.mysqlnd-qc">PECL/mysqlnd_qc 1.1.0</link> (under development)
-    or newer is used as a cache. Both plugins
-    must be installed. PECL/mysqlnd_ms must be compiled to support the cache feature.
-    Use of PHP 5.4.0 or newer is mandatory.
+    Please, find more about version requirements, extension load order dependencies and the current status
+    in the <link linkend="mysqlnd-ms.concept_cache">concepts section</link>!
    </para>
   </note>
   <para>