List:Commits« Previous MessageNext Message »
From:john.russell Date:April 22 2011 7:11pm
Subject:svn commit - mysqldoc@oter02: r25983 - trunk/mysql-monitor-2.3
View as plain text  
Author: jdrussel
Date: 2011-04-22 21:11:33 +0200 (Fri, 22 Apr 2011)
New Revision: 25983

Log:
Bring the latest 2.3.3 MEM content back into the main trunk.


Modified:
   trunk/mysql-monitor-2.3/Makefile.depends
   trunk/mysql-monitor-2.3/customizing-monitor.xml
   trunk/mysql-monitor-2.3/dashboard-advisors.xml
   trunk/mysql-monitor-2.3/dashboard-events.xml
   trunk/mysql-monitor-2.3/dashboard-overview.xml
   trunk/mysql-monitor-2.3/dashboard-query-analyzer-note.xml
   trunk/mysql-monitor-2.3/dashboard-query-analyzer.xml
   trunk/mysql-monitor-2.3/dashboard-settings.xml
   trunk/mysql-monitor-2.3/dashboard-whatsnew.xml
   trunk/mysql-monitor-2.3/error-codes.xml
   trunk/mysql-monitor-2.3/faq-core.xml
   trunk/mysql-monitor-2.3/install-agent.xml
   trunk/mysql-monitor-2.3/install-server.xml
   trunk/mysql-monitor-2.3/install-unattended-core.xml
   trunk/mysql-monitor-2.3/install-upgrades.xml
   trunk/mysql-monitor-2.3/install-user-roles.xml
   trunk/mysql-monitor-2.3/installation-reference.xml
   trunk/mysql-monitor-2.3/introduction.xml
   trunk/mysql-monitor-2.3/legalnotice.en.xml
   trunk/mysql-monitor-2.3/mem-reference-advgraph-core.xml
   trunk/mysql-monitor-2.3/mem-reference.xml
   trunk/mysql-monitor-2.3/monitor.xml
   trunk/mysql-monitor-2.3/news-core.xml
   trunk/mysql-monitor-2.3/program-reference-agent-core.xml
   trunk/mysql-monitor-2.3/query-analyzer-cj-core.xml
   trunk/mysql-monitor-2.3/query-analyzer-cnet-core.xml
   trunk/mysql-monitor-2.3/query-analyzer-cphp-core.xml
   trunk/mysql-monitor-2.3/query-analyzer-using-aggregator-core.xml
   trunk/mysql-monitor-2.3/query-analyzer-using-feeding-core.xml
   trunk/mysql-monitor-2.3/query-analyzer-using-proxy.xml
   trunk/mysql-monitor-2.3/query-analyzer-using-ui.xml
   trunk/mysql-monitor-2.3/query-analyzer-using.xml


Modified: trunk/mysql-monitor-2.3/Makefile.depends
===================================================================
--- trunk/mysql-monitor-2.3/Makefile.depends	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/Makefile.depends	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 18, Lines Added: 52, Lines Deleted: 0; 7926 bytes

@@ -203,6 +203,7 @@
 	metadata/dashboard-settings.idmap \
 	metadata/dashboard-whatsnew.idmap \
 	metadata/data-items-core.idmap \
+	metadata/glossary-core.idmap \
 	metadata/install-agent.idmap \
 	metadata/install-server.idmap \
 	metadata/mem-reference-advgraph-core.idmap \

@@ -252,6 +253,7 @@
 	images/published/mem-quan-main.png
 dashboard_query_analyzer_SOURCES = dashboard-query-analyzer.xml $(dashboard_query_analyzer_INCLUDES)
 dashboard_query_analyzer_IDMAPS = \
+	metadata/glossary-core.idmap \
 	metadata/query-analyzer-using.idmap
 dashboard-query-analyzer.validpure: $(dashboard_query_analyzer_SOURCES)
 dashboard-query-analyzer.titles: $(dashboard_query_analyzer_SOURCES)

@@ -337,6 +339,7 @@
 	metadata/dashboard-replication.idmap \
 	metadata/dashboard-settings.idmap \
 	metadata/dashboard-whatsnew.idmap \
+	metadata/glossary-core.idmap \
 	metadata/install-agent.idmap \
 	metadata/program-reference-server-core.idmap \
 	metadata/query-analyzer-using-ui.idmap

@@ -439,6 +442,28 @@
 dynxml-local-faq-manprepped.xml: $(dynxml_local_faq_SOURCES) $(dynxml_local_faq_IDMAPS)
 dynxml-local-faq-remprepped.xml: $(dynxml_local_faq_SOURCES) $(dynxml_local_faq_IDMAPS)
 dynxml-local-faq.xml: $(dynxml_local_faq_IDMAPS) $(dynxml_local_faq_INCLUDES)
+dynxml_local_glossary_INCLUDES = \
+	../common/fixedchars.ent \
+	../common/phrases.ent \
+	../dynamic-docs/glossary/monitor.xml \
+	../mysql-monitor-common/urls.ent \
+	all-entities.ent \
+	enterprise.ent \
+	glossary-core.xml \
+	version.ent
+dynxml_local_glossary_IMAGES =
+dynxml_local_glossary_SOURCES = dynxml-local-glossary.xml $(dynxml_local_glossary_INCLUDES)
+dynxml_local_glossary_IDMAPS =
+dynxml-local-glossary.validpure: $(dynxml_local_glossary_SOURCES)
+dynxml-local-glossary.titles: $(dynxml_local_glossary_SOURCES)
+dynxml-local-glossary.useless: $(dynxml_local_glossary_SOURCES)
+dynxml-local-glossary.valid: $(dynxml_local_glossary_SOURCES) $(dynxml_local_glossary_IDMAPS)
+dynxml-local-glossary.validwarn: $(dynxml_local_glossary_SOURCES) $(dynxml_local_glossary_IDMAPS)
+dynxml-local-glossary-prepped.xml: $(dynxml_local_glossary_SOURCES) $(dynxml_local_glossary_IDMAPS)
+dynxml-local-glossary-helpprepped.xml: $(dynxml_local_glossary_SOURCES) $(dynxml_local_glossary_IDMAPS)
+dynxml-local-glossary-manprepped.xml: $(dynxml_local_glossary_SOURCES) $(dynxml_local_glossary_IDMAPS)
+dynxml-local-glossary-remprepped.xml: $(dynxml_local_glossary_SOURCES) $(dynxml_local_glossary_IDMAPS)
+dynxml-local-glossary.xml: $(dynxml_local_glossary_IDMAPS) $(dynxml_local_glossary_INCLUDES)
 dynxml_local_install_unattended_INCLUDES = \
 	../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
 	../common/fixedchars.ent \

@@ -820,6 +845,7 @@
 dynxml_local_query_analyzer_using_feeding_IDMAPS = \
 	../refman-common/metadata/connector-j.idmap \
 	../refman-common/metadata/connector-net-connection-options.idmap \
+	metadata/glossary-core.idmap \
 	metadata/program-reference-agent-core.idmap \
 	metadata/query-analyzer-cj-core.idmap \
 	metadata/query-analyzer-using-proxy.idmap

@@ -867,6 +893,20 @@
 faq-core-manprepped.xml: $(faq_core_SOURCES) $(faq_core_IDMAPS)
 faq-core-remprepped.xml: $(faq_core_SOURCES) $(faq_core_IDMAPS)
 
+glossary_core_INCLUDES =
+glossary_core_IMAGES =
+glossary_core_SOURCES = glossary-core.xml $(glossary_core_INCLUDES)
+glossary_core_IDMAPS =
+glossary-core.validpure: $(glossary_core_SOURCES)
+glossary-core.titles: $(glossary_core_SOURCES)
+glossary-core.useless: $(glossary_core_SOURCES)
+glossary-core.valid: $(glossary_core_SOURCES) $(glossary_core_IDMAPS)
+glossary-core.validwarn: $(glossary_core_SOURCES) $(glossary_core_IDMAPS)
+glossary-core-prepped.xml: $(glossary_core_SOURCES) $(glossary_core_IDMAPS)
+glossary-core-helpprepped.xml: $(glossary_core_SOURCES) $(glossary_core_IDMAPS)
+glossary-core-manprepped.xml: $(glossary_core_SOURCES) $(glossary_core_IDMAPS)
+glossary-core-remprepped.xml: $(glossary_core_SOURCES) $(glossary_core_IDMAPS)
+
 install_agent_INCLUDES = \
 	../common/fixedchars.ent \
 	../common/phrases.ent \

@@ -951,6 +991,7 @@
 install_server_IDMAPS = \
 	metadata/dashboard-overview.idmap \
 	metadata/dashboard-settings.idmap \
+	metadata/glossary-core.idmap \
 	metadata/install-server.idmap \
 	metadata/install-unattended-core.idmap \
 	metadata/install-user-roles.idmap

@@ -1051,6 +1092,7 @@
 install_user_roles_IMAGES =
 install_user_roles_SOURCES = install-user-roles.xml $(install_user_roles_INCLUDES)
 install_user_roles_IDMAPS = \
+	metadata/glossary-core.idmap \
 	metadata/install-agent.idmap \
 	metadata/install-user-roles.idmap
 install-user-roles.validpure: $(install_user_roles_SOURCES)

@@ -1123,6 +1165,7 @@
 	metadata/dashboard-query-analyzer.idmap \
 	metadata/dashboard-replication.idmap \
 	metadata/dashboard-settings.idmap \
+	metadata/glossary-core.idmap \
 	metadata/install-agent.idmap \
 	metadata/install-server.idmap \
 	metadata/install-unattended-core.idmap \

@@ -1160,6 +1203,7 @@
 introduction_SOURCES = introduction.xml $(introduction_INCLUDES)
 introduction_IDMAPS = \
 	metadata/dashboard-overview.idmap \
+	metadata/glossary-core.idmap \
 	metadata/install-agent.idmap \
 	metadata/introduction.idmap
 introduction.validpure: $(introduction_SOURCES)

@@ -1243,6 +1287,7 @@
 mem_reference_SOURCES = mem-reference.xml $(mem_reference_INCLUDES)
 mem_reference_IDMAPS = \
 	metadata/dashboard-settings.idmap \
+	metadata/glossary-core.idmap \
 	metadata/mem-reference-advgraph-core.idmap
 mem-reference.validpure: $(mem_reference_SOURCES)
 mem-reference.titles: $(mem_reference_SOURCES)

@@ -1333,6 +1378,7 @@
 	../dynamic-docs/command-optvars/mysql-monitor-plugin-cj.xml \
 	../dynamic-docs/command-optvars/mysql-monitor-server-installer.xml \
 	../dynamic-docs/faq/monitor.xml \
+	../dynamic-docs/glossary/monitor.xml \
 	../dynamic-docs/licenses/products.xml \
 	../dynamic-docs/mem-advgraph/graph-desc.xml \
 	../dynamic-docs/mem-data-items/mem-data-items.xml \

@@ -1352,6 +1398,7 @@
 	data-items-core.xml \
 	dynxml-local-data-items.xml \
 	dynxml-local-faq.xml \
+	dynxml-local-glossary.xml \
 	dynxml-local-install-unattended.xml \
 	dynxml-local-licenses-third-party.xml \
 	dynxml-local-mem-reference-advgraph.xml \

@@ -1365,6 +1412,7 @@
 	enterprise.ent \
 	error-codes.xml \
 	faq-core.xml \
+	glossary-core.xml \
 	images/generated/mem-overview-agent-aggregator-autosvg.png \
 	images/generated/mem-overview-agent-proxy-autosvg.png \
 	images/generated/mem-overview-autosvg.png \

@@ -1606,6 +1654,7 @@
 	metadata/dashboard-whatsnew.idmap \
 	metadata/data-items-core.idmap \
 	metadata/faq-core.idmap \
+	metadata/glossary-core.idmap \
 	metadata/install-agent.idmap \
 	metadata/install-server.idmap \
 	metadata/install-unattended-core.idmap \

@@ -1769,6 +1818,7 @@
 	images/generated/mem-quan-before-proxy-autosvg.png
 query_analyzer_using_proxy_SOURCES = query-analyzer-using-proxy.xml $(query_analyzer_using_proxy_INCLUDES)
 query_analyzer_using_proxy_IDMAPS = \
+	metadata/glossary-core.idmap \
 	metadata/program-reference-agent-core.idmap \
 	metadata/query-analyzer-using-proxy.idmap
 query-analyzer-using-proxy.validpure: $(query_analyzer_using_proxy_SOURCES)

@@ -1832,6 +1882,7 @@
 	../refman-5.5/metadata/sql-syntax-utility.idmap \
 	../refman-5.5/metadata/tutorial.idmap \
 	metadata/faq-core.idmap \
+	metadata/glossary-core.idmap \
 	metadata/query-analyzer-using-consuming.idmap \
 	metadata/query-analyzer-using-ui.idmap
 query-analyzer-using-ui.validpure: $(query_analyzer_using_ui_SOURCES)

@@ -1899,6 +1950,7 @@
 	../refman-common/metadata/connector-j.idmap \
 	../refman-common/metadata/connector-net-connection-options.idmap \
 	metadata/faq-core.idmap \
+	metadata/glossary-core.idmap \
 	metadata/program-reference-agent-core.idmap \
 	metadata/query-analyzer-cj-core.idmap \
 	metadata/query-analyzer-using-consuming.idmap \


Modified: trunk/mysql-monitor-2.3/customizing-monitor.xml
===================================================================
--- trunk/mysql-monitor-2.3/customizing-monitor.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/customizing-monitor.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 5; 1161 bytes

@@ -910,7 +910,7 @@
 
     <para>
       You can alter multiple rules for one or more servers by selecting
-      the appropriate check box and clicking the
+      the appropriate checkbox and clicking the
       <guibutton>unschedule</guibutton>, <guibutton>enable</guibutton>,
       or <guibutton>disable</guibutton> button.
     </para>

@@ -967,10 +967,9 @@
 
     <para>
       When the HTTP authentication dialog box requesting your Dashboard
-      user name and password opens, specify the administrator's
-      credentials. The default user name is <literal>admin</literal>;
-      use the password you specified when you initially logged in to the
-      Dashboard.
+      user name and password opens, specify the credentials for the
+      Manager user. Use the ID and password you specified when you
+      initially logged in to the Dashboard.
     </para>
 
     <para>


Modified: trunk/mysql-monitor-2.3/dashboard-advisors.xml
===================================================================
--- trunk/mysql-monitor-2.3/dashboard-advisors.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/dashboard-advisors.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 7, Lines Added: 11, Lines Deleted: 12; 3767 bytes

@@ -25,7 +25,7 @@
     Agents, analyze that information based on custom rules included as
     part of &merlin;, and then offer alerts and advice when necessary.
     As new rules are introduced, the &merlin_advisor;s can be updated
-    through the &mysql_enterprise; website.
+    over the Web.
   </para>
 
   <para>

@@ -296,13 +296,12 @@
     <para>
       Instructions for installing Advisors are given in
       <xref linkend="mem-advisor-installation-after-login"/>, and
-      following. You must configure your &mysql_enterprise; login before
-      you can update your Advisors.
+      following.
     </para>
 
     <para>
-      If your &mysql_enterprise; login is configured, you can download
-      the latest Advisors by navigating to the
+      If your Service Manager can connect to the Internet, you can
+      download the latest Advisors by navigating to the
       <guilabel>Advisors</guilabel> tab and finding the <literal>Check
       for Updates</literal> link. You can periodically update advisors
       in this way.

@@ -311,7 +310,7 @@
     <note>
       <para>
         If you do not have Internet access and cannot use the online
-        update option you can manually import advisors. This process is
+        update option, you can manually import advisors. This process is
         described in
         <xref linkend="mem-advisor-installation-after-login"/>.
       </para>

@@ -369,8 +368,8 @@
     </para>
 
     <para>
-      You may activate all the rules in a group by selecting the check
-      box beside the group name. Once selected you may apply rules
+      You may activate all the rules in a group by selecting the
+      checkbox beside the group name. Once selected you may apply rules
       against a specific server or a group of servers. A message showing
       the group of servers or the specific server you have selected will
       display immediately below the <guibutton>schedule</guibutton>

@@ -382,7 +381,7 @@
 
     <para>
       To select a specific rule, expand the group tree by clicking the
-      <guibutton>+</guibutton> button. Select the check box to the left
+      <guibutton>+</guibutton> button. Select the checkbox to the left
       of the rule you wish to schedule. Click
       <guibutton>schedule</guibutton> to display the following dialog
       box:

@@ -504,14 +503,14 @@
     </para>
 
     <para>
-      You can schedule multiple rules by selecting the check box next to
+      You can schedule multiple rules by selecting the checkbox next to
       each rule and clicking the <guibutton>schedule</guibutton> button
       is an effective way to schedule multiple rules.
     </para>
 
     <para>
       When scheduling more than one rule, you have the option of
-      selecting a check box to use the default frequency of each rule or
+      selecting a checkbox to use the default frequency of each rule or
       you may choose a frequency that will apply to all selected rules.
       When customizing the frequency, take care that you choose a value
       that is appropriate to all the rules selected.

@@ -561,7 +560,7 @@
 
       <para>
         If you have set up global SNMP traps, check the <literal>Use
-        SNMP Traps</literal> check box for a specific rule to make your
+        SNMP Traps</literal> checkbox for a specific rule to make your
         Network Management System (NMS) handle events related to that
         rule. For more information about Simple Network Management
         Protocol (SNMP) see <link linkend="mem-snmp-traps">Simple


Modified: trunk/mysql-monitor-2.3/dashboard-events.xml
===================================================================
--- trunk/mysql-monitor-2.3/dashboard-events.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/dashboard-events.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 575 bytes

@@ -413,7 +413,7 @@
     </para>
 
     <para>
-      To close a number of alerts simultaneously, select the check box
+      To close a number of alerts simultaneously, select the checkbox
       beside each alert to close and click the
       <guibutton>close</guibutton> button.
     </para>


Modified: trunk/mysql-monitor-2.3/dashboard-overview.xml
===================================================================
--- trunk/mysql-monitor-2.3/dashboard-overview.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/dashboard-overview.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 4, Lines Added: 10, Lines Deleted: 12; 2584 bytes

@@ -64,9 +64,9 @@
     <para>
       The &merlin_client; provides you with information about your MySQL
       servers: a list of the latest &merlin_advisor; reports, server
-      status information, &mysql_enterprise; alerts, and updated views
-      of monitored MySQL servers. The <guilabel>Monitor</guilabel>
-      screen gives a quick overview of the status of your MySQL servers.
+      status information, alerts, and updated views of monitored MySQL
+      servers. The <guilabel>Monitor</guilabel> screen gives a quick
+      overview of the status of your MySQL servers.
     </para>
 
     <para>

