List:Commits« Previous MessageNext Message »
From:john.russell Date:April 26 2011 9:26pm
Subject:svn commit - mysqldoc@oter02: r26027 - trunk/mysql-monitor-2.3
View as plain text  
Author: jdrussel
Date: 2011-04-26 23:26:08 +0200 (Tue, 26 Apr 2011)
New Revision: 26027

Log:
Minor editorial changes and reformatting.


Modified:
   trunk/mysql-monitor-2.3/dashboard-query-analyzer-note.xml
   trunk/mysql-monitor-2.3/mem-reference.xml
   trunk/mysql-monitor-2.3/query-analyzer-cc-core.xml
   trunk/mysql-monitor-2.3/query-analyzer-cc.xml
   trunk/mysql-monitor-2.3/query-analyzer-cphp-core.xml


Modified: trunk/mysql-monitor-2.3/dashboard-query-analyzer-note.xml
===================================================================
--- trunk/mysql-monitor-2.3/dashboard-query-analyzer-note.xml	2011-04-26 19:20:16 UTC (rev 26026)
+++ trunk/mysql-monitor-2.3/dashboard-query-analyzer-note.xml	2011-04-26 21:26:08 UTC (rev 26027)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 5; 992 bytes

@@ -64,10 +64,9 @@
   </orderedlist>
 
   <para>
-    If you experience any problems with Query Analyzer, we're interested
-    in working with you closely and quickly to resolve them. Please open
-    a service request right away. We're already working hard on
-    optimizing Agent/proxy RAM usage and are planning a series of rapid
-    releases to quickly distribute these and other improvements to you.
+    If you experience any problems with Query Analyzer, we are
+    interested in working with you closely and quickly to resolve them.
+    Please open a service request right away. We are working hard on
+    optimizing Agent/proxy RAM usage.
   </para>
 </important>


Modified: trunk/mysql-monitor-2.3/mem-reference.xml
===================================================================
--- trunk/mysql-monitor-2.3/mem-reference.xml	2011-04-26 19:20:16 UTC (rev 26026)
+++ trunk/mysql-monitor-2.3/mem-reference.xml	2011-04-26 21:26:08 UTC (rev 26027)
Changed blocks: 2, Lines Added: 1, Lines Deleted: 6; 865 bytes

@@ -395,7 +395,7 @@
 
     <para>
       The Monitor Agent is available for a wide range of operating
-      systems. For an up-to-date list please see the
+      systems. For an up-to-date list, see the
       http://www.mysql.com/products/enterprise/. The agent can be used
       to monitor any MySQL server from version 4.0.x through 6.0.x.
     </para>

@@ -1074,11 +1074,6 @@
 </programlisting>
 
         <note>
-          <para>
-            Please keep in mind the following points when running these
-            statements
-          </para>
-
           <itemizedlist>
 
             <listitem>


Modified: trunk/mysql-monitor-2.3/query-analyzer-cc-core.xml
===================================================================
--- trunk/mysql-monitor-2.3/query-analyzer-cc-core.xml	2011-04-26 19:20:16 UTC (rev 26026)
+++ trunk/mysql-monitor-2.3/query-analyzer-cc-core.xml	2011-04-26 21:26:08 UTC (rev 26027)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 723 bytes

@@ -487,7 +487,7 @@
         <filename>my.cnf</filename> configuration file, or from a
         configuration file which has been specified by the environment
         variable <literal>MYSQL_ENTERPRISE_AGGR_PLUGINCONFIG</literal>.
-        For further information on MySQL opton files, please refer to
+        For further information on MySQL opton files, refer to
         <xref linkend="option-files"/>.
       </para>
 


Modified: trunk/mysql-monitor-2.3/query-analyzer-cc.xml
===================================================================
--- trunk/mysql-monitor-2.3/query-analyzer-cc.xml	2011-04-26 19:20:16 UTC (rev 26026)
+++ trunk/mysql-monitor-2.3/query-analyzer-cc.xml	2011-04-26 21:26:08 UTC (rev 26027)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 708 bytes

@@ -476,7 +476,7 @@
         <filename>my.cnf</filename> configuration file, or from a
         configuration file which has been specified by the environment
         variable <literal>MYSQL_ENTERPRISE_AGGR_PLUGINCONFIG</literal>.
-        For further information on MySQL opton files, please refer to
+        For further information on MySQL opton files, refer to
         <xref linkend="option-files"/>.
       </para>
 


Modified: trunk/mysql-monitor-2.3/query-analyzer-cphp-core.xml
===================================================================
--- trunk/mysql-monitor-2.3/query-analyzer-cphp-core.xml	2011-04-26 19:20:16 UTC (rev 26026)
+++ trunk/mysql-monitor-2.3/query-analyzer-cphp-core.xml	2011-04-26 21:26:08 UTC (rev 26027)
Changed blocks: 3, Lines Added: 14, Lines Deleted: 12; 2255 bytes

@@ -187,14 +187,7 @@
   <caution>
     <para>
       If you are using PHP on Microsoft Windows with the Apache web
-      server (httpd) from apache.org, please note the following.
-    </para>
-
-    <para>
-      The Apache web server is compiled with the legacy Microsoft Visual
-      Studio 6 compiler (VC6). MySQL no longer supports VC6, and as a
-      consequence the &merlin_plugin_php; is compiled with the much
-      newer VC9 compiler. This means that you cannot use PHP as a loaded
+      server (httpd) from apache.org, you cannot use PHP as a loaded
       module with the Apache web server; you must use it in (Fast)CGI
       mode. See
       <ulink url="http://windows.fyicenter.com/view.php?ID=68&amp;R=71">http://windows.fyicenter.com/view.php?ID=68&amp;R=71</ulink>

@@ -202,9 +195,18 @@
     </para>
 
     <para>
-      Note that on Microsoft Windows, <literal>mysqlnd</literal> has
-      been used by default since PHP 5.3.0.
+      This restriction is due to compatibility limits between different
+      versions of the Microsoft Vision Studio compiler. The Apache web
+      server is compiled with the legacy Microsoft Visual Studio 6
+      compiler (VC6). MySQL no longer supports VC6, and as a consequence
+      the &merlin_plugin_php; is compiled with the much newer VC9
+      compiler.
     </para>
+
+    <para>
+      On Microsoft Windows, <literal>mysqlnd</literal> has been used by
+      default since PHP 5.3.0.
+    </para>
   </caution>
 
   <para>

@@ -212,8 +214,8 @@
   </para>
 
   <para>
-    The configuration of the &merlin_plugin_php; is handled through the
-    standard PHP configuration files, either globally using
+    To configure the &merlin_plugin_php;, use the standard PHP
+    configuration files, either globally using
     <filename>php.ini</filename>, or by using the per-directory options,
     as detailed in <ulink url="http://php.net/configuration">PHP
     Configuration</ulink>. The following table shows the available


Thread
svn commit - mysqldoc@oter02: r26027 - trunk/mysql-monitor-2.3john.russell26 Apr