@@ -114,10 +114,10 @@
         </para>
 
         <para>
-          The footer has external links to &mysql_enterprise; and
-          information about the current user. You can remain connected
-          to the Dashboard and update your subscription, use the
-          Enterprise Knowledge Base, and contact technical support.
+          The footer has external links to Oracle software download and
+          support web sites, and information about the current user. You
+          can remain connected to the Dashboard and contact technical
+          support.
         </para>
 
         <para>

@@ -256,13 +256,11 @@
         </para>
       </listitem>
 
-<!-- JDR: seems like could be elaborated a little -->
-
       <listitem>
         <para>
           <guilabel>What's New?</guilabel>: Provides the latest news and
-          information about your installation directly from the
-          Enterprise website. For more information on the data provided,
+          information about your installation directly from an Oracle
+          Web site. For more information on the data provided,
           <xref linkend="mem-whatsnew"/>.
         </para>
       </listitem>

@@ -453,7 +451,7 @@
         drop-down list box. To choose contiguous graphs, hold down the
         <keycap>Shift</keycap> key and click the desired graphs. To
         select graphs that are not in a sequence, click the desired
-        graphs while holding down the <keycap>Control</keycap> key. The
+        graphs while holding down the <keycap>Ctrl</keycap> key. The
         <guilabel>Monitor</guilabel> page can display a maximum of six
         graphs. Save your changes, and these become be the default
         graphs whenever you log in.


Modified: trunk/mysql-monitor-2.3/dashboard-query-analyzer-note.xml
===================================================================
--- trunk/mysql-monitor-2.3/dashboard-query-analyzer-note.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/dashboard-query-analyzer-note.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 937 bytes

@@ -66,8 +66,8 @@
   <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 Support issue 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.
+    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.
   </para>
 </important>


Modified: trunk/mysql-monitor-2.3/dashboard-query-analyzer.xml
===================================================================
--- trunk/mysql-monitor-2.3/dashboard-query-analyzer.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/dashboard-query-analyzer.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 4; 1506 bytes

@@ -17,16 +17,19 @@
     Query Analyzer lets you monitor the statements being executed on a
     monitored server and retrieve information about the query, number of
     executions and the execution times of each query. Queries are
-    normalized, so that the unique data defined within each query has
-    been removed. By removing the data specific elements of the queries,
-    the generic queries can be counted and identified more easily.
+    <link linkend="glos_normalized_query">normalized</link>, so that the
+    unique data defined within each query has been removed. By removing
+    the data specific elements of the queries, the generic queries can
+    be counted and identified more easily.
   </para>
 
+<!-- JDR: link to Connector in Glossary, in post-2.3.3 timeframe. -->
+
   <para>
     Query Analyzer works by collecting information about SQL statements
     that your MySQL client application sends to the MySQL server, either
     by using the &merlin_agent; proxy service, or by using the MySQL
-    Enterprise Monitor Plugin for a given connector that sends the
+    Enterprise Monitor Plugin for a given Connector that sends the
     information directly to &merlin_server;.
   </para>
 


Modified: trunk/mysql-monitor-2.3/dashboard-settings.xml
===================================================================
--- trunk/mysql-monitor-2.3/dashboard-settings.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/dashboard-settings.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 27, Lines Added: 102, Lines Deleted: 90; 17629 bytes

@@ -22,7 +22,7 @@
   </note>
 
   <para>
-    The initial installation lets you configure your &mysql_enterprise;
+    The initial installation lets you configure your My Oracle Support
     credentials and outgoing email settings. This section explores the
     configuration settings in more detail, and shows how to manage
     servers, users, notification groups, Simple Network Management

@@ -48,7 +48,7 @@
     <para>
       The <guilabel>Global Settings</guilabel> control the main
       configuration parameters for the entire &merlin; system, including
-      your email notifications, data purge, and Enterprise website
+      your email notifications, data purge, and My Oracle Support
       credentials.
     </para>
 

@@ -107,7 +107,7 @@
 
         <para>
           Ensure that the <literal>Enable Email Notifications</literal>
-          check box is checked and enter information as appropriate.
+          checkbox is checked and enter information as appropriate.
         </para>
 
         <indexterm>

@@ -142,13 +142,22 @@
         </note>
 
         <para>
+          To enter the SMTP server password, check the <guilabel>Update
+          Password On Save</guilabel> box first. When you return to this
+          dialog to update settings other than the SMTP password, leave
+          this box unchecked to avoid blanking out the saved password.
+          If the SMTP password does change later, check the box again
+          and enter the new password.
+        </para>
+
+        <para>
           To test your configuration immediately, add an email address
           to the <guilabel>On Save, Send Test Email Message
           to</guilabel> box.
         </para>
 
         <para>
-          For more information about
+          For more information, see
           <link linkend="mem-outgoing-email-settings"><guilabel>Outgoing
           Email Settings</guilabel></link>.
         </para>

@@ -162,11 +171,13 @@
         <para>
           The <guilabel>SNMP Traps</guilabel> section of the
           <guilabel>Global Settings</guilabel> tab lets you enable
-          Simple Network Management Protocol so that your Network
-          Management System (NMS) can handle events created by the
-          &merlin;. SNMP notifications are off by default. To enable
-          them, click the <guilabel>Enable SNMP Notifications</guilabel>
-          check box.
+          Simple Network Management Protocol so that your
+          <link linkend="glos_nms">Network Management System
+          (NMS)</link> can handle &merlin; events.
+          <link linkend="glos_snmp">SNMP</link> notifications are off by
+          default. To enable the checkboxes that associate specific
+          rules with SNMP traps, click the <guilabel>Enable SNMP
+          Notifications</guilabel> checkbox first.
         </para>
 
         <figure id="fig-settings-snmp">

@@ -223,26 +234,26 @@
         </para>
 
         <para>
-          To ensure that the target you have specified is valid, check
-          the <literal>On Save, Send Test Trap</literal> check box. The
-          remaining check boxes help you to configure how your NMS
-          responds to &merlin;. Check the <guilabel>Up/Down
-          Application</guilabel> check box to configure NMS for starting
-          up or shutting down the &merlin;. For configuration of advisor
-          events choose a level of severity and check the
-          <guilabel>Advisor event with the severity of
-          <replaceable>Critical</replaceable></guilabel> check box.
-          Finally, choose the <guilabel>Application Error</guilabel>
-          check box to configure NMS to support application error traps.
-          Be sure to save your settings before exiting.
+          To ensure that the specified target is valid, check the
+          <literal>On Save, Send Test Trap</literal> check box. The
+          remaining check boxes configure how your NMS responds to
+          &merlin;. Check the <guilabel>Up/Down Application</guilabel>
+          check box to configure NMS for starting up or shutting down
+          the &merlin;. For configuration of advisor events, choose a
+          level of severity and check the <guilabel>Advisor event with
+          the severity of <replaceable>Critical</replaceable></guilabel>
+          check box. Finally, choose the <guilabel>Application
+          Error</guilabel> check box to configure NMS to support
+          application error traps. Be sure to save your settings before
+          exiting.
         </para>
 
         <para>
-          To enable SNMP traps globally, check the <literal>Enable SNMP
-          Notifications</literal> check box. To enable SNMP traps for
-          specific rules, also check the <literal>Use SNMP
-          Traps</literal> check box for each rule. For instructions on
-          doing this, see <xref linkend="mem-scheduling-rules"/>.
+          To enable <link linkend="glos_snmp">SNMP traps</link>, check
+          the <literal>Enable SNMP Notifications</literal> checkbox,
+          then check the <literal>Use SNMP Traps</literal> checkbox for
+          each rule that should result in an SNMP trap. For instructions
+          on doing this, see <xref linkend="mem-scheduling-rules"/>.
         </para>
 
         <para>

@@ -462,16 +473,6 @@
             </para>
           </listitem>
 
-          <listitem>
-            <para>
-              You cannot set the Query Analyzer purge period to a value
-              greater than historical data collection purge period.
-              Attempting to do so produces a warning: <literal>An
-              invalid Query Analyzer data life span was given. Value may
-              not be larger than data life span.</literal>.
-            </para>
-          </listitem>
-
         </itemizedlist>
       </listitem>
 

@@ -505,38 +506,40 @@
         </figure>
       </listitem>
 
+<!-- JDR: need to repurpose the screenshot as MOS rather than MySQL Enterprise. -->
+
       <listitem>
         <para>
-          <guilabel>MySQL Enterprise Credentials</guilabel>
+          <guilabel>My Oracle Support Credentials</guilabel>
         </para>
 
         <para>
-          You can specify the credentials for logging into the MySQL
-          Enterprise Website. These should match the user name and
-          password that you have registered with MySQL for your
-          enterprise subscription.
+          You can specify the credentials for logging into the My Oracle
+          Support site. These should match the user name and password
+          that you have registered with Oracle for access to the support
+          site.
         </para>
 
         <figure id="fig-settings-credentials">
-          <title>&merlin_client; Settings: MySQL Enterprise Credentials</title>
+          <title>&merlin_client; Settings: My Oracle Support Credentials</title>
           <mediaobject>
             <imageobject>
               <imagedata contentwidth="499" contentdepth="239" fileref="images/published/settings-credentials.png"                                                     
               format="PNG" lang="en"/>
             </imageobject>
             <textobject>
-              <phrase lang="en">&merlin_client; Settings: MySQL
-              Enterprise Credentials</phrase>
+              <phrase lang="en">&merlin_client; Settings: My Oracle
+              Support Credentials</phrase>
             </textobject>
           </mediaobject>
         </figure>
 
         <note>
           <para>
-            Only administrators can change the <literal>MySQL Enterprise
-            Credentials</literal> section; for other users, this section
-            does not show up in the interface. For more information
-            about different users and their rights see
+            Only administrators can change the <literal>My Oracle
+            Support Credentials</literal> section; for other users, this
+            section does not show up in the interface. For more
+            information about different users and their rights see
             <xref linkend="mem-managing-users"/>. Specifying incorrect
             credentials results in the error message, <quote>Your
             credentials do not appear to be valid.</quote>

@@ -550,11 +553,11 @@
         </para>
 
         <para>
-          You may want to update your HTTP Proxy Settings if your
+          You might want to update your HTTP Proxy Settings if your
           &merlin_server; is not directly connected to the internet. The
-          proxy settings will be used when updating the information
-          within the <guilabel>What's New</guilabel> tab. For more
-          information, see <xref linkend="mem-whatsnew"/>.
+          proxy settings are used when updating the information within
+          the <guilabel>What's New</guilabel> tab. For more information,
+          see <xref linkend="mem-whatsnew"/>.
         </para>
 
         <figure id="fig-settings-http-proxy">

@@ -580,7 +583,7 @@
         <para>
           You can update your Advisor Bundle and the associated rules
           and graphs by importing a new Advisor Bundle. To update your
-          Advisor Bundle using a bundle file that you have previous
+          Advisor Bundle using a bundle file that you have previously
           downloaded:
         </para>
 

@@ -609,7 +612,7 @@
 
           <listitem>
             <para>
-              Click <guibutton>save</guibutton> to upload the updated
+              Click <guibutton>Save</guibutton> to upload the updated
               bundle and validate the contents.
             </para>
           </listitem>

@@ -617,11 +620,8 @@
         </orderedlist>
 
         <para>
-          To update the Advisor Bundle automatically from the
-          <ulink url="http://enterprise.mysql.com">MySQL Enterprise
-          Website</ulink> using your existing MySQL Enterprise
-          Credentials, click the <guibutton>update advisors</guibutton>
-          button.
+          To update the Advisor Bundle automatically over the web, click
+          the <guibutton>update advisors</guibutton> button.
         </para>
       </listitem>
 

@@ -633,8 +633,8 @@
         <para>
           You can configure LDAP Authentication to be used for the users
           that are provided access to the &merlin_client;. To use LDAP
-          authentication it must have been enabled and configured within
-          the settings.
+          authentication, it must have been enabled and configured
+          within the settings.
         </para>
 
         <figure id="fig-settings-ldap">

@@ -664,7 +664,7 @@
 
             <para>
               To enable LDAP authentication, click the <guilabel>Use
-              LDAP for Authentication</guilabel> check box.
+              LDAP for Authentication</guilabel> checkbox.
             </para>
           </listitem>
 

@@ -676,9 +676,9 @@
             <para>
               If you want to make LDAP the authoritative (only)
               authentication mechanism, check the <guilabel>LDAP is
-              Authoritative</guilabel> check box. Note that if you
-              select this option and the LDAP service is misconfigured,
-              you can lock yourself out of &merlin_client; entirely.
+              Authoritative</guilabel> checkbox. Note that if you select
+              this option and the LDAP service is misconfigured, you can
+              lock yourself out of &merlin_client; entirely.
             </para>
           </listitem>
 

@@ -776,6 +776,23 @@
 
           <listitem>
             <para>
+              <guilabel>Update Password On Save</guilabel> box and
+              password fields
+            </para>
+
+            <para>
+              To enter the LDAP server password, check the
+              <guilabel>Update Password On Save</guilabel> box first.
+              When you return to this dialog to update settings other
+              than the LDAP password, leave this box unchecked to avoid
+              blanking out the saved password. If the LDAP password does
+              change later, check the box again and enter the new
+              password.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
               <guilabel>User Search Pattern</guilabel>
             </para>
 

@@ -1239,11 +1256,11 @@
 
       <listitem>
         <para>
-          To rename a server choose <guibutton>rename</guibutton>, or to
-          rename a group, choose <guibutton>rename group</guibutton>.
+          To rename a server, choose <guibutton>rename</guibutton>, or
+          to rename a group, choose <guibutton>rename group</guibutton>.
           For information on renaming a server, see
-          <xref linkend="mem-server-rename"/>. To rename a group, you
-          can change change within the pop-up prompt provided.
+          <xref linkend="mem-server-rename"/>. To rename a group, change
+          the name within the pop-up prompt provided.
         </para>
       </listitem>
 

@@ -1456,7 +1473,7 @@
 
       <para>
         You can remove one or multiple servers at the same time. To
-        remove a server or servers, click the check box next to each
+        remove a server or servers, click the checkbox next to each
         server that you want to delete, then click the <guibutton>delete
         servers</guibutton> button. You are asked to confirm the
         deletion of the servers: click <guibutton>delete</guibutton> to

@@ -1535,14 +1552,14 @@
 
           <listitem>
             <para>
-              Cannot add/remove or change users
+              Cannot add/remove or change users.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              Cannot change the MySQL Enterprise credentials used to
-              communicate with the MySQL Enterprise website.
+              Cannot change the My Oracle Support credentials used to
+              communicate with the My Oracle Support website.
             </para>
           </listitem>
 

@@ -1554,7 +1571,7 @@
 
           <listitem>
             <para>
-              Cannot update the Advisor bundle
+              Cannot update the Advisor bundle.
             </para>
           </listitem>
 

@@ -1626,13 +1643,8 @@
     </itemizedlist>
 
     <para>
-      When the Dashboard is first launched there are two default users,
-      <literal>Administrator</literal> and <literal>Agent</literal>,
-      both created during installation. Their default user names are
-      respectively, <literal>admin</literal> and
-      <literal>agent</literal>. The Administrator defined during
-      installation as having the root role is unique; this user cannot
-      be deleted.
+      The Administrator defined during installation as having the root
+      role is unique; this user cannot be deleted.
     </para>
 
     <para>

@@ -1659,10 +1671,10 @@
 
     <warning>
       <para>
-        To receive &mysql_enterprise; and Advisor updates, configure the
-        &mysql_enterprise; settings for at least one user. The MySQL
-        Enterprise settings were set up on the first login to the
-        Dashboard. For information on changing these settings, see
+        To receive support-related updates, configure the My Oracle
+        Support credentials for at least one user. These settings were
+        set up on the first login to the Dashboard. For information on
+        changing these settings, see
         <xref linkend="mem-global-settings"/>.
       </para>
     </warning>

@@ -1680,7 +1692,7 @@
       within &merlin;, or you can opt to use an external LDAP service.
       To use the LDAP service, you must still create each user, and then
       select the <guilabel>Authenticate this user using LDAP</guilabel>
-      check box within the <guilabel>Edit User</guilabel> window. The
+      checkbox within the <guilabel>Edit User</guilabel> window. The
       username entered is authenticated against the configured LDAP
       server. For more information on configuring the LDAP server to be
       used, see <link linkend="mem-config-ldap"><guilabel>LDAP

@@ -1771,7 +1783,7 @@
       notification occurs to be limited to the size of an SMS message.
       You can then use a notification group email address that forwards
       to an SMS service so that you can get notification on your phone
-      with an SMS service. Selecting the check box next to
+      with an SMS service. Selecting the checkbox next to
       <guilabel>SMS</guilabel> only changes the length and format of the
       message that is sent to be compatible with the SMS size limits.
     </para>

@@ -1779,7 +1791,7 @@
     <para>
       You can also optionally select a notification group to be used
       when sending critical error messages (such as &merlin_agent; or
-      &merlin_server; failures) by selecting the check box next to
+      &merlin_server; failures) by selecting the checkbox next to
       <guilabel>MEM Admin</guilabel>.
     </para>
 

@@ -2203,7 +2215,7 @@
       <listitem>
         <para>
           Select the rules or graphs that you want to export. You can
-          select multiple items by selecting the check box against each
+          select multiple items by selecting the checkbox against each
           rule or graph.
         </para>
       </listitem>

@@ -2233,7 +2245,7 @@
       <listitem>
         <para>
           Select the rules or graphs that you want to export. You can
-          select multiple items by selecting the check box against each
+          select multiple items by selecting the checkbox against each
           rule or graph.
         </para>
       </listitem>


Modified: trunk/mysql-monitor-2.3/dashboard-whatsnew.xml
===================================================================
--- trunk/mysql-monitor-2.3/dashboard-whatsnew.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/dashboard-whatsnew.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 8, Lines Added: 37, Lines Deleted: 33; 6186 bytes

@@ -15,7 +15,7 @@
 
   <para>
     The What's New Page provides a simplified interface for providing
-    updates and news related to your MySQL Enterprise Subscription. By
+    updates and news related to your My Oracle Support account. By
     default, the information is automatically updated every hour. To
     disable the updates, or force an update, see
     <xref linkend="mem-whatsnew-configuration"/>.

@@ -53,15 +53,19 @@
       <para>
         <guilabel>Open Support Issues</guilabel> provides a quick
         interface to the list of currently open issues with MySQL
-        Support as identified through the MySQL Enterprise and Support
-        websites. Issues that are currently marked in the system as
-        <emphasis>Waiting On Customer</emphasis> are also added to the
-        main MySQL Enterprise Dashboard above the Heat Chart.
+        Support as identified through the My Oracle Support web site.
+        Issues that are currently marked in the system as
+
+<!-- JDR: former cited value: <emphasis>Waiting On Customer</emphasis> -->
+
+        <quote>Customer Working</quote> or <quote>Solution
+        Offered</quote> are also added to the main MySQL Enterprise
+        Dashboard above the Heat Chart.
       </para>
 
       <para>
         To use the Open Support Issues functionality, you must have set
-        your MySQL Enterprise credentials within &merlin_client;. For
+        your My Oracle Support credentials within &merlin_client;. For
         more information, see <xref linkend="mem-global-settings"/>.
       </para>
     </listitem>

@@ -69,9 +73,9 @@
     <listitem>
       <para>
         <guilabel>Important Product Release Announcements</guilabel>
-        provides a list of news items from the news feed provided on the
-        MySQL Enterprise website. The news feed will contain important
-        information, including, but not limited to:
+        provides a list of news items from a Web-based news feed. The
+        news feed contains important information, including, but not
+        limited to:
       </para>
 
       <itemizedlist>

@@ -98,24 +102,24 @@
       </itemizedlist>
 
       <para>
-        When items are new (unread), they will be indicated with a star
-        icon. Unread items on the What's New page will also be notified
-        with a number in the tab title within the main Dashboard. Items
-        are automatically marked as read when you visit the What's New
-        page.
+        When items are new (unread), they are indicated with a star
+        icon. Unread items on the What's New page are also notified with
+        a number in the tab title within the main Dashboard. Items are
+        automatically marked as read when you visit the <guilabel>What's
+        New</guilabel> page.
       </para>
 
       <para>
         The announcements information is made available in two ways,
-        using either a connection to the MySQL Enterprise website, when
-        the information will be updated at a set interval, or through
-        information included with the &merlin_advisor; bundles.
+        using either a Web connection, where the information is updated
+        at a set interval, or through information included with the
+        &merlin_advisor; bundles.
       </para>
 
       <note>
         <para>
-          To use poll the MySQL Enterprise site directly your
-          &merlin_server; must have access to the MySQL Enterprise
+          To poll the My Oracle Support site directly, your
+          &merlin_server; must have access to the My Oracle Support
           website. If your &merlin_server; is not directly connected to
           the Internet, you can set an HTTP Proxy to be used to access
           the information. For more information on configuring an HTTP

@@ -128,11 +132,10 @@
 
   <note>
     <para>
-      You can disable the display of your open Support issues and
-      product notifications by using the <guibutton>Configure What's
-      New</guibutton> link on the <guilabel>What's New</guilabel> tab.
-      For more information, see
-      <xref linkend="mem-whatsnew-configuration"/>.
+      To disable the display of your open service requests and product
+      notifications, use the <guibutton>Configure What's New</guibutton>
+      link on the <guilabel>What's New</guilabel> tab. For more
+      information, see <xref linkend="mem-whatsnew-configuration"/>.
     </para>
   </note>
 

@@ -168,13 +171,13 @@
 
       <listitem>
         <para>
-          <guilabel>Automatically check for New
+          <guilabel>Automatically check for Product-Related
           Announcements?</guilabel>
         </para>
 
         <para>
-          To disable the New Announcements updates, deselect the check
-          box. Updates are enabled by default.
+          To disable the New Announcements updates, deselect the
+          checkbox. Updates are enabled by default.
         </para>
 
         <para>

@@ -193,11 +196,12 @@
 
       <listitem>
         <para>
-          <guilabel>Automatically check to Support Issues?</guilabel>
+          <guilabel>Automatically check for updates to open My Oracle
+          Support Issues?</guilabel>
         </para>
 
         <para>
-          To disable the Support Issues updates, deselect the check box.
+          To disable the Support Issues updates, deselect the checkbox.
           Updates are enabled by default.
         </para>
 

@@ -222,13 +226,13 @@
 
         <para>
           The &merlin_server; can automatically look for changes to your
-          &merlin_advisor; information by polling the MySQL Enterprise
-          website.
+          &merlin_advisor; information by polling an Oracle software
+          download Web site.
         </para>
 
         <para>
-          To disable the Advisor updates, deselect the check box.
-          Updates are enabled by default.
+          To disable the Advisor updates, deselect the checkbox. Updates
+          are enabled by default.
         </para>
 
         <para>


Modified: trunk/mysql-monitor-2.3/error-codes.xml
===================================================================
--- trunk/mysql-monitor-2.3/error-codes.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/error-codes.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 4, Lines Added: 3, Lines Deleted: 16; 1804 bytes

@@ -600,8 +600,7 @@
         <row>
           <entry>U0145</entry>
           <entry>U0120 Unable to import Advisor Jar. You may download the jar manually
-            from the My Oracle Support website and import it on this
-            page.</entry>
+            from the Enterprise website and import it on this page.</entry>
         </row>
         <row>
           <entry>U0146</entry>

@@ -781,7 +780,7 @@
         </row>
         <row>
           <entry>U0186</entry>
-          <entry>You must provide a login when not using anonymous binds.</entry>
+          <entry>You must provide a login when using comparison mode.</entry>
         </row>
         <row>
           <entry>U0187</entry>

@@ -904,18 +903,6 @@
           <entry>The uploaded Advisor jar is a Custom Rule/Graph Export Bundle, and must
             be uploaded to the Import/Export page.</entry>
         </row>
-        <row>
-          <entry>U0215</entry>
-          <entry>Changing the frequency for this rule is not supported.</entry>
-        </row>
-        <row>
-          <entry>U0216</entry>
-          <entry>Notes provided were too long (limit 10000 characters)</entry>
-        </row>
-        <row>
-          <entry>U0217</entry>
-          <entry>No notes provided</entry>
-        </row>
       </tbody>
     </tgroup>
   </table>

@@ -961,7 +948,7 @@
         </row>
         <row>
           <entry>E0103</entry>
-          <entry>Can not delete manager user.</entry>
+          <entry>Can not delete root user.</entry>
         </row>
         <row>
           <entry>E0104</entry>


Modified: trunk/mysql-monitor-2.3/faq-core.xml
===================================================================
--- trunk/mysql-monitor-2.3/faq-core.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/faq-core.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 17; 1242 bytes

@@ -34,17 +34,8 @@
       </para>
     </listitem>
 
-<!-- JDR: this whole category not appropriate for 2.3; blocked the individual entries, now taking out the inclusion just to be safe.
     <listitem>
       <para>
-        <link linkend="mem-faq-enterprise"><emphasis role="bold">MySQL
-        Enterprise</emphasis></link>
-      </para>
-    </listitem>
--->
-
-    <listitem>
-      <para>
         <link linkend="mem-faq-monitor"><emphasis role="bold">MySQL
         Monitor</emphasis></link>
       </para>

@@ -65,14 +56,6 @@
 
   <para condition="dynamic:faq:faq" role="2.3:monitor:general"/>
 
-<!-- JDR: this whole category not appropriate for 2.3; blocked the individual entries, now taking out the inclusion just to be safe.
-  <para id="mem-faq-enterprise">
-    <emphasis role="bold">MySQL Enterprise</emphasis>
-  </para>
-
-  <para condition="dynamic:faq:faq" role="2.3:monitor:enterprise"/>
--->
-
   <para id="mem-faq-monitor">
     <emphasis role="bold">MySQL Monitor</emphasis>
   </para>


Modified: trunk/mysql-monitor-2.3/install-agent.xml
===================================================================
--- trunk/mysql-monitor-2.3/install-agent.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/install-agent.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 30, Lines Added: 102, Lines Deleted: 71; 15166 bytes

@@ -232,22 +232,26 @@
         the Linux Standards Base (LSB) initialization functions
         installed. To check the existence of the LSB components, look
         for an LSB package within your Linux package management
-        environment. For example, on Red Hat and other RPM-based
+        environment. For example, on RedHat and other RPM-based
         distributions:
       </para>
 
-<programlisting>shell&gt; rpm -qa | grep -i lsb
-redhat-lsb-3.1-19.fc8.x86_64</programlisting>
+<programlisting>
+shell&gt; rpm -qa | grep -i lsb
+redhat-lsb-3.1-19.fc8.x86_64
+</programlisting>
 
       <para>
         Under Debian/Ubuntu:
       </para>
 
-<programlisting>shell&gt; dpkg -l|grep -i lsb
+<programlisting>
+shell&gt; dpkg -l|grep -i lsb
 ii  lsb-base                                   3.2-20ubuntu4                     
     Linux Standard Base 3.2 init script function
 ii  lsb-release                                3.2-20ubuntu4
-    Linux Standard Base version reporting utilit</programlisting>
+    Linux Standard Base version reporting utilit
+	</programlisting>
 
       <para>
         Alternatively, you can use the <command>lsb_release</command>

@@ -335,7 +339,8 @@
           installation process:
         </para>
 
-<programlisting>Language Selection
+<programlisting>
+Language Selection
 
 Please select the installation language
 [1] English

@@ -377,12 +382,14 @@
           the MySQL Server:
         </para>
 
-<programlisting>How will the agent connect to the database it is monitoring?
+<programlisting>
+How will the agent connect to the database it is monitoring?
 
 
 [1] TCP/IP
 [2] Socket
-Please choose an option [1] :</programlisting>
+Please choose an option [1] :
+</programlisting>
       </listitem>
 
       <listitem>

@@ -434,14 +441,12 @@
           number:
         </para>
 
-<programlisting>----------------------------------------------------------------------------
+<programlisting>
+----------------------------------------------------------------------------
 Monitored Database Information
 
-IMPORTANT: The agent user account specified below requires special MySQL privileges.
+...
 
-Visit the following URL for more information:
-https://enterprise.mysql.com/docs/monitor/2.0/en/mem-install.html#mem-agent-rights
-
 MySQL hostname or IP address [127.0.0.1]:
 
 

@@ -454,21 +459,19 @@
 </programlisting>
 
         <para>
-          If you select Socket, then you will be asked to provide the
-          path name to the MySQL socket. Typical values are
+          If you select Socket, then you provide the path name to the
+          MySQL socket. Typical values are
           <filename>/tmp/mysql.sock</filename>,
           <filename>/var/lib/mysql.sock</filename>, or
           <filename>/var/run/mysql.sock</filename>.
         </para>
 
-<programlisting>----------------------------------------------------------------------------
+<programlisting>
+----------------------------------------------------------------------------
 Monitored Database Information
 
-IMPORTANT: The agent user account specified below requires special MySQL privileges.
+...
 
-Visit the following URL for more information:
-https://enterprise.mysql.com/docs/monitor/2.0/en/mem-install.html#mem-agent-rights
-
 MySQL Socket []:
 </programlisting>
 

@@ -482,32 +485,29 @@
           </para>
 
           <para>
-            If the MySQL server to monitor has been started with the
-            <option>--skip-networking</option> option, then you will not
-            be able to connect to it via TCP/IP, as the server will not
-            listen for TCP/IP connections. In this case, the monitor
-            agent will need to be configured to use the MySQL socket.
-            This can be done during installation by selecting
+            If the MySQL server to monitor was started with the
+            <option>--skip-networking</option> option, then you cannot
+            connect to it via TCP/IP, as the server does not listen for
+            TCP/IP connections. In this case, configure the monitor
+            agent to use the MySQL socket. During installation, select
             <quote>socket</quote> rather than <quote>TCP/IP</quote> and
-            then specifying the MySQL socket name. This can also be
-            configured after installation by editing the
-            <filename>agent-instance.ini</filename> configuration file,
-            for further information on this refer to
+            then specify the MySQL socket name. Or, after installation,
+            edit the <filename>agent-instance.ini</filename>
+            configuration file. For further information, refer to
             <xref linkend="mem-cfg-agent-ini"/>.
           </para>
 
           <para>
-            If the MySQL server to be monitored has been started using
-            the command option <option>--bind-address</option> then the
-            server will only listen for connections on the IP address
+            If the MySQL server to be monitored was started using the
+            command option <option>--bind-address</option>, then the
+            server only listens for connections on the IP address
             specified, that is, the IP address of the MySQL server. If
-            the monitor agent has been started using TCP/IP networking
-            and the default address of 127.0.0.1 it will not be able to
-            connect to the server to be monitored. Also, if
-            <quote>localhost</quote> is specified as the host name
-            during agent configuration, a connection will not be
-            established, as the server will be listening for connections
-            on the address specified with the
+            the monitor agent was started using TCP/IP networking and
+            the default address of 127.0.0.1, it cannot connect to the
+            server to be monitored. Also, if <quote>localhost</quote> is
+            specified as the host name during agent configuration, a
+            connection is not established, as the server listens for
+            connections on the address specified with the
             <option>--bind-address</option> option, not 127.0.0.1.
           </para>
         </note>

@@ -577,7 +577,8 @@
           listens for queries).
         </para>
 
-<programlisting>----------------------------------------------------------------------------
+<programlisting>
+----------------------------------------------------------------------------
 Query Analyzer Configuration
 
 MySQL Proxy enables query monitoring and analysis by listening on a specified port for client connections that are then passed through to a backend MySQL database server. It is not needed for basic monitoring functionality.

@@ -643,7 +644,8 @@
 Re-enter :
 
 ----------------------------------------------------------------------------
-    </programlisting>
+    
+	</programlisting>
       </listitem>
 
       <listitem>

@@ -687,7 +689,8 @@
 Setup is now ready to begin installing MySQL Enterprise Monitor Agent on your computer.
 
 Do you want to continue? [Y/n]: y
-    </programlisting>
+    
+	</programlisting>
       </listitem>
 
       <listitem>

@@ -887,7 +890,7 @@
           connect to the MySQL server. To confirm that the MySQL server
           is currently reachable using the information, ensure that the
           <guilabel>Validate MySQL host name or IP address</guilabel>
-          check box is selected.
+          checkbox is selected.
         </para>
 
         <note>

@@ -1047,8 +1050,8 @@
         <para>
           You can start the &merlin_agent; automatically now that the
           installation is complete. To start the agent now, leave the
-          check box selected. To start the agent separately, uncheck the
-          check box. Click <guibutton>Finish</guibutton> to exit the
+          checkbox selected. To start the agent separately, uncheck the
+          checkbox. Click <guibutton>Finish</guibutton> to exit the
           installation.
         </para>
       </listitem>

@@ -1272,7 +1275,7 @@
               user name and password to connect to the MySQL server. To
               confirm that the MySQL server is currently reachable using
               the information, ensure that the <guilabel>Validate MySQL
-              host name or IP address</guilabel> check box is selected.
+              host name or IP address</guilabel> checkbox is selected.
             </para>
 
             <figure id="fig-agent-install-osx4">

@@ -1441,8 +1444,8 @@
         <para>
           You can start the &merlin_agent; automatically now that the
           installation is complete. To start the agent now, leave the
-          check box selected. To start the agent separately, uncheck the
-          check box. Click <guibutton>Finish</guibutton> to exit the
+          checkbox selected. To start the agent separately, uncheck the
+          checkbox. Click <guibutton>Finish</guibutton> to exit the
           installation.
         </para>
       </listitem>

@@ -1765,7 +1768,9 @@
         be:
       </para>
 
-<programlisting>shell&gt; <userinput>/home/&lt;user name&gt;/mysql/enterprise/agent/etc/init.d/mysql-monitor-agent start</userinput></programlisting>
+<programlisting>
+shell&gt; <userinput>/home/&lt;user name&gt;/mysql/enterprise/agent/etc/init.d/mysql-monitor-agent start</userinput>
+</programlisting>
 
       <para>
         To stop the agent, use the <literal>stop</literal> command:

@@ -1957,7 +1962,8 @@
       configuration directory:
     </para>
 
-<programlisting>./init.d
+<programlisting>
+./init.d
 ./init.d/mysql-monitor-agent
 ./instances
 ./instances/agent

@@ -1975,7 +1981,8 @@
       four MySQL servers:
     </para>
 
-<programlisting>./init.d
+<programlisting>
+./init.d
 ./init.d/mysql-monitor-agent
 ./instances
 ./instances/agent

@@ -2009,7 +2016,9 @@
           files to the new directory:
         </para>
 
-<programlisting>shell&gt; cp -R etc/instances/agent etc/instances/<replaceable>mysql2</replaceable></programlisting>
+<programlisting>
+shell&gt; cp -R etc/instances/agent etc/instances/<replaceable>mysql2</replaceable>
+</programlisting>
       </listitem>
 
       <listitem>

@@ -2028,7 +2037,9 @@
           Restart the agent:
         </para>
 
-<programlisting>shell&gt; mysql-monitor-agent restart</programlisting>
+<programlisting>
+shell&gt; mysql-monitor-agent restart
+</programlisting>
       </listitem>
 
     </orderedlist>

@@ -2053,7 +2064,8 @@
       directory for two agents monitoring a single MySQL server each:
     </para>
 
-<programlisting>./init.d
+<programlisting>
+./init.d
 ./init.d/mysql-monitor-agent
 ./instances
 ./instances/agent

@@ -2061,7 +2073,8 @@
 ./instances-second/agent
 ./instances-second/agent/agent-instance.ini
 ./mysql-monitor-agent.ini
-./mysql-second-agent.ini</programlisting>
+./mysql-second-agent.ini
+</programlisting>
 
     <para>
       The <filename>mysql-monitor-agent.ini</filename> file contains the

@@ -2092,7 +2105,8 @@
           You need to generate a new UUID for the new agent:
         </para>
 
-<programlisting>shell&gt; /opt/mysql/enterprise/agent/bin/mysql-proxy --plugins-agent --agent-generate-uuid
+<programlisting>
+shell&gt; /opt/mysql/enterprise/agent/bin/mysql-proxy --plugins-agent --agent-generate-uuid
 ee9296d7-f7cd-4fee-8b26-ead884ebf398
 2009-03-05 11:49:37: (critical) shutting down normally
 </programlisting>

@@ -2113,7 +2127,9 @@
           <filename>/opt/mysql/enterprise/agent/etc/mysql-monitor-agent.ini</filename>:
         </para>
 
-<programlisting>shell&gt; cp mysql-monitor-agent.ini <replaceable>mysql-second-agent.ini</replaceable></programlisting>
+<programlisting>
+shell&gt; cp mysql-monitor-agent.ini <replaceable>mysql-second-agent.ini</replaceable>
+</programlisting>
       </listitem>
 
       <listitem>

@@ -2127,8 +2143,8 @@
           <listitem>
             <para>
               Change the <literal>mysqld-instance-dir</literal> to the
-              new directory that will contain the individual MySQL
-              server configuration files.
+              new directory for the individual MySQL server
+              configuration files.
             </para>
           </listitem>
 

@@ -2166,8 +2182,8 @@
           <listitem>
             <para>
               Change the <literal>pid-file</literal> parameter to
-              specify the file that will be used to store the process ID
-              of the agent.
+              specify the file in which to store the process ID of the
+              agent.
             </para>
           </listitem>
 

@@ -2180,7 +2196,9 @@
           files to the new directory:
         </para>
 
-<programlisting>shell&gt; cp -R etc/instances etc/<replaceable>instances-second</replaceable></programlisting>
+<programlisting>
+shell&gt; cp -R etc/instances etc/<replaceable>instances-second</replaceable>
+</programlisting>
       </listitem>
 
       <listitem>

@@ -2202,13 +2220,17 @@
           (default) service:
         </para>
 
-<programlisting>shell&gt; /opt/mysql/enterprise/agent/etc/init.d/mysql-monitor-agent start /opt/mysql/monitor/agent/etc/mysql-monitor-agent.ini</programlisting>
+<programlisting>
+shell&gt; /opt/mysql/enterprise/agent/etc/init.d/mysql-monitor-agent start /opt/mysql/monitor/agent/etc/mysql-monitor-agent.ini
+</programlisting>
 
         <para>
           To start the second instance:
         </para>
 
-<programlisting>shell&gt; /opt/mysql/enterprise/agent/etc/init.d/mysql-monitor-agent start /opt/mysql/monitor/agent/etc/mysql-second-agent.ini</programlisting>
+<programlisting>
+shell&gt; /opt/mysql/enterprise/agent/etc/init.d/mysql-monitor-agent start /opt/mysql/monitor/agent/etc/mysql-second-agent.ini
+</programlisting>
       </listitem>
 
     </orderedlist>

@@ -2391,13 +2413,17 @@
       command:
     </para>
 
-<programlisting>shell&gt; bin/mysql-proxy --plugins=agent --agent-generate-uuid</programlisting>
+<programlisting>
+shell&gt; bin/mysql-proxy --plugins=agent --agent-generate-uuid
+</programlisting>
 
     <para>
       This should display a line similar to the following:
     </para>
 
-<programlisting>ee9296d7-f7cd-4fee-8b26-ead884ebf398</programlisting>
+<programlisting>
+ee9296d7-f7cd-4fee-8b26-ead884ebf398
+</programlisting>
 
     <para>
       Paste this line into the <literal>[mysql-proxy]</literal> section

@@ -2405,9 +2431,11 @@
       <literal>agent-uuid</literal> parameter:
     </para>
 
-<programlisting>[mysql-proxy]
+<programlisting>
+[mysql-proxy]
 ...
-agent-uuid=ee9296d7-f7cd-4fee-8b26-ead884ebf398</programlisting>
+agent-uuid=ee9296d7-f7cd-4fee-8b26-ead884ebf398
+</programlisting>
 
     <para>
       In Windows, go to the command line and change to the

@@ -2415,7 +2443,8 @@
       executing:
     </para>
 
-<programlisting>C:\> cd C:\Program Files\MySQL\Enterprise\Agent
+<programlisting>
+C:\> cd C:\Program Files\MySQL\Enterprise\Agent
 C:\> mysql-monitor-agent -uf mysql-monitor-agent.ini 
 </programlisting>
 

@@ -2663,7 +2692,9 @@
           truncate the <literal>mysql.inventory</literal> table:
         </para>
 
-<programlisting>mysql&gt; TRUNCATE mysql.inventory;</programlisting>
+<programlisting>
+mysql&gt; TRUNCATE mysql.inventory;
+</programlisting>
 
         <para>
           Now restart the agent, which will recreate the


Modified: trunk/mysql-monitor-2.3/install-server.xml
===================================================================
--- trunk/mysql-monitor-2.3/install-server.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/install-server.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 10, Lines Added: 22, Lines Deleted: 62; 7364 bytes

@@ -53,16 +53,12 @@
       </para>
     </listitem>
 
-<!-- JDR: is the Java VM always installed, or do we ever use what's already on the system? -->
-
     <listitem>
       <para>
         Java VM (always)
       </para>
     </listitem>
 
-<!-- JDR: is the bundled MySQL optional here, or am I mixing it up with the Agent installer? -->
-
     <listitem>
       <para>
         MySQL Server, for repository (optional; you can use an existing

@@ -72,7 +68,7 @@
 
   </itemizedlist>
 
-<!-- JDR: seems like too early to have this note. -->
+<!-- JDR: seems like too early to have this note. We're talking about a web server that isn't running yet.-->
 
   <note>
     <para>

@@ -344,7 +340,8 @@
               and that user is created automatically during
               installation. In normal use, you should not need to access
               the repository database directly, but it might be required
-              to resolve a support issue. The default value is
+              to resolve a <link linkend="glos_service_request">service
+              request</link>. The default value is
               <literal>service_manager</literal>.
             </para>
           </listitem>

@@ -1388,7 +1385,7 @@
       If you installed the Service Manager using a graphical interface,
       you have the option of launching the dashboard on the final
       installation screen (as long as the <guibutton role="bold">Launch
-      &merlin; Now</guibutton> check box is checked).
+      &merlin; Now</guibutton> checkbox is checked).
     </para>
 
     <para>

@@ -1445,12 +1442,6 @@
 
           <listitem>
             <para>
-              Set up your MySQL Enterprise credentials.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               Set up your My Oracle Support credentials.
             </para>
           </listitem>

@@ -1473,13 +1464,10 @@
         </itemizedlist>
       </para>
 
-<!-- JDR: I want to take out the following about Advisors files, but is that too aggressive,
-maybe there are still cases where you have one?  (But maybe not during initial config...) -->
-
       <para>
-        If you have been provided with an Advisors file, click the
-        <guibutton>Browse</guibutton> button and locate these files. The
-        advisor file is named,
+        To import the Advisors file, click the
+        <guibutton>Browse</guibutton> button and locate it. The advisor
+        file is named,
         <filename>AdvisorScript-<replaceable>version</replaceable>.jar</filename>.
         If you do not allow Internet access from the dashboard, you must
         install the advisors in this way. It is strongly recommended

@@ -1489,31 +1477,21 @@
       </para>
 
       <para>
-        If you have Internet access from the dashboard, activate
-        &merlin; by supplying your MySQL Enterprise credentials. Enter
-        your email address as the <literal>MySQL Enterprise
-        Login</literal> and enter and confirm your MySQL Enterprise
-        password. If you specify incorrect credentials, you receive the
-        error message <quote>Unable to connect to verify
-        credentials.</quote>
-      </para>
-
-      <para>
-        In the <guilabel>Create Administrator</guilabel> section of this
+        In the <guilabel>Create Manager User</guilabel> section of this
         screen, enter credentials for the dashboard administrator. This
-        creates the <literal>root user</literal> described in
+        creates the Manager user described in
         <xref linkend="mem-users-created-first-login"/>. Record the user
         name and password, as these credentials are required for any
         future login.
       </para>
 
       <para>
-        In the <guilabel>Configure Agent Credentials</guilabel> section
-        of this screen, enter the credentials for the agent. This is the
-        <literal>agent user</literal> also described in
-        <xref linkend="mem-users-created-first-login"/>. The agent must
-        log in to report its findings. Record the agent's credentials;
-        this information is required when installing the agent.
+        In the <guilabel>Create Agent User</guilabel> section of this
+        screen, enter the credentials for the agent. This is the user
+        described in <xref linkend="mem-users-created-first-login"/>.
+        The agent must log in to report its findings. Record the agent's
+        credentials; this information is required when installing the
+        agent.
       </para>
 
 <!-- JDR: I didn't get this 'how many graphs and advisors imported' message,

@@ -1525,23 +1503,6 @@
         many graphs and advisors were imported.
       </para>
 
-<!-- JDR: again, still applicable to 2.3? The very first time you log in? -->
-
-      <para>
-        If importation of the advisor files fails, you see the message:
-      </para>
-
-<programlisting>
-Unable to import Advisor Jar. You may download the jar
-manually from the Enterprise Portal and import it from the 'Check For Updates' page.
-</programlisting>
-
-      <para>
-        In this case, download the advisor file from the Enterprise
-        website and install it as described in
-        <xref linkend="mem-advisor-installation-after-login"/>.
-      </para>
-
     </section>
 
     <section id="mem-localization">

@@ -1598,11 +1559,13 @@
 
       <title>Installing, Updating or Upgrading Advisors After Initial Login</title>
 
+<!-- JDR: Advisors really come through the MOS site? -->
+
       <para>
         The Advisors interpret the data sent by the Monitor Agents and
         display the results in the dashboard. A full set of Advisors is
         preinstalled with the Service Manager. You can download any new
-        or updated Advisors from &mysql_enterprise;.
+        or updated Advisors from the My Oracle Support site.
       </para>
 
       <para>

@@ -1610,19 +1573,16 @@
         the &merlin_client;, open the dashboard, find the
         <guilabel>Advisors</guilabel> tab, and choose the <literal>Check
         for Updates</literal> link. Doing this downloads the latest
-        version of the Advisors from the &mysql_enterprise; web site. To
-        install the advisors in this fashion, specify your MySQL
-        Enterprise credentials. Find instructions for doing this in
-        <xref linkend="mem-global-settings"/>.
+        version of the Advisors from an Oracle web site.
       </para>
 
       <para>
         If you do not allow Internet access from the dashboard, install
         the Advisors from a local file. You need an advisor file named
         <filename>AdvisorScript-<replaceable>version</replaceable>.jar</filename>.
-        If you do not already have this file, download it from the
-        &mysql_enterprise; downloads page. Download the Advisors file to
-        a location that is accessible from the dashboard. Use the
+        If you do not already have this file, download it from the My
+        Oracle Support site. Download the Advisors file to a location
+        that is accessible from the dashboard. Use the
         <guibutton>Browse</guibutton> button to find the Advisors file
         and then choose <guibutton>import</guibutton> to load the
         advisors.


Modified: trunk/mysql-monitor-2.3/install-unattended-core.xml
===================================================================
--- trunk/mysql-monitor-2.3/install-unattended-core.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/install-unattended-core.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 6, Lines Added: 16, Lines Deleted: 18; 3569 bytes

@@ -81,10 +81,9 @@
 
     <para>
       For unattended installation using an option file, create a text
-      file that contains the definition for the installation. For this
-      example, the file will be named
-      <filename>options.server.txt</filename>. An example of the options
-      configuration file is shown below:
+      file that contains the definition for the installation. This
+      example uses a file named <filename>options.server.txt</filename>.
+      An example of the options configuration file is shown below:
     </para>
 
 <programlisting>

@@ -438,10 +437,10 @@
 
         <para>
           The user name to use for connecting to the database repository
-          used by &merlin_server;. If you are installing the bundled
-          MySQL server, this is the username that will be configured. If
-          you are using an existing MySQL server, this should be the
-          username of the user with rights to access the database.
+          used by &merlin_server;. If you install the bundled MySQL
+          server, this user is configured in the new database. If you
+          use an existing MySQL server, specify an existing user with
+          rights to access the database.
         </para>
 
         <warning>

@@ -530,11 +529,10 @@
 
         <para>
           The TCP/IP port for the MySQL database used to store
-          &merlin_server; repository data. If you are installing the
-          bundled MySQL server, this is the port that the MySQL server
-          will be configured to use to listen for connections. If you
-          are using an existing MySQL server, this should be the port
-          for the MySQL server that you want to connect to.
+          &merlin_server; repository data. If you install the bundled
+          MySQL server, this is the port where the new database listens
+          for connections. If you use an existing MySQL server, specify
+          the port used for connections by that MySQL server.
         </para>
       </listitem>
 

@@ -862,7 +860,7 @@
         <para condition="dynamic:optvar:item" role="2.3:mysql-monitor-agent-installer:installdir"/>
 
         <para>
-          Specify the directory where the software will be installed.
+          Specify the directory into which to install the software.
         </para>
       </listitem>
 

@@ -973,10 +971,10 @@
         <para>
           Specify the connection method to use to connect to MySQL. If
           you specify <literal>tcpip</literal>, the value of the
-          <option>mysqlport</option> option will be used. If you specify
+          <option>mysqlport</option> option is used. If you specify
           <literal>socket</literal>, the value of the
-          <option>mysqlsocket</option> option will be used to connect to
-          the MySQL server to be monitored.
+          <option>mysqlsocket</option> option is used to connect to the
+          MySQL server to be monitored.
         </para>
       </listitem>
 

@@ -1135,7 +1133,7 @@
         </indexterm>
 
         <para id="option_mysql-monitor-agent-installer_unattendedmodeui">
-          <literal>--unattendedmodeui</literal>
+          <literal>--unattendedmodeui </literal>
         </para>
 
         <para condition="dynamic:optvar:item" role="2.3:mysql-monitor-agent-installer:unattendedmodeui"/>


Modified: trunk/mysql-monitor-2.3/install-upgrades.xml
===================================================================
--- trunk/mysql-monitor-2.3/install-upgrades.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/install-upgrades.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 9, Lines Added: 14, Lines Deleted: 13; 2698 bytes

@@ -485,8 +485,7 @@
             <para>
               The installation has now completed. You can automatically
               start the &merlin_server; and view the attached Readme
-              file by ensuring the check boxes on this page are
-              selected.
+              file by ensuring the checkboxes on this page are selected.
             </para>
           </listitem>
 

@@ -573,7 +572,9 @@
               Start the update installer.
             </para>
 
-<programlisting>shell&gt; ./mysqlmonitoragent-2.0.0.7101-linux-glibc2.3-x86-32bit-update-installer.bin</programlisting>
+<programlisting>
+shell&gt; ./mysqlmonitoragent-2.0.0.7101-linux-glibc2.3-x86-32bit-update-installer.bin
+</programlisting>
 
             <para>
               For &merlin_agent; 2.2 and higher, If you have multiple

@@ -592,7 +593,8 @@
               Set the language for the installation process.
             </para>
 
-<programlisting>Language Selection
+<programlisting>
+Language Selection
 
 Please select the installation language
 [1] English

@@ -616,7 +618,7 @@
 the MySQL Enterprise Monitor Agent
 
 Installation directory [/opt/mysql/enterprise/agent]:
-    </programlisting>
+</programlisting>
           </listitem>
 
           <listitem>

@@ -637,7 +639,7 @@
 
 Backup directory [/opt/mysql/enterprise/agent/patchbackup]:
 
-      </programlisting>
+</programlisting>
           </listitem>
 
           <listitem>

@@ -660,11 +662,8 @@
 backend MySQL database server. It is not needed for basic monitoring
 functionality, but is required for query monitoring and analysis.
 
-Visit the following URL for more information:
-https://enterprise.mysql.com/docs/monitor/2.0/en/mem-query-analyzer.html
+...
 
-
-
 Enable Proxy (recommended) [Y/n]:
 
 

@@ -673,7 +672,7 @@
 Backend Host: 127.0.0.1   (cannot be changed)
 
 Backend Port: 3306   (cannot be changed)
-      </programlisting>
+</programlisting>
           </listitem>
 
           <listitem>

@@ -701,7 +700,7 @@
 Restart MySQL Enterprise Monitor Agent now [Y/n]:
 
 View Readme File [Y/n]: n
-      </programlisting>
+</programlisting>
           </listitem>
 
         </orderedlist>

@@ -759,7 +758,9 @@
             logged in the upgrade log with the following notice:
           </para>
 
-<programlisting>getDataCollectionPurgeLifespan now: 4 weeks (was: 2 weeks)</programlisting>
+<programlisting>
+getDataCollectionPurgeLifespan now: 4 weeks (was: 2 weeks)
+</programlisting>
         </listitem>
 
       </itemizedlist>


Modified: trunk/mysql-monitor-2.3/install-user-roles.xml
===================================================================
--- trunk/mysql-monitor-2.3/install-user-roles.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/install-user-roles.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 3, Lines Added: 16, Lines Deleted: 26; 3354 bytes

@@ -10,19 +10,19 @@
   <title>Credentials Needed for Installation</title>
 
   <para>
-    Before installing the &merlin; components, gather credentials (root
-    user IDs and passwords) for all the MySQL servers you plan to
-    monitor. The Agent installation requires a dedicated user ID in each
-    monitored MySQL server; the installation can create this user for
-    you, or you can create it yourself in advance, but either way
-    requires a root login to the MySQL instance.
+    Before installing the &merlin; components, gather
+    <link linkend="glos_credentials">credentials</link> (root user IDs
+    and passwords) for all the MySQL servers you plan to monitor. The
+    Agent installation requires a dedicated user ID in each monitored
+    MySQL server; the installation can create this user for you, or you
+    can create it yourself in advance, but either way requires a root
+    login to the MySQL instance.
   </para>
 
   <para>
-    Optionally, gather credentials for your &mysql_enterprise; account
-    and/or your My Oracle Support account, which you can specify in the
-    &merlin_client; configuration step immediately after everything is
-    installed and started.
+    Optionally, gather credentials for your My Oracle Support account,
+    which you can specify in the &merlin_client; configuration step
+    immediately after everything is installed and started.
   </para>
 
   <para>

@@ -53,14 +53,6 @@
       account to receive updates and examine relevant service issues.
     </para>
 
-    <para>
-      The <emphasis role="bold">&mysql_enterprise; user</emphasis>:
-      These are the credentials you use to log in to the
-      &mysql_enterprise; web site. The <guilabel>What's New</guilabel>
-      page accesses this account to receive updates and examine relevant
-      service issues.
-    </para>
-
   </section>
 
   <section id="mem-created-users">

@@ -131,19 +123,17 @@
     <title>Users Created on First Log-in</title>
 
     <para>
-      The <emphasis role="bold">Root user</emphasis>: This user is the
-      administrator of the &merlin_client;. The first time you log in to
-      the dashboard, log in as this user. The default user name for this
-      user is <literal>admin</literal>. You choose the password for this
-      user.
+      The <emphasis role="bold">Manager user</emphasis>: This user is
+      the administrator of the &merlin_client;. The first time you log
+      in to the dashboard, log in as this user. You choose the ID and
+      password for this user.
     </para>
 
     <para>
       The <emphasis role="bold">Agent user</emphasis>: The Monitor Agent
       needs to report the status of the MySQL server it is monitoring.
-      For this reason it needs to log in to the dashboard. The default
-      user name for this user is <literal>agent</literal>. You choose
-      the password for this user.
+      For this reason it needs to log in to the dashboard. You choose
+      the ID and password for this user.
     </para>
 
 <!-- JDR: not sure how relevant this is here, or whether Aggregator or Proxy complicate the picture. -->


Modified: trunk/mysql-monitor-2.3/installation-reference.xml
===================================================================
--- trunk/mysql-monitor-2.3/installation-reference.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/installation-reference.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 3; 711 bytes

@@ -86,9 +86,8 @@
 
   <para>
     Depending on your configuration and environment, download these
-    files from the
-    <ulink url="https://enterprise.mysql.com/monitoring/download.php">download</ulink>
-    page of the MySQL Enterprise web site. These include:
+    files from the <ulink url="https://edelivery.oracle.com/">Oracle
+    E-Delivery</ulink> web site. These include:
   </para>
 
   <itemizedlist>


Modified: trunk/mysql-monitor-2.3/introduction.xml
===================================================================
--- trunk/mysql-monitor-2.3/introduction.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/introduction.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 14, Lines Added: 99, Lines Deleted: 107; 16489 bytes

@@ -18,12 +18,12 @@
   </indexterm>
 
   <para>
-    &merlin; is an enterprise monitoring system for MySQL that keeps an
-    eye on your MySQL servers, notifies you of potential issues and
-    problems, and advises you how to fix the issues. &merlin; can
-    monitor all kinds of configurations, from a single MySQL server that
-    is important to your business, all the way up to a huge farm of
-    MySQL servers powering a busy web site.
+    &merlin; is a companion product for MySQL Server that monitors your
+    MySQL instances, notifies you of potential issues and problems, and
+    advises you how to fix the issues. &merlin; can monitor all kinds of
+    configurations, from a single MySQL instance that is important to
+    your business, all the way up to a huge farm of database server
+    machines powering a busy web site.
   </para>
 
   <para>

@@ -39,21 +39,21 @@
 
     <listitem>
       <para>
-        One or more MySQL servers that you want to monitor. &merlin; can
-        monitor both Community and Enterprise MySQL server releases.
+        One or more MySQL instances that you want to monitor. &merlin;
+        can monitor both Community and Enterprise MySQL server releases.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        A &merlin_agent; for each monitored MySQL server.
+        A &merlin_agent; for each monitored MySQL instance.
       </para>
     </listitem>
 
     <listitem>
       <para>
         A single &merlin_server;, which collates information from the
-        agents, and provides the user interface to the collected data.
+        agents and provides the user interface to the collected data.
       </para>
     </listitem>
 

@@ -76,72 +76,63 @@
     </mediaobject>
   </figure>
 
-<!-- JDR: not clear on "multiple agent processes monitoring each MySQL server" -->
-
   <para>
-    &merlin; is designed to monitor one or more MySQL servers. The
-    monitoring information is collected by using an agent,
-    <firstterm>&merlin_agent;</firstterm>. The agent communicates with
-    the MySQL server that it monitors, collecting variables, status and
-    health information, and sending this information to the
-    &merlin_server;. If you have multiple MySQL servers, then you have
-    multiple &merlin_agent; processes monitoring each MySQL server. The
-    &merlin_agent; has other responsibilities and capabilities, which we
-    describe in more detail later in this chapter.
+    &merlin; can monitor one or more MySQL instances, on a single
+    computer or spread across multiple host machines. The
+    <link linkend="glos_agent">agent</link>, &merlin_agent;, collects
+    variables, status, and health information from a MySQL instance and
+    sends this information to the &merlin_server;. You typically have
+    multiple &merlin_agent; processes, one monitoring each MySQL
+    instance.
   </para>
 
   <para>
-    The information collected by the agent about each MySQL server you
-    are monitoring is sent to the
-    <firstterm>&merlin_server;</firstterm>. This server collates all of
-    the information from the agents. As it collates the information sent
-    by the agents, the &merlin_server; continually tests the collected
-    data, comparing the status of the server to reasonable values. When
-    thresholds are reached, the server can trigger an event (including
-    an alarm and notification) to highlight a potential issue, such as
-    low memory, high CPU usage, or more complex conditions such
-    insufficient buffer sizes and status information. We call each test,
-    with its associated threshold value, a <firstterm>rule</firstterm>.
+    The monitoring data is sent to the
+    <link linkend="glos_service_manager">MySQL Enterprise Service
+    Manager</link>, which collates information from all the agents. The
+    &merlin_server; checks whether the values of status values are
+    within reasonable limits. When
+    <link linkend="glos_threshold">thresholds</link> are reached, the
+    server can trigger an <link linkend="glos_event">event</link>
+    (including an <link linkend="glos_alarm">alarm</link> and
+    <link linkend="glos_notification">notification</link>) to highlight
+    a potential issue, such as low memory, high CPU usage, or more
+    complex conditions such insufficient buffer sizes and status
+    information. Each test and its associated threshold value form a
+    <link linkend="glos_rule">rule</link>.
   </para>
 
-<!-- JDR: unclear how an advisor is different from a rule -->
-
   <para>
-    These rules, and the alarms and notifications, are each known as a
-    <firstterm>&merlin_advisor;</firstterm>. Advisors form a critical
-    part of the &merlin_server;, as they provide warning information and
-    troubleshooting advice about potential problems.
+    Each rule, together its associated alarms and notifications, is
+    known as a &merlin; <link linkend="glos_advisor">advisor</link>.
+    Advisors are a vital part of the &merlin_server;, warning about
+    potential problems and providing troubleshooting advice.
   </para>
 
   <para>
-    The &merlin_server; includes a web server, and you interact with it
-    through any web browser. This interface, the &merlin_client;,
-    displays all of the information collected by the agents, and lets
-    you view all of your servers and their current status as a group or
-    individually. You control and configure all aspects of the service
+    You interact with the &merlin_server; through a web interface,
+    powered by an included web server. This interface, the
+    &merlin_client;, displays the information collected by the agents.
+    You can view current status for individual MySQL servers or groups
+    of servers. You control and configure all aspects of the service
     using the &merlin_client;.
   </para>
 
   <para>
-    The information supplied by the &merlin_agent; processes also
-    includes statistical and query information, which you can view in
-    the form of graphs. For example, you can view aspects such as server
-    load, query numbers, or index usage information as a graph over
-    time. The graph lets you pinpoint problems or potential issues on
-    your server, and can help diagnose the impact from database or
-    external problems (such as external system or network failure) by
-    examining the data from a specific time interval.
+    The &merlin_client; can display statistical and query information as
+    graphs. For example, you can produce graphs over time of aspects
+    such as server load, query numbers, or index usage information. The
+    graphs help to pinpoint the timeframes and trends related to
+    potential issues.
   </para>
 
   <para>
-    The &merlin_agent; can also be configured to collect detailed
-    information about the queries executed on your server, including the
-    row counts and performance times for executing each query. You can
-    correlate the detailed query data with the graphical information to
-    identify which queries were executing when you experienced a
-    particularly high load, index or other issue. The query data is
-    supported by a system called Query Analyzer, and the data can be
-    presented in different ways depending on your needs.
+    The &merlin_agent; can also collect detailed information about
+    database queries, including the row counts and performance times for
+    executing each query. You can correlate the detailed query data with
+    the graph information to identify which queries were executing when
+    you experienced an issue. A system called Query Analyzer presents
+    the query data in various ways.
   </para>
 
   <section id="mem-introduction-server">

@@ -333,9 +324,9 @@
       <listitem>
         <para>
           The <guilabel>What's New?</guilabel> tab gives a live
-          connection to the My Oracle Support and MySQL Enterprise web
-          sites, with news about the latest releases, critical fixes and
-          patches, and any current support issues.
+          connection to the My Oracle Support site, with news about the
+          latest releases, critical fixes and patches, and any current
+          <link linkend="glos_service_request">service requests</link>.
         </para>
       </listitem>
 

@@ -373,22 +364,19 @@
       The events can be displayed within the &merlin_client;, or can
       trigger additional notifications, such as an email or an SMS text
       message. The information provided by the advisors, and the
-      collected data, are also exported through SNMP (Simple Network
-      Management Protocol), so you can use SNMP traps within your
-      existing network monitoring infrastructure.
+      collected data, are also exported through
+      <link linkend="glos_snmp">SNMP</link> (Simple Network Management
+      Protocol), so you can use SNMP traps within your existing network
+      monitoring infrastructure.
     </para>
 
     <para>
-      A <firstterm>schedule</firstterm> determines how frequently each
-      advisor is executed.
+      A <link linkend="glos_schedule">schedule</link> determines how
+      frequently each advisor is executed.
     </para>
 
-<!-- JDR: put a forward cross-reference here. -->
-
   </section>
 
-<!-- JDR: maybe this section could go after the Agent one. -->
-
   <section id="mem-introduction-mysql-server">
 
     <title>Monitored MySQL Server</title>

@@ -404,15 +392,20 @@
     <para>
       In addition to monitoring the internal operation of the MySQL
       server, the &merlin_agent; and &merlin_server; can determine the
-      replication topology of your MySQL servers and monitor the
-      replication status.
+      <link linkend="glos_replication">replication</link> topology of
+      your MySQL servers and monitor the replication status.
     </para>
 
 <!-- JDR: seems too low-level to put this info right up front. -->
 
     <para>
-      &merlin; uses a number of unique values to identify the different
-      components, including the MySQL instance being monitored:
+      &merlin; uses a number of unique values known as
+      <link linkend="glos_uuid">UUIDs</link> to identify the different
+      components, including the MySQL instance being monitored. UUID
+      values related to the MySQL instance and the host on which it runs
+      are stored in a table <literal>mysql.inventory</literal> within
+      the instance; &merlin; creates this table if it does not exist
+      already.
     </para>
 
     <itemizedlist>

@@ -497,14 +490,13 @@
 
       <listitem>
         <para>
-          Connects to, and collects, the core information about a MySQL
-          server. The core data is called the
-          <firstterm>inventory</firstterm>. The inventory includes
-          critical information (known items) about the server which is
-          used to help determine the other information that can be
-          collected. For example, the inventory includes details such as
-          the MySQL server version number, supported storage engines and
-          replication configuration.
+          Connects to a MySQL server and collects core information about
+          it. The core data is called the
+          <link linkend="glos_inventory">inventory</link>. The inventory
+          includes details such as the MySQL server version number,
+          supported storage engines and replication configuration. The
+          data in the inventory helps to determine what other kinds of
+          data can be collected from the MySQL server.
         </para>
       </listitem>
 

@@ -519,26 +511,28 @@
 
       <listitem>
         <para>
-          Collects various pieces of information about the host
-          operating system on which the agent is running. This includes
-          CPU, RAM and filesystem information and statistics.
+          Collects information about the host operating system on which
+          the agent is running, including CPU, RAM, and filesystem
+          information and statistics.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          Collects query analyzer data by acting as a MySQL Proxy,
-          collecting, and forwarding MySQL queries from clients and
-          sending the collected query execution information to the
-          &merlin_server;. This is known as the &merlin_proxy;.
+          Collects query analyzer data by acting as a MySQL
+          <link linkend="glos_proxy">Proxy</link>, collecting, and
+          forwarding MySQL queries from clients and sending the
+          collected query execution information to the &merlin_server;.
+          This is known as the &merlin_proxy;.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          Collects query analyzer data by acting as an aggregator of the
-          query execution statistics for applications and languages that
-          do not connect directly with the &merlin_server;, but instead
+          Collects query analyzer data by acting as an
+          <link linkend="glos_aggregator">aggregator</link> of the query
+          execution statistics for applications and languages that do
+          not connect directly with the &merlin_server;, but instead
           supply raw query-by-query statistics to the agent for
           distribution up to the &merlin_server;. This is known as the
           &merlin_aggregator;.

@@ -555,17 +549,13 @@
 
     </itemizedlist>
 
-<!-- JDR: reword... -->
-
     <note>
       <para>
-        Although the &merlin_agent; consists of a number of different
-        elements, the components are used collectively as a single
-        application, the &merlin_agent;. However, in order to
-        distinguish these different elements and their function, they
-        are individually reference and recognized throughout the
-        documentation so that their functionality, configuration, and
-        deployment can be more easily described.
+        The &merlin_agent; consists of a number of different components,
+        such as the Aggregator and the Proxy. The documentation
+        sometimes refers to these components by name to describe the
+        functionality, configuration, and deployment of specific parts
+        of the Agent.
       </para>
     </note>
 

@@ -788,7 +778,7 @@
       <para>
         When using &merlin_agent; as a proxy service, the queries from
         user applications are sent through the &merlin_agent;, which
-        forwards them onto a MySQL server, returning the query results
+        forwards them to a MySQL server, returning the query results
         while recording query statistical information. When operating in
         this mode, the agent acts as both the agent and proxy for the
         same monitored MySQL server (see

@@ -810,7 +800,7 @@
       </figure>
 
       <para>
-        The figures shows a single &merlin_agent; and two of the
+        The figure shows a single &merlin_agent; and two of the
         components, the core agent service and the &merlin_proxy;. The
         &merlin_agent; is connected to the single monitored MySQL
         server. In turn, the &merlin_agent; is connected to the

@@ -821,8 +811,10 @@
 
     </section>
 
-<!--    <section id="mem-introduction-agent-aggregator">
+<!-- JDR: Hmm, was this section always commented out? Appropriate to uncomment at some point?
 
+    <section id="mem-introduction-agent-aggregator">
+
       <title>&merlin_agent; Aggregator Service Architecture</title>
 
       <para>

@@ -830,7 +822,7 @@
         &merlin_proxy; for communicating query data to the
         &merlin_server; for use within the query analyzer. The
         aggregator is used by the plugin components
-        (&merlin_plugin_php;). These plugins work with the correspoding
+        (&merlin_plugin_php;). These plugins work with the corresponding
         connectors to send query information to the &merlin_server; from
         the point of communication between your application and the
         MySQL server where the queries are being executed.

@@ -841,7 +833,7 @@
         the raw query statistics provided by the connectors together
         into the blocks of data that are sent up to &merlin_server; with
         the rest of the data about the monitored MySQL server collected
-        by the &merlin_agent; as normal. You can seea a representation
+        by the &merlin_agent; as normal. You can see a representation
         of this layout in the following figure.
       </para>
 


Modified: trunk/mysql-monitor-2.3/legalnotice.en.xml
===================================================================
--- trunk/mysql-monitor-2.3/legalnotice.en.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/legalnotice.en.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 503 bytes

@@ -12,6 +12,7 @@
   not released under GPL; 2) role = legalnotice-gpl: for man page
   legalnotices, which are released under GPL; 3) role =
   legalnotice-all: included in legalnotice for all documentation.
+
 -->
 
   <para>


Modified: trunk/mysql-monitor-2.3/mem-reference-advgraph-core.xml
===================================================================
--- trunk/mysql-monitor-2.3/mem-reference-advgraph-core.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/mem-reference-advgraph-core.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 29, Lines Added: 54, Lines Deleted: 534; 32297 bytes

@@ -140,13 +140,6 @@
 
           <listitem>
             <para>
-              <link linkend="mem_advisorref_innodb_status_truncation_detected">InnoDB
-              Status Truncation Detected</link>
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               <link linkend="mem_advisorref_innodb_strict_mode_is_off">InnoDB
               Strict Mode Is Off</link>
             </para>

@@ -422,6 +415,13 @@
 
           <listitem>
             <para>
+              <link linkend="mem_graphref_agent_lua_mem_usage">Memory
+              Usage - Agent</link>
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
               <link linkend="mem_graphref_ram_usage">Memory Usage - OS
               Resident</link>
             </para>

@@ -854,18 +854,6 @@
 
           <listitem>
             <para>
-              <link linkend="mem_graphref_myisam_data_file_io_usage">myisam_data_file_io_usage.name</link>
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <link linkend="mem_graphref_myisam_index_file_io_usage">myisam_index_file_io_usage.name</link>
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               <link linkend="mem_graphref_myisam_key_buffer_activity">myisam_key_buffer_activity.name</link>
             </para>
           </listitem>

@@ -1216,12 +1204,6 @@
 
           <listitem>
             <para>
-              <link linkend="mem_graphref_binlog_io_usage">binlog_io_usage.name</link>
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               <link linkend="mem_graphref_binlog_space_usage">binlog_space_usage.name</link>
             </para>
           </listitem>

@@ -1293,38 +1275,6 @@
   </para>
 
   <para>
-    <emphasis role="bold">Agent</emphasis>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>
-          <emphasis role="bold">Graphs</emphasis>
-        </para>
-
-        <itemizedlist>
-
-          <listitem>
-            <para>
-              <link linkend="mem_graphref_agent_reporting_delay">Agent
-              Reporting Delay</link>
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <link linkend="mem_graphref_agent_lua_mem_usage">Memory
-              Usage - Agent</link>
-            </para>
-          </listitem>
-
-        </itemizedlist>
-      </listitem>
-
-    </itemizedlist>
-  </para>
-
-  <para>
     <emphasis role="bold">Security</emphasis>
 
     <itemizedlist>

@@ -1549,48 +1499,24 @@
 
           <listitem>
             <para>
-              <link linkend="mem_graphref_innodb_datafile_io_usage">innodb_datafile_io_usage.name</link>
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               <link linkend="mem_graphref_innodb_history_len">innodb_hist_length.name</link>
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <link linkend="mem_graphref_innodb_lock_memory">innodb_lock_memory.name</link>
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               <link linkend="mem_graphref_innodb_os_file_access">innodb_os_file_access.name</link>
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <link linkend="mem_graphref_innodb_redo_log_io_usage">innodb_redo_log_io_usage.name</link>
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               <link linkend="mem_graphref_innodb_row_details">innodb_row_details.name</link>
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <link linkend="mem_graphref_innodb_row_lock_details">innodb_row_lock_details.name</link>
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               <link linkend="mem_graphref_innodb_semaphores">innodb_semaphores.name</link>
             </para>
           </listitem>

@@ -1790,6 +1716,11 @@
 
     <title>Advisors</title>
 
+    <indexterm>
+      <primary>advisors</primary>
+      <secondary>reference</secondary>
+    </indexterm>
+
     <para>
       Individual Advisor information is shown below.
     </para>

@@ -1807,8 +1738,8 @@
           machine both impact the performance of software running on the
           system. While it is possible to run 32-bit software on many
           64-bit systems, in general, software built to run on a 64-bit
-          system runs better on such a system than software built to run
-          on a 32-bit system.
+          system will run better on such a system than software built to
+          run on a 32-bit system.
         </para>
 
         <para>

@@ -2743,9 +2674,9 @@
           Most applications and databases are designed to execute
           queries very quickly. If many queries are taking a long time
           to execute (e.g. more than a few seconds) it can be a sign of
-          trouble. In such cases queries may need to be tuned or
-          rewritten, or indexes added to improve performance. In other
-          cases the database schema may have to be redesigned.
+          trouble. To improve performance, you might tune or rewrite
+          queries, or add indexes. In other cases, you might redesign
+          the database schema.
         </para>
 
         <para>

@@ -2769,10 +2700,10 @@
           one query is waiting for another to release a lock on some
           shared resource. If many queries are locked and taking a long
           time to execute (e.g. more than a few seconds), it can be a
-          sign of performance trouble and resource contention. In such
-          cases queries may need to be tuned or rewritten, or indexes
-          added to improve performance. In other cases the database
-          schema may have to be redesigned.
+          sign of performance trouble and resource contention. To
+          improve performance, you might tune or rewrite queries, or add
+          indexes. In other cases, you might redesign the database
+          schema.
         </para>
 
         <para>

@@ -3180,7 +3111,7 @@
           are accessed. The startup check of the file format occurs
           before any recovery process begins, thereby preventing the
           problems described in the
-          <ulink url="http://dev.mysql.com/doc/innodb-plugin/1.0/en/innodb-downgrading-issues.html">"Possible
+          <ulink url="http://www.innodb.com/doc/innodb_plugin-1.0/innodb-downgrading.html#innodb-downgrading-issues">"Possible
           Problems" section of the InnoDB Plugin documentation</ulink>.
         </para>
 

@@ -3323,9 +3254,9 @@
         <para>
           The InnoDB Plugin has two new features that can be very useful
           --
-          <ulink url="http://dev.mysql.com/doc/innodb-plugin/1.0/en/innodb-compression.html">compressed
+          <ulink url="http://www.innodb.com/doc/innodb_plugin-1.0/innodb-compression.html">compressed
           tables</ulink> and
-          <ulink url="http://dev.mysql.com/doc/innodb-plugin/1.0/en/innodb-row-format.html">long
+          <ulink url="http://www.innodb.com/doc/innodb_plugin-1.0/innodb-row-format.html">long
           variable-length columns stored off-page</ulink>. Under the
           right circumstances, both of these features can improve the
           performance of your system. However, in order to take

@@ -3343,42 +3274,6 @@
       </listitem>
 
       <listitem>
-        <para id="mem_advisorref_innodb_status_truncation_detected">
-          <emphasis role="bold">InnoDB Status Truncation
-          Detected</emphasis>
-        </para>
-
-        <para>
-          InnoDB primarily uses the SHOW ENGINE INNODB STATUS command to
-          dump diagnostics information. As this SHOW statement can
-          output a lot of data when running in a system with very many
-          concurrent sessions, the output is limited to 64 kilobytes in
-          versions &lt; 5.5.7, and 1 megabyte on versions greater than
-          5.5.7. You are running a version where the truncation limit
-          should be 1 megabyte, however truncation is still occuring in
-          your system, and the MEM Agent relies on this output to pass
-          back a number of key InnoDB statistics.
-        </para>
-
-        <para>
-          However, InnoDB provides a startup option called
-          innodb_status_file, which dumps the same output as SHOW ENGINE
-          INNODB STATUS to a file called innodb_status.&lt;mysql pid&gt;
-          in the datadir. The MEM Agent (in versions &gt; 2.3.0) will
-          read this file automatically if it exists before executing the
-          SHOW statement.
-        </para>
-
-        <para>
-          <emphasis role="bold">Default frequency</emphasis> 00:05:00
-        </para>
-
-        <para>
-          <emphasis role="bold">Default auto-close enabled</emphasis> no
-        </para>
-      </listitem>
-
-      <listitem>
         <para id="mem_advisorref_innodb_strict_mode_is_off">
           <emphasis role="bold">InnoDB Strict Mode Is Off</emphasis>
         </para>

@@ -6026,49 +5921,15 @@
 
     <title>Graph Definition Reference</title>
 
+    <indexterm>
+      <primary>graphs</primary>
+      <secondary>reference</secondary>
+    </indexterm>
+
     <para>
       Individual graphs are defined below.
     </para>
 
-    <para id="mem_graphref_agent_reporting_delay">
-      <emphasis role="bold">Agent Reporting Delay</emphasis>
-    </para>
-
-    <para condition="dynamic:memgraphs:description" role=":agent_reporting_delay:"/>
-
-    <informaltable id="mem_graphref_agent_reporting_delay_def">
-      <tgroup cols="2">
-        <colspec colname="title" colwidth="40*"/>
-        <colspec colname="content" colwidth="60*"/>
-        <tbody>
-          <row>
-            <entry><emphasis role="bold">Name</emphasis></entry>
-            <entry>Agent Reporting Delay</entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Range Label</emphasis></entry>
-            <entry>milliseconds</entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Series</emphasis></entry>
-            <entry><emphasis role="bold">Expression</emphasis></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Delay</emphasis></entry>
-            <entry><literal>agent_delay</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Variables</emphasis></entry>
-            <entry><emphasis role="bold">Data Item</emphasis></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">agent_delay</emphasis></entry>
-            <entry><literal>mysql</literal>:<literal>Agent</literal>:<literal>agent.latency</literal></entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-
     <para id="mem_graphref_avg_row_accesses">
       <emphasis role="bold">avg_row_accesses.name</emphasis>
     </para>

@@ -6184,57 +6045,6 @@
       </tgroup>
     </informaltable>
 
-    <para id="mem_graphref_binlog_io_usage">
-      <emphasis role="bold">binlog_io_usage.name</emphasis>
-    </para>
-
-    <para condition="dynamic:memgraphs:description" role=":binlog_io_usage:"/>
-
-    <informaltable id="mem_graphref_binlog_io_usage_def">
-      <tgroup cols="2">
-        <colspec colname="title" colwidth="40*"/>
-        <colspec colname="content" colwidth="60*"/>
-        <tbody>
-          <row>
-            <entry><emphasis role="bold">Name</emphasis></entry>
-            <entry>binlog_io_usage.name</entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Range Label</emphasis></entry>
-            <entry>binlog_io_usage.rangeLabel</entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Series</emphasis></entry>
-            <entry><emphasis role="bold">Expression</emphasis></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">binlog_io_usage.series1</emphasis></entry>
-            <entry><literal>((bytes_read / (1024*1024))/60)</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">binlog_io_usage.series2</emphasis></entry>
-            <entry><literal>((bytes_written / (1024*1024))/60)</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">binlog_io_usage.series3</emphasis></entry>
-            <entry><literal>(((bytes_read + bytes_written) / (1024*1024))/60)</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Variables</emphasis></entry>
-            <entry><emphasis role="bold">Data Item</emphasis></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">bytes_read</emphasis></entry>
-            <entry><literal>mysql</literal>:<literal>binary_log_io</literal>:<literal>bytes_read</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">bytes_written</emphasis></entry>
-            <entry><literal>mysql</literal>:<literal>binary_log_io</literal>:<literal>bytes_written</literal></entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-
     <para id="mem_graphref_binlog_space_usage">
       <emphasis role="bold">binlog_space_usage.name</emphasis>
     </para>

@@ -6749,10 +6559,6 @@
             <entry><emphasis role="bold">Data Item</emphasis></entry>
           </row>
           <row>
-            <entry><emphasis role="bold">sys</emphasis></entry>
-            <entry><literal>os</literal>:<literal>cpu</literal>:<literal>cpu_sys</literal></entry>
-          </row>
-          <row>
             <entry><emphasis role="bold">user</emphasis></entry>
             <entry><literal>os</literal>:<literal>cpu</literal>:<literal>cpu_user</literal></entry>
           </row>

@@ -6764,6 +6570,10 @@
             <entry><emphasis role="bold">idle</emphasis></entry>
             <entry><literal>os</literal>:<literal>cpu</literal>:<literal>cpu_idle</literal></entry>
           </row>
+          <row>
+            <entry><emphasis role="bold">sys</emphasis></entry>
+            <entry><literal>os</literal>:<literal>cpu</literal>:<literal>cpu_sys</literal></entry>
+          </row>
         </tbody>
       </tgroup>
     </informaltable>

@@ -6820,6 +6630,10 @@
             <entry><emphasis role="bold">Data Item</emphasis></entry>
           </row>
           <row>
+            <entry><emphasis role="bold">call_proc</emphasis></entry>
+            <entry><literal>mysql</literal>:<literal>status</literal>:<literal>Com_call_procedure</literal></entry>
+          </row>
+          <row>
             <entry><emphasis role="bold">selects</emphasis></entry>
             <entry><literal>mysql</literal>:<literal>status</literal>:<literal>Com_select</literal></entry>
           </row>

@@ -6855,10 +6669,6 @@
             <entry><emphasis role="bold">delete_multi</emphasis></entry>
             <entry><literal>mysql</literal>:<literal>status</literal>:<literal>Com_delete_multi</literal></entry>
           </row>
-          <row>
-            <entry><emphasis role="bold">call_proc</emphasis></entry>
-            <entry><literal>mysql</literal>:<literal>status</literal>:<literal>Com_call_procedure</literal></entry>
-          </row>
         </tbody>
       </tgroup>
     </informaltable>

@@ -6951,7 +6761,7 @@
           </row>
           <row>
             <entry><emphasis role="bold">Write</emphasis></entry>
-            <entry><literal>((write / (1024*1024))/60)</literal></entry>
+            <entry><literal>((write / (1024*1024)/60))</literal></entry>
           </row>
           <row>
             <entry><emphasis role="bold">Variables</emphasis></entry>

@@ -7061,14 +6871,6 @@
             <entry><emphasis role="bold">Data Item</emphasis></entry>
           </row>
           <row>
-            <entry><emphasis role="bold">qHits</emphasis></entry>
-            <entry><literal>mysql</literal>:<literal>status</literal>:<literal>Qcache_hits</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">qInserts</emphasis></entry>
-            <entry><literal>mysql</literal>:<literal>status</literal>:<literal>Qcache_inserts</literal></entry>
-          </row>
-          <row>
             <entry><emphasis role="bold">keyReads</emphasis></entry>
             <entry><literal>mysql</literal>:<literal>status</literal>:<literal>Key_reads</literal></entry>
           </row>

@@ -7092,6 +6894,14 @@
             <entry><emphasis role="bold">connections</emphasis></entry>
             <entry><literal>mysql</literal>:<literal>status</literal>:<literal>Connections</literal></entry>
           </row>
+          <row>
+            <entry><emphasis role="bold">qHits</emphasis></entry>
+            <entry><literal>mysql</literal>:<literal>status</literal>:<literal>Qcache_hits</literal></entry>
+          </row>
+          <row>
+            <entry><emphasis role="bold">qInserts</emphasis></entry>
+            <entry><literal>mysql</literal>:<literal>status</literal>:<literal>Qcache_inserts</literal></entry>
+          </row>
         </tbody>
       </tgroup>
     </informaltable>

@@ -7226,14 +7036,6 @@
             <entry><emphasis role="bold">Data Item</emphasis></entry>
           </row>
           <row>
-            <entry><emphasis role="bold">modified</emphasis></entry>
-            <entry><literal>mysql</literal>:<literal>innodbstatus</literal>:<literal>innodb_bp_modified_pages</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">dict</emphasis></entry>
-            <entry><literal>mysql</literal>:<literal>innodbstatus</literal>:<literal>innodb_bp_dictionary_alloc</literal></entry>
-          </row>
-          <row>
             <entry><emphasis role="bold">size</emphasis></entry>
             <entry><literal>mysql</literal>:<literal>innodbstatus</literal>:<literal>innodb_bp_size</literal></entry>
           </row>

@@ -7241,6 +7043,14 @@
             <entry><emphasis role="bold">used</emphasis></entry>
             <entry><literal>mysql</literal>:<literal>innodbstatus</literal>:<literal>innodb_bp_db_pages</literal></entry>
           </row>
+          <row>
+            <entry><emphasis role="bold">modified</emphasis></entry>
+            <entry><literal>mysql</literal>:<literal>innodbstatus</literal>:<literal>innodb_bp_modified_pages</literal></entry>
+          </row>
+          <row>
+            <entry><emphasis role="bold">dict</emphasis></entry>
+            <entry><literal>mysql</literal>:<literal>innodbstatus</literal>:<literal>innodb_bp_dictionary_alloc</literal></entry>
+          </row>
         </tbody>
       </tgroup>
     </informaltable>

@@ -7292,57 +7102,6 @@
       </tgroup>
     </informaltable>
 
-    <para id="mem_graphref_innodb_datafile_io_usage">
-      <emphasis role="bold">innodb_datafile_io_usage.name</emphasis>
-    </para>
-
-    <para condition="dynamic:memgraphs:description" role=":innodb_datafile_io_usage:"/>
-
-    <informaltable id="mem_graphref_innodb_datafile_io_usage_def">
-      <tgroup cols="2">
-        <colspec colname="title" colwidth="40*"/>
-        <colspec colname="content" colwidth="60*"/>
-        <tbody>
-          <row>
-            <entry><emphasis role="bold">Name</emphasis></entry>
-            <entry>innodb_datafile_io_usage.name</entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Range Label</emphasis></entry>
-            <entry>innodb_datafile_io_usage.rangeLabel</entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Series</emphasis></entry>
-            <entry><emphasis role="bold">Expression</emphasis></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">innodb_datafile_io_usage.series1</emphasis></entry>
-            <entry><literal>((bytes_read / (1024*1024))/60)</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">innodb_datafile_io_usage.series2</emphasis></entry>
-            <entry><literal>((bytes_written / (1024*1024))/60)</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">innodb_datafile_io_usage.series3</emphasis></entry>
-            <entry><literal>(((bytes_read + bytes_written) / (1024*1024))/60)</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Variables</emphasis></entry>
-            <entry><emphasis role="bold">Data Item</emphasis></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">bytes_read</emphasis></entry>
-            <entry><literal>mysql</literal>:<literal>innodb_datafile_io</literal>:<literal>bytes_read</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">bytes_written</emphasis></entry>
-            <entry><literal>mysql</literal>:<literal>innodb_datafile_io</literal>:<literal>bytes_written</literal></entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-
     <para id="mem_graphref_innodb_history_len">
       <emphasis role="bold">innodb_hist_length.name</emphasis>
     </para>

@@ -7382,45 +7141,6 @@
       </tgroup>
     </informaltable>
 
-    <para id="mem_graphref_innodb_lock_memory">
-      <emphasis role="bold">innodb_lock_memory.name</emphasis>
-    </para>
-
-    <para condition="dynamic:memgraphs:description" role=":innodb_lock_memory:"/>
-
-    <informaltable id="mem_graphref_innodb_lock_memory_def">
-      <tgroup cols="2">
-        <colspec colname="title" colwidth="40*"/>
-        <colspec colname="content" colwidth="60*"/>
-        <tbody>
-          <row>
-            <entry><emphasis role="bold">Name</emphasis></entry>
-            <entry>innodb_lock_memory.name</entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Range Label</emphasis></entry>
-            <entry>innodb_lock_memory.rangeLabel</entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Series</emphasis></entry>
-            <entry><emphasis role="bold">Expression</emphasis></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">innodb_lock_memory.series1</emphasis></entry>
-            <entry><literal>(bytes_total / (1024*1024))</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Variables</emphasis></entry>
-            <entry><emphasis role="bold">Data Item</emphasis></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">bytes_total</emphasis></entry>
-            <entry><literal>mysql</literal>:<literal>innodb_current_trxs</literal>:<literal>lock_memory_bytes_total</literal></entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-
     <para id="mem_graphref_innodb_os_file_access">
       <emphasis role="bold">innodb_os_file_access.name</emphasis>
     </para>

@@ -7476,57 +7196,6 @@
       </tgroup>
     </informaltable>
 
-    <para id="mem_graphref_innodb_redo_log_io_usage">
-      <emphasis role="bold">innodb_redo_log_io_usage.name</emphasis>
-    </para>
-
-    <para condition="dynamic:memgraphs:description" role=":innodb_redo_log_io_usage:"/>
-
-    <informaltable id="mem_graphref_innodb_redo_log_io_usage_def">
-      <tgroup cols="2">
-        <colspec colname="title" colwidth="40*"/>
-        <colspec colname="content" colwidth="60*"/>
-        <tbody>
-          <row>
-            <entry><emphasis role="bold">Name</emphasis></entry>
-            <entry>innodb_redo_log_io_usage.name</entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Range Label</emphasis></entry>
-            <entry>innodb_redo_log_io_usage.rangeLabel</entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Series</emphasis></entry>
-            <entry><emphasis role="bold">Expression</emphasis></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">innodb_redo_log_io_usage.series1</emphasis></entry>
-            <entry><literal>((bytes_read / (1024*1024))/60)</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">innodb_redo_log_io_usage.series2</emphasis></entry>
-            <entry><literal>((bytes_written / (1024*1024))/60)</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">innodb_redo_log_io_usage.series3</emphasis></entry>
-            <entry><literal>(((bytes_read + bytes_written) / (1024*1024))/60)</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Variables</emphasis></entry>
-            <entry><emphasis role="bold">Data Item</emphasis></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">bytes_read</emphasis></entry>
-            <entry><literal>mysql</literal>:<literal>innodb_log_io</literal>:<literal>bytes_read</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">bytes_written</emphasis></entry>
-            <entry><literal>mysql</literal>:<literal>innodb_log_io</literal>:<literal>bytes_written</literal></entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-
     <para id="mem_graphref_innodb_row_details">
       <emphasis role="bold">innodb_row_details.name</emphasis>
     </para>

@@ -7590,53 +7259,6 @@
       </tgroup>
     </informaltable>
 
-    <para id="mem_graphref_innodb_row_lock_details">
-      <emphasis role="bold">innodb_row_lock_details.name</emphasis>
-    </para>
-
-    <para condition="dynamic:memgraphs:description" role=":innodb_row_lock_details:"/>
-
-    <informaltable id="mem_graphref_innodb_row_lock_details_def">
-      <tgroup cols="2">
-        <colspec colname="title" colwidth="40*"/>
-        <colspec colname="content" colwidth="60*"/>
-        <tbody>
-          <row>
-            <entry><emphasis role="bold">Name</emphasis></entry>
-            <entry>innodb_row_lock_details.name</entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Range Label</emphasis></entry>
-            <entry>innodb_row_lock_details.rangeLabel</entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Series</emphasis></entry>
-            <entry><emphasis role="bold">Expression</emphasis></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">innodb_row_lock_details.series1</emphasis></entry>
-            <entry><literal>rows_locked</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">innodb_row_lock_details.series2</emphasis></entry>
-            <entry><literal>rows_modified</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Variables</emphasis></entry>
-            <entry><emphasis role="bold">Data Item</emphasis></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">rows_locked</emphasis></entry>
-            <entry><literal>mysql</literal>:<literal>innodb_current_trxs</literal>:<literal>rows_locked_total</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">rows_modified</emphasis></entry>
-            <entry><literal>mysql</literal>:<literal>innodb_current_trxs</literal>:<literal>rows_modified_total</literal></entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-
     <para id="mem_graphref_innodb_semaphores">
       <emphasis role="bold">innodb_semaphores.name</emphasis>
     </para>

@@ -8045,108 +7667,6 @@
       </tgroup>
     </informaltable>
 
-    <para id="mem_graphref_myisam_data_file_io_usage">
-      <emphasis role="bold">myisam_data_file_io_usage.name</emphasis>
-    </para>
-
-    <para condition="dynamic:memgraphs:description" role=":myisam_data_file_io_usage:"/>
-
-    <informaltable id="mem_graphref_myisam_data_file_io_usage_def">
-      <tgroup cols="2">
-        <colspec colname="title" colwidth="40*"/>
-        <colspec colname="content" colwidth="60*"/>
-        <tbody>
-          <row>
-            <entry><emphasis role="bold">Name</emphasis></entry>
-            <entry>myisam_data_file_io_usage.name</entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Range Label</emphasis></entry>
-            <entry>myisam_data_file_io_usage.rangeLabel</entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Series</emphasis></entry>
-            <entry><emphasis role="bold">Expression</emphasis></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">myisam_data_file_io_usage.series1</emphasis></entry>
-            <entry><literal>((bytes_read / (1024*1024))/60)</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">myisam_data_file_io_usage.series2</emphasis></entry>
-            <entry><literal>((bytes_written / (1024*1024))/60)</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">myisam_data_file_io_usage.series3</emphasis></entry>
-            <entry><literal>(((bytes_read + bytes_written) / (1024*1024))/60)</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Variables</emphasis></entry>
-            <entry><emphasis role="bold">Data Item</emphasis></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">bytes_read</emphasis></entry>
-            <entry><literal>mysql</literal>:<literal>myisam_data_file_io</literal>:<literal>bytes_read</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">bytes_written</emphasis></entry>
-            <entry><literal>mysql</literal>:<literal>myisam_data_file_io</literal>:<literal>bytes_written</literal></entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-
-    <para id="mem_graphref_myisam_index_file_io_usage">
-      <emphasis role="bold">myisam_index_file_io_usage.name</emphasis>
-    </para>
-
-    <para condition="dynamic:memgraphs:description" role=":myisam_index_file_io_usage:"/>
-
-    <informaltable id="mem_graphref_myisam_index_file_io_usage_def">
-      <tgroup cols="2">
-        <colspec colname="title" colwidth="40*"/>
-        <colspec colname="content" colwidth="60*"/>
-        <tbody>
-          <row>
-            <entry><emphasis role="bold">Name</emphasis></entry>
-            <entry>myisam_index_file_io_usage.name</entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Range Label</emphasis></entry>
-            <entry>myisam_index_file_io_usage.rangeLabel</entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Series</emphasis></entry>
-            <entry><emphasis role="bold">Expression</emphasis></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">myisam_index_file_io_usage.series1</emphasis></entry>
-            <entry><literal>((bytes_read / (1024*1024))/60)</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">myisam_index_file_io_usage.series2</emphasis></entry>
-            <entry><literal>((bytes_written / (1024*1024))/60)</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">myisam_index_file_io_usage.series3</emphasis></entry>
-            <entry><literal>(((bytes_read + bytes_written) / (1024*1024))/60)</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">Variables</emphasis></entry>
-            <entry><emphasis role="bold">Data Item</emphasis></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">bytes_read</emphasis></entry>
-            <entry><literal>mysql</literal>:<literal>myisam_index_file_io</literal>:<literal>bytes_read</literal></entry>
-          </row>
-          <row>
-            <entry><emphasis role="bold">bytes_written</emphasis></entry>
-            <entry><literal>mysql</literal>:<literal>myisam_index_file_io</literal>:<literal>bytes_written</literal></entry>
-          </row>
-        </tbody>
-      </tgroup>
-    </informaltable>
-
     <para id="mem_graphref_myisam_key_buffer_activity">
       <emphasis role="bold">myisam_key_buffer_activity.name</emphasis>
     </para>


Modified: trunk/mysql-monitor-2.3/mem-reference.xml
===================================================================
--- trunk/mysql-monitor-2.3/mem-reference.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/mem-reference.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 4, Lines Added: 8, Lines Deleted: 7; 2143 bytes

@@ -32,7 +32,7 @@
 
       <listitem>
         <para>
-          The maximum size for data stored within the
+          The maximum size for each data item stored within the
           <literal>mysql.inventory</literal> table is 64 bytes.
         </para>
       </listitem>

@@ -534,10 +534,11 @@
       To back up the data stored within your &merlin_server;, you can
       use any of the typical backup solutions, such as the MySQL
       Enterprise Backup product or the <literal>mysqldump</literal>
-      command, to back up the repository database. Once this database
-      grows to substantial size, you might find that the binary copy
-      technique of the MySQL Enterprise Backup product is faster
-      (especially for restoring) than a logical backup using the
+      command, to back up the
+      <link linkend="glos_repository">repository</link> database. Once
+      this database grows to substantial size, you might find that the
+      binary copy technique of the MySQL Enterprise Backup product is
+      faster (especially for restoring) than a logical backup using the
       <literal>mysqldump</literal> command.
     </para>
 

@@ -779,7 +780,7 @@
 
       <listitem>
         <para>
-          Select the servers you want to migrate by using the check box
+          Select the servers you want to migrate by using the checkbox
           next to each server name. You can select one or more servers
           to migrate. Servers that are suitable for migration show their
           migration status within the <guilabel>Migration

@@ -889,7 +890,7 @@
       <listitem>
         <para>
           Select the servers you want to stop migrating by using the
-          check box next to each server name. You can select one or more
+          checkbox next to each server name. You can select one or more
           servers to stop migrating.
         </para>
       </listitem>


Modified: trunk/mysql-monitor-2.3/monitor.xml
===================================================================
--- trunk/mysql-monitor-2.3/monitor.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/monitor.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 482 bytes

@@ -73,6 +73,7 @@
 
   <xi:include href="dynxml-local-news.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+  <xi:include href="dynxml-local-glossary.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
   <index/>
-
 </book>


Modified: trunk/mysql-monitor-2.3/news-core.xml
===================================================================
--- trunk/mysql-monitor-2.3/news-core.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/news-core.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 1, Lines Added: 13, Lines Deleted: 5; 1407 bytes

@@ -23,14 +23,22 @@
   <remark role="dynamic-dependency-list"/>
 
   <para>
-    This appendix lists the changes to the &merlin;, beginning with the
-    most recent release. Each release section covers added or changed
-    functionality, bug fixes, and known issues, if applicable. All bug
-    fixes are referenced by bug number and include a link to the bug
-    database. Bugs are listed in order of resolution. To find a bug
+    This appendix lists the changes to the &merlin; product, beginning
+    with the most recent release. Each release section covers added or
+    changed functionality, bug fixes, and known issues, if applicable.
+    All bug fixes are referenced by bug number and include a link to the
+    bug database. Bugs are listed in order of resolution. To find a bug
     quickly, search by bug number.
   </para>
 
+  <section id="mem-news-2-3-3">
+
+    <title condition="dynamic:changelog:vertitle" role="2.3.3:monitor:all"/>
+
+    <para condition="dynamic:changelog:entrylist" role="2.3.3:monitor:all"/>
+
+  </section>
+
   <section id="mem-news-2-3-2">
 
     <title condition="dynamic:changelog:vertitle" role="2.3.2:monitor:all"/>


Modified: trunk/mysql-monitor-2.3/program-reference-agent-core.xml
===================================================================
--- trunk/mysql-monitor-2.3/program-reference-agent-core.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/program-reference-agent-core.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 7, Lines Added: 7, Lines Deleted: 21; 2649 bytes

@@ -155,9 +155,7 @@
 
       <remark role="idmapprefix" condition="mysql-monitor-2.3"/>
 
-
-
-      <remark role="idmapprefix" condition="mysql-monitor-common"/>
+<!-- <remark role="idmapprefix" condition="mysql-monitor-common"/> -->
     </para>
 
     <para condition="dynamic:optvar:commandoptions" role="2.3:mysql-monitor-agent:section-admin">

@@ -166,9 +164,7 @@
 
       <remark role="idmapprefix" condition="mysql-monitor-2.3"/>
 
-
-
-      <remark role="idmapprefix" condition="mysql-monitor-common"/>
+<!--      <remark role="idmapprefix" condition="mysql-monitor-common"/> -->
     </para>
 
     <para condition="dynamic:optvar:commandoptions" role="2.3:mysql-monitor-agent:section-agent">

@@ -177,9 +173,7 @@
 
       <remark role="idmapprefix" condition="mysql-monitor-2.3"/>
 
-
-
-      <remark role="idmapprefix" condition="mysql-monitor-common"/>
+<!--      <remark role="idmapprefix" condition="mysql-monitor-common"/> -->
     </para>
 
     <para condition="dynamic:optvar:commandoptions" role="2.3:mysql-monitor-agent:section-monitor">

@@ -188,9 +182,7 @@
 
       <remark role="idmapprefix" condition="mysql-monitor-2.3"/>
 
-
-
-      <remark role="idmapprefix" condition="mysql-monitor-common"/>
+<!--      <remark role="idmapprefix" condition="mysql-monitor-common"/> -->
     </para>
 
     <para condition="dynamic:optvar:commandoptions" role="2.3:mysql-monitor-agent:section-proxy">

@@ -199,9 +191,7 @@
 
       <remark role="idmapprefix" condition="mysql-monitor-2.3"/>
 
-
-
-      <remark role="idmapprefix" condition="mysql-monitor-common"/>
+<!--      <remark role="idmapprefix" condition="mysql-monitor-common"/> -->
     </para>
 
     <para condition="dynamic:optvar:commandoptions" role="2.3:mysql-monitor-agent:section-aggr">

@@ -210,9 +200,7 @@
 
       <remark role="idmapprefix" condition="mysql-monitor-2.3"/>
 
-
-
-      <remark role="idmapprefix" condition="mysql-monitor-common"/>
+<!--      <remark role="idmapprefix" condition="mysql-monitor-common"/> -->
     </para>
 
     <para condition="dynamic:optvar:commandoptions" role="2.3:mysql-monitor-agent:section-application">

@@ -221,9 +209,7 @@
 
       <remark role="idmapprefix" condition="mysql-monitor-2.3"/>
 
-
-
-      <remark role="idmapprefix" condition="mysql-monitor-common"/>
+<!--      <remark role="idmapprefix" condition="mysql-monitor-common"/> -->
     </para>
 
     <itemizedlist>


Modified: trunk/mysql-monitor-2.3/query-analyzer-cj-core.xml
===================================================================
--- trunk/mysql-monitor-2.3/query-analyzer-cj-core.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/query-analyzer-cj-core.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 9, Lines Added: 29, Lines Deleted: 34; 6285 bytes

@@ -30,12 +30,10 @@
 
   <para>
     The &merlin_plugin_java; enables any application using the
-    Connector/J JDBC driver to automatically supply query analyzer
-    information directly to &merlin_server;. Once you have installed the
-    installed plugin library in combination with your existing
-    Connector/J driver, information will be sent to the &merlin_server;
-    for analysis. You do not need to modify or alter your applications
-    to enable this functionality.
+    Connector/J JDBC driver to supply query analyzer information
+    directly to &merlin_server;. Information is sent to the
+    &merlin_server; for analysis without any need to modify your
+    applications.
   </para>
 
   <para condition="dynamic:productfeatures:fullsummary" role="5.1:mem-qa-features:cj">

@@ -114,11 +112,10 @@
   </para>
 
   <para>
-    Once the required jar files are deployed, the connection URL for
-    jdbc needs to be modified to use and configure the query analyzer
-    plugin. The following properties and their corresponding values need
-    to be added to the URL that is used by the application to be
-    analyzed.
+    Once the required jar files are deployed, modify the connection URL
+    for JDBC to use and configure the query analyzer plugin. Add the
+    following properties and their corresponding values to the URL that
+    is used by the application to be analyzed.
   </para>
 
   <para>

@@ -145,8 +142,7 @@
 
       <para>
         Enables the operation of the plugin. Without this configuration
-        option, query information will not be provided to
-        &merlin_server;
+        option, query information is not provided to &merlin_server;
       </para>
     </listitem>
 

@@ -172,7 +168,7 @@
       </indexterm>
 
       <para>
-        Specifies the URL to the service manager. You can obtain this
+        Specifies the URL to the service manager. You can get this
         information from the configuration file created when
         &merlin_server; was installed. Note that you must include the
         full URL, including the port number. For example

@@ -240,17 +236,16 @@
   </itemizedlist>
 
   <para>
-    If you want to use SSL to communicate query information to the
-    &merlin_server; then you can configure this using the properties
-    below. Out of the box, the plugin is configured to work with the
-    self-signed certificates that ship with the enterprise monitor.
-    Therefore, it will provide confidentiality for the information that
-    is sent by the plugin if the service manager URL starts with
-    <literal>https://</literal>. However, as-configured, the plugin does
-    not prevent man-in-the-middle attacks nor does it support
-    client-side certificates for authentication. To enable these
-    features, refer to the non-default values of the following
-    parameters:
+    To use SSL to communicate query information to the &merlin_server;,
+    configure this using the properties below. Out of the box, the
+    plugin is configured to work with the self-signed certificates that
+    ship with the enterprise monitor. Therefore, it provides
+    confidentiality for the information that is sent by the plugin if
+    the service manager URL starts with <literal>https://</literal>.
+    However, as configured, the plugin does not prevent
+    man-in-the-middle attacks, nor does it support client-side
+    certificates for authentication. To enable these features, change
+    the values of the following parameters:
   </para>
 
   <para condition="dynamic:optvar:propsummary" role="2.3:mysql-monitor-plugin-cj:section-ssl">

@@ -275,7 +270,7 @@
 
       <para>
         If set to "true", host names presented in the SSL server
-        certificate will be verified following the scheme listed at
+        certificate are verified following the scheme listed at
         <ulink url="http://hc.apache.org/httpcomponents-client/httpclient/apidocs/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.html">BrowserCompatHostnameVerifier</ulink>
         which is the same scheme as used by Firefox and Curl and
         specified by RFC 2818.

@@ -294,7 +289,7 @@
       <para condition="dynamic:optvar:item" role="2.3:mysql-monitor-plugin-cj:verifysslcerts"/>
 
       <para>
-        Specifies whether the plugin verify that the certificate
+        Specifies whether the plugin verifies that the certificate
         presented by the server was signed by a CA in the
         <literal>trustCertificateKeystore</literal>.
       </para>

@@ -342,13 +337,13 @@
         <literal>mysqlenterprise.trustCertificateKeystoreType=[type]</literal>
       </para>
 
-      <para condition="dynamic:optvar:item" role="2.3:mysql-monitor-plugin-cj:trustcertificatekeystoretype"/>
+      <para condition="dynamic:optvar:item" role="1.3:mysql-monitor-plugin-cj:trustcertificatekeystoretype"/>
 
       <para>
-        KeyStore type for trusted root certificates (NULL or
-        empty means use <literal>JKS</literal> default, standard
-        keystore types supported by the JVM are <literal>JKS</literal>
-        and <literal>PKCS12</literal>, your environment may have more
+        KeyStore type for trusted root certificates (NULL or empty means
+        use <literal>JKS</literal> default, standard keystore types
+        supported by the JVM are <literal>JKS</literal> and
+        <literal>PKCS12</literal>, your environment may have more
         available depending on what security products are installed and
         available to the JVM.
       </para>

@@ -424,8 +419,8 @@
 
   <para>
     Remember that you must also add the application specific options to
-    the JDBC URL. For example, the following fragment will connect to
-    the MySQL database <literal>test</literal> on
+    the JDBC URL. For example, the following fragment connects to the
+    MySQL database <literal>test</literal> on
     <literal>localhost</literal>, using the user and password of
     <literal>mysqltest</literal>, while also collecting query data and
     sending it to the &merlin_server; on <literal>localhost</literal>:


Modified: trunk/mysql-monitor-2.3/query-analyzer-cnet-core.xml
===================================================================
--- trunk/mysql-monitor-2.3/query-analyzer-cnet-core.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/query-analyzer-cnet-core.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 5; 1069 bytes

@@ -85,14 +85,14 @@
 
   <para>
     If the application that you want to profile does not have an
-    <filename>app.config</filename> application configuration file then
-    you need to make one.
+    <filename>app.config</filename> application configuration file, then
+    make one.
   </para>
 
   <para>
-    To enable query analyzer functionality, you need to register the
-    trace listeners in the <literal>System.Diagnostics</literal> section
-    of the <filename>app.config</filename> file. You can see an example
+    To enable query analyzer functionality, register the trace listeners
+    in the <literal>System.Diagnostics</literal> section of the
+    <filename>app.config</filename> file. You can see an example
     configuration file below:
   </para>
 


Modified: trunk/mysql-monitor-2.3/query-analyzer-cphp-core.xml
===================================================================
--- trunk/mysql-monitor-2.3/query-analyzer-cphp-core.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/query-analyzer-cphp-core.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 3, Lines Added: 14, Lines Deleted: 8; 1860 bytes

@@ -40,11 +40,12 @@
   </para>
 
   <para>
-    The &merlin_plugin_php; requires PHP 5.3.2 with
-    <literal>mysqlnd</literal> (the MySQL native driver) installed. If
-    your PHP installation was not configured with the
-    <literal>mysqlnd</literal> enabled, you must rebuild and install PHP
-    from source using at least one of the following options:
+    The &merlin_plugin_php; requires PHP 5.3.2 and above (5.3.99 is not
+    supported) with the MySQL native driver, <literal>mysqlnd</literal>,
+    installed. This is the recommended configuration. If your PHP
+    installation was not configured with the <literal>mysqlnd</literal>
+    enabled, you must rebuild and install PHP from source using at least
+    one of the following options:
   </para>
 
   <itemizedlist>

@@ -411,9 +412,8 @@
       <para condition="dynamic:optvar:item" role="2.3:mysql-monitor-plugin-cphp:log_file"/>
 
       <para>
-        Opens a file that will contain a log of all the query analyzer
-        information sent to &merlin_aggregator; while monitoring
-        queries.
+        Opens a file to log all the query analyzer information sent to
+        &merlin_aggregator; while monitoring queries.
       </para>
 
       <para>

@@ -438,6 +438,12 @@
 mysqlenterprise.aggregator_password=password
 </programlisting>
 
+  <para>
+    It is essential that the aggregator related options are set, as
+    &merlin_plugin_php; will not function without connection to the
+    aggregator.
+  </para>
+
   <note>
     <para>
       You must restart your web server for the configuration options to


Modified: trunk/mysql-monitor-2.3/query-analyzer-using-aggregator-core.xml
===================================================================
--- trunk/mysql-monitor-2.3/query-analyzer-using-aggregator-core.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/query-analyzer-using-aggregator-core.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 3; 595 bytes

@@ -128,9 +128,7 @@
 
     <remark role="idmapprefix" condition="mysql-monitor-2.3"/>
 
-
-
-    <remark role="idmapprefix" condition="mysql-monitor-common"/>
+<!--    <remark role="idmapprefix" condition="mysql-monitor-common"/> -->
   </para>
 
   <para>


Modified: trunk/mysql-monitor-2.3/query-analyzer-using-feeding-core.xml
===================================================================
--- trunk/mysql-monitor-2.3/query-analyzer-using-feeding-core.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/query-analyzer-using-feeding-core.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 6; 1384 bytes

@@ -69,6 +69,8 @@
       </para>
     </listitem>
 
+<!-- JDR: glossary links to go here later for connector, plugin, service manager. -->
+
     <listitem>
       <para>
         Use a MySQL connector with a corresponding MySQL Enterprise

@@ -160,11 +162,6 @@
     support the different functionality types.
   </para>
 
-  <para>
-    The table below provides information on which connectors support the
-    different functionality types.
-  </para>
-
   <para condition="dynamic:productfeatures:fullsummary" role="5.1:mem-qa-features:">
     <citetitle>Query Analyzer Feeding Solution Comparison</citetitle>
   </para>

@@ -173,7 +170,7 @@
 
 <!--  <xi:include href="dynxml-local-query-analyzer-cphp.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -->
 
-<!--  <xi:include href="query-analyzer-cc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -->
+<!--  <xi:include href="dynxml-local-query-analyzer-cc.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -->
 
   <xi:include href="dynxml-local-query-analyzer-cnet.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 


Modified: trunk/mysql-monitor-2.3/query-analyzer-using-proxy.xml
===================================================================
--- trunk/mysql-monitor-2.3/query-analyzer-using-proxy.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/query-analyzer-using-proxy.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 17, Lines Added: 54, Lines Deleted: 51; 9452 bytes

@@ -20,7 +20,8 @@
 
   <para>
     There are three different ways of feeding query analyzer using the
-    &merlin_proxy;:
+    <link linkend="glos_proxy">proxy</link> component of the
+    &merlin_agent;:
   </para>
 
   <itemizedlist>

@@ -44,8 +45,8 @@
     <listitem>
       <para>
         Change your MySQL server to listen on a different port, and
-        configure the Agent/proxy to listen on the original MySQL server
-        port. This does not require any changes to your MySQL client
+        configure the proxy to listen on the original MySQL server port.
+        This does not require any changes to your MySQL client
         application, but requires shutting down and restarting your
         MySQL server, which may affect your cache and performance. For
         more information, see

@@ -57,8 +58,7 @@
 
     <listitem>
       <para>
-        Use IP tables to redirect the network packets to the
-        agent/proxy.
+        Use IP tables to redirect the network packets to the proxy.
       </para>
     </listitem>
 

@@ -67,11 +67,11 @@
   <xi:include href="dashboard-query-analyzer-note.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
   <para>
-    Note that you must have enabled Query Analyzer within the
-    agent/proxy during installation. If you did not enable Query
-    Analyzer during the installation of the agent/proxy, check the
-    following elements within the main
-    <filename>mysql-monitor-agent.ini</filename> configuration file:
+    Note that you must have enabled Query Analyzer within the proxy
+    during agent installation. If you did not enable Query Analyzer
+    during the installation of the agent, check the following elements
+    within the main <filename>mysql-monitor-agent.ini</filename>
+    configuration file:
   </para>
 
   <itemizedlist>

@@ -117,7 +117,7 @@
   </para>
 
   <para>
-    You may also need to make some additional changes to the security
+    You might also need to make some additional changes to the security
     configuration on your server to ensure that queries are correctly
     reported to &merlin_server;:
   </para>

@@ -126,14 +126,13 @@
 
     <listitem>
       <para>
-        You must ensure that each user configured within your MySQL
-        client application that connects through the agent/proxy and is
-        required to report query analyzer information is allowed to
-        connect to the server from the host on which the agent/proxy is
-        running. When the user connects to the agent/proxy, and the
-        agent/proxy connects to the server the host of the agent/proxy
-        is used as the identifying client host name during the
-        connection.
+        Check the authorization for each user ID used in the connect
+        strings for MySQL client applications that connect through the
+        proxy. Each such user ID must be allowed to connect to the MySQL
+        server from the host on which the agent is running. When the
+        application connects to the server with the proxy as an
+        intermediary, the client host name is the host name of the
+        system running the agent.
       </para>
 
       <warning>

@@ -145,11 +144,13 @@
       </warning>
 
       <para>
-        To update your user credentials, you need to use the
-        <literal>GRANT</literal> statement. For example:
+        To update your user credentials, use the
+        <literal role="stmt">GRANT</literal> statement. For example:
       </para>
 
-<programlisting>mysql&gt; GRANT SELECT,UPDATE,INSERT on database.* to 'user'@'localhost' IDENTIFIED BY 'password';</programlisting>
+<programlisting>
+mysql&gt; GRANT SELECT,UPDATE,INSERT on <replaceable>database</replaceable>.* to '<replaceable>user</replaceable>'@'localhost' IDENTIFIED BY '<replaceable>password</replaceable>';
+</programlisting>
     </listitem>
 
     <listitem>

@@ -157,12 +158,14 @@
         The MySQL client application user must have
         <literal>SELECT</literal> privileges on the
         <literal>mysql.inventory</literal> table. This table contains
-        the server UUID and is required to report the query analyzer
-        data to the &merlin_server;. To enable this, use the
-        <literal>GRANT</literal> option:
+        the server UUID; it is required to report the query analyzer
+        data to the &merlin_server;. Use the
+        <literal role="stmt">GRANT</literal> statement. For example:
       </para>
 
-<programlisting>mysql&gt; GRANT SELECT on mysql.inventory to 'user'@'localhost' IDENTIFIED BY 'password';</programlisting>
+<programlisting>
+mysql&gt; GRANT SELECT on mysql.inventory to '<replaceable>user</replaceable>'@'localhost' IDENTIFIED BY '<replaceable>password</replaceable>';
+</programlisting>
     </listitem>
 
   </itemizedlist>

@@ -174,9 +177,9 @@
     <para>
       Generally, changing your MySQL client application is the easiest
       and recommended method. For example, given a typical structure
-      like the one shown in the figure below, the client application
-      would need to be modified so that it no longer communicated
-      directly with the MySQL server, but to the agent/proxy.
+      like the one shown in the figure below, you would modify the
+      client application so that it communicated to the proxy rather
+      than directly with the MySQL server,
     </para>
 
     <figure id="fig-mem-quan-layout1">

@@ -195,7 +198,7 @@
 
     <para>
       You can see an example of the structure when communicating via the
-      agent/proxy below.
+      proxy below.
     </para>
 
     <figure id="fig-mem-quan-layout2">

@@ -257,13 +260,13 @@
         </para>
 
         <para>
-          Because connections to the MySQL server come from the
-          agent/proxy, not the original host, the user credentials must
-          be have a suitable <literal>GRANT</literal> statement for
-          connections from <literal>localhost</literal>, or the host on
-          which the agent/proxy runs. The user name and password
-          information are passed directly through the agent/proxy from
-          the client to the server.
+          Because connections to the MySQL server come from the proxy,
+          not the original host, the user credentials must be have a
+          suitable <literal>GRANT</literal> statement for connections
+          from <literal>localhost</literal>, or the host on which the
+          agent and its proxy component run. The user name and password
+          information are passed directly through the proxy from the
+          client to the server.
         </para>
       </listitem>
 

@@ -272,7 +275,7 @@
           Confirm that your MySQL client application still operates
           normally. There should be no difference between communicating
           directly with the MySQL server and communicating via the
-          agent/proxy.
+          proxy.
         </para>
       </listitem>
 

@@ -281,11 +284,11 @@
     <note>
       <para>
         If you are using the <command>mysql</command> client to connect
-        to the agent/proxy and your backend servers, make sure that you
-        are communicating with the proxy over the right port. By
-        default, if you specify <literal>localhost</literal> as the host
-        name, then <command>mysql</command> connects using the local
-        Unix domain socket, rather than the TCP/IP socket.
+        to the proxy and your backend servers, make sure that you are
+        communicating with the proxy over the right port. By default, if
+        you specify <literal>localhost</literal> as the host name, then
+        <command>mysql</command> connects using the local Unix domain
+        socket, rather than the TCP/IP socket.
       </para>
 
       <para>

@@ -302,9 +305,9 @@
 
     <note>
       <para>
-        It is recommended that you use one agent/proxy per MySQL server
-        instance. The agent/proxy is not able to forward queries to
-        multiple MySQL server backends.
+        It is recommended that you use one agent and associated proxy
+        per MySQL server instance. A single proxy is not able to forward
+        queries to multiple MySQL server backends.
       </para>
     </note>
 

@@ -317,9 +320,9 @@
     <para>
       When enabling Query Analyzer by changing the MySQL Server, shut
       down your server, edit the MySQL configuration file, and then
-      restart MySQL. Also, change your Agent/proxy configuration so that
-      the Agent/proxy listens on the original MySQL TCP/IP port. To use
-      this method, follow these steps:
+      restart MySQL. Also, change your Agent configuration so that the
+      proxy listens on the original MySQL TCP/IP port. To use this
+      method, follow these steps:
     </para>
 
     <orderedlist>

@@ -351,7 +354,7 @@
 
       <listitem>
         <para>
-          Edit your &merlin_agent; configuration so that the agent/proxy
+          Edit your &merlin_agent; configuration so that the proxy
           listens for connections on the original MySQL port:
         </para>
 

@@ -369,7 +372,7 @@
 
     <para>
       You can now connect to your MySQL server through the
-      &merlin_agent; by connecting on the original port:
+      &merlin_proxy; by connecting on the original port:
     </para>
 
 <programlisting>shell&gt; mysql --host=127.0.0.1</programlisting>


Modified: trunk/mysql-monitor-2.3/query-analyzer-using-ui.xml
===================================================================
--- trunk/mysql-monitor-2.3/query-analyzer-using-ui.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/query-analyzer-using-ui.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 10, Lines Added: 46, Lines Deleted: 43; 8177 bytes

@@ -47,11 +47,12 @@
 
   <para>
     Each row within the table provides the statistical information for
-    one normalized query statement. If you have configured multiple
-    agent/proxies to accept and forward queries to different servers,
-    then you can expand the server view. The summary information
-    displayed is different depending on whether you have selected a
-    server group or an individual server.
+    one <link linkend="glos_normalized_query">normalized query</link>
+    statement. If you have configured multiple agent/proxies to accept
+    and forward queries to different servers, then you can expand the
+    server view. The summary information displayed is different
+    depending on whether you have selected a server group or an
+    individual server.
   </para>
 
   <para>

@@ -65,12 +66,12 @@
 
   <para>
     For each row, the following columns are populated according to the
-    selected filtering options. For example, if the filter have been
-    configured to show queries within the last 30 minutes
+    selected filtering options. For example, if the filter is configured
+    to show queries within the last 30 minutes
     (<guilabel>Interval</guilabel>), then only queries executed during
-    that time will be displayed, and the corresponding statistics, such
-    as execution times, rows returned and bytes returned will be
-    according to that 30 minute timespan.
+    that time are displayed, and the corresponding statistics, such as
+    execution times, rows returned and bytes returned, reflect that 30
+    minute timespan.
   </para>
 
   <itemizedlist>

@@ -246,8 +247,9 @@
     <listitem>
       <para>
         <guilabel>First Seen</guilabel>: The date and time the
-        normalized version of this query was first seen, which might be
-        earlier than the period specified by the filter.
+        <link linkend="glos_normalized_query">normalized</link> version
+        of this query was first seen, which might be earlier than the
+        period specified by the filter.
       </para>
     </listitem>
 

@@ -270,10 +272,10 @@
 
   <para>
     To simplify the identification of a given query, you can create a
-    query alias. The alias will be used in place of the normalized query
-    text within the Query Analyzer table. To create an alias for a
-    query, hover over the triangle <guibutton>create alias</guibutton>
-    link against the query. The maximum length for a query alias is 255
+    query alias. The alias is used in place of the normalized query text
+    within the Query Analyzer table. To create an alias for a query,
+    hover over the triangle <guibutton>create alias</guibutton> link
+    against the query. The maximum length for a query alias is 255
     characters.
   </para>
 

@@ -413,9 +415,8 @@
 
         <para>
           For queries from any of the &merlin_plugin;, the
-          <guilabel>Source Location</guilabel> will contain the
-          information from the Connector of where the query was
-          generated.
+          <guilabel>Source Location</guilabel> contains the information
+          from the Connector where the query was generated.
         </para>
       </listitem>
 

@@ -536,7 +537,7 @@
       To use the graphs in this manner, select a starting point and
       click, while holding down the button, drag a selection area to set
       the time-range for the query display. The time range that you have
-      selected will be displayed above the graph as you select the area.
+      selected is displayed above the graph as you select the area.
     </para>
 
     <figure id="fig-mem-quan-graph">

@@ -605,27 +606,29 @@
 
     <itemizedlist>
 
+<!-- JDR: wait a sec, it's enabled if it's selected, but to disable you also select it? -->
+
       <listitem>
         <para>
           <guilabel>Enable Query Analyzer</guilabel> configures whether
-          query analyzer should be enabled for this server or server
-          group. If selected, query analyzer will be enabled. To
-          disable, select the check box.
+          query analyzer is enabled for this server or server group. If
+          selected, query analyzer will be enabled. To disable, select
+          the check box.
         </para>
 
         <note>
           <para>
             The Query Analyzer functionality may show as being enabled
-            on a server, even though the modules within &merlin_agent;
-            supplying query analyzer data may not have been enabled.
+            on a server, even if the modules within &merlin_agent;
+            supplying query analyzer data are not enabled.
           </para>
         </note>
 
         <para>
-          If Query Analyzer has been enabled, then you can additional
-          configure the Example Query function by selecting the
-          <guilabel>Enable Example Query</guilabel> check box. Enabling
-          this option provides an additional tab when you open the
+          If Query Analyzer is enabled, you can also configure the
+          Example Query function by selecting the <guilabel>Enable
+          Example Query</guilabel> checkbox. Enabling this option
+          provides an additional tab when you open the
           <guilabel>Canonical Query</guilabel> window when clicking a
           query.
         </para>

@@ -636,23 +639,23 @@
           <guilabel>Enable Example Query</guilabel> allows the Query
           Analyzer to display more information about individual queries.
           When enabled, queries and their data items (rather than the
-          canonical form shown by default) will be provided. Enabling
-          this option may expose the full query statements and therefore
-          may present a security issue.
+          canonical form shown by default) are provided. Enabling this
+          option may expose the full query statements and therefore may
+          present a security issue.
         </para>
 
         <para>
           With the <guilabel>Example Query</guilabel> option enabled, an
-          additional tab within the query summary details is made
-          available. For more information, see
+          additional tab is available within the query summary details.
+          For more information, see
           <xref linkend="mem-query-analyzer-queries"/>.
         </para>
 
         <para>
-          If you have enabled <guilabel>Example Query</guilabel>, then
-          you can also enable <guilabel>Example Explain</guilabel>. To
-          enable this tab, select the <guilabel>Enable Example
-          Explain</guilabel> check box.
+          If you enable <guilabel>Example Query</guilabel>, you can also
+          enable <guilabel>Example Explain</guilabel>. To enable this
+          tab, select the <guilabel>Enable Example Explain</guilabel>
+          checkbox.
         </para>
       </listitem>
 

@@ -705,7 +708,7 @@
       You can use the options that you have just selected as the default
       for all new servers that register with &merlin_server; by using
       select the <guilabel>Make this the default for all new
-      servers</guilabel> check box. By default, when a new server
+      servers</guilabel> checkbox. By default, when a new server
       registers with MySQL Monitor, the server is automatically
       configured to supply Query Analyzer data. This can have impact on
       the performance of your monitor and agent as it increases the

@@ -923,10 +926,10 @@
     </para>
 
     <para>
-      If you want to make the filter options that you have set the
-      default when viewing the <guilabel>Query Analyzer</guilabel> page,
-      click the <guibutton>make default</guibutton> button. The settings
-      will be retained for the current user only.
+      If you want to make the current filter options the default when
+      viewing the <guilabel>Query Analyzer</guilabel> page, click the
+      <guibutton>make default</guibutton> button. The settings are saved
+      for the current user only.
     </para>
 
   </section>


Modified: trunk/mysql-monitor-2.3/query-analyzer-using.xml
===================================================================
--- trunk/mysql-monitor-2.3/query-analyzer-using.xml	2011-04-22 16:46:54 UTC (rev 25982)
+++ trunk/mysql-monitor-2.3/query-analyzer-using.xml	2011-04-22 19:11:33 UTC (rev 25983)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 2; 1416 bytes

@@ -17,16 +17,19 @@
     Query Analyzer lets you monitor SQL statements executed on a MySQL
     server and see details about each query, as well as number of
     executions and execution times. Similar queries with different
-    literal values are combined (<quote>normalized</quote>) for
+    literal values are combined
+    (<link linkend="glos_normalized_query">normalized</link>) for
     reporting purposes.
   </para>
 
+<!-- JDR: link to Connector in Glossary, in post-2.3.3 timeframe. -->
+
   <para>
     Query Analyzer collects information about SQL statements that a
     MySQL client application sends to the MySQL server. The client
     application must either route its database requests through the
     &merlin_agent; proxy service, or use the MySQL Enterprise Monitor
-    Plugin for a given connector that sends the information directly to
+    Plugin for a given Connector that sends the information directly to
     &merlin_server;. Once your MySQL client application is configured to
     communicate via the &merlin_agent;, queries are monitored and the
     normalized queries are sent to the &merlin_agent;.


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