svn commit - mysqldoc@docsrva: r12668 - trunk/mysql-monitor

[martin.brown]

Author: mcbrown
Date: 2008-11-26 17:50:50 +0100 (Wed, 26 Nov 2008)
New Revision: 12668

Log:
Fixing enterprise warning
Re-import from merlin



Modified:
   trunk/mysql-monitor/Makefile.depends
   trunk/mysql-monitor/dashboard-advisors.xml
   trunk/mysql-monitor/dashboard-configure.xml
   trunk/mysql-monitor/dashboard-events.xml
   trunk/mysql-monitor/dashboard-graphs.xml
   trunk/mysql-monitor/dashboard-overview.xml
   trunk/mysql-monitor/dashboard-query-analysis.xml
   trunk/mysql-monitor/dashboard-replication.xml
   trunk/mysql-monitor/data-items.xml
   trunk/mysql-monitor/deployment.xml
   trunk/mysql-monitor/error-codes.xml
   trunk/mysql-monitor/install.xml
   trunk/mysql-monitor/introduction.xml
   trunk/mysql-monitor/log-files.xml
   trunk/mysql-monitor/monitor-faq-core.xml
   trunk/mysql-monitor/monitor-refman-chapter-aspec.xml
   trunk/mysql-monitor/monitor-refman-chapter-base.xml


Modified: trunk/mysql-monitor/Makefile.depends
===================================================================
--- trunk/mysql-monitor/Makefile.depends	2008-11-26 14:53:24 UTC (rev 12667)
+++ trunk/mysql-monitor/Makefile.depends	2008-11-26 16:50:50 UTC (rev 12668)
Changed blocks: 2, Lines Added: 12, Lines Deleted: 1; 17110 bytes

@@ -12,6 +12,17 @@
 	../mysql-monitor/install.xml \
 	../mysql-monitor/introduction.xml \
 	../mysql-monitor/monitor-faq-core.xml \
+	../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml \
+	../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-dashboard-settings.none.section.xml
\
+	../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-dashboard.none.section.xml \
+	../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-deployment.none.section.xml \
+	../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-events.none.section.xml \
+	../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-faq.none.section.xml \
+	../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-graphs.none.section.xml \
+	../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-install.none.section.xml \
+	../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-introduction.none.chapter.xml \
+	../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-query-analysis.none.section.xml \
+	../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml \
 	all-entities.ent \
 	enterprise.ent \
 	images/published/advisors-edit.png \

@@ -159,7 +170,7 @@
 monitor-refman-chapter-arbitrary-manprepped.xml:
$(monitor_refman_chapter_arbitrary_SOURCES) $(monitor_refman_chapter_arbitrary_IDMAPS)
 monitor-refman-chapter-arbitrary-remprepped.xml:
$(monitor_refman_chapter_arbitrary_SOURCES) $(monitor_refman_chapter_arbitrary_IDMAPS)
 
-monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml
monitor-refman-chapter-aspec.xml.mem-dashboard-settings.none.section.xml
monitor-refman-chapter-aspec.xml.mem-dashboard.none.section.xml
monitor-refman-chapter-aspec.xml.mem-deployment.none.section.xml
monitor-refman-chapter-aspec.xml.mem-events.none.section.xml
monitor-refman-chapter-aspec.xml.mem-faq.none.section.xml
monitor-refman-chapter-aspec.xml.mem-graphs.none.section.xml
monitor-refman-chapter-aspec.xml.mem-install.none.section.xml
monitor-refman-chapter-aspec.xml.mem-introduction.none.chapter.xml
monitor-refman-chapter-aspec.xml.mem-query-analysis.none.section.xml
monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml:
../common/fixedchars.ent ../common/phrases.ent ../mysql-monitor/dashboard-advisors.xml
all-entities.ent enterprise.ent images/published/advisors-edit.png
images/published/usage-advisor-configuration.png urls.ent version.ent
../common/fixedchars.ent ../common/phrases.ent ../mysq!
 l-monitor/dashboard-configure.xml all-entities.ent enterprise.ent
images/published/mem-settings-global.png images/published/mem-settings-logs.png
images/published/mem-settings-notification.png images/published/mem-settings-servers.png
images/published/mem-settings-user.png images/published/mem-settings-users.png
images/published/server-rename.png urls.ent version.ent ../common/fixedchars.ent
../common/phrases.ent ../mysql-monitor/dashboard-overview.xml all-entities.ent
enterprise.ent images/published/heat-chart-legend.png images/published/heat-chart.png
images/published/server-graphs.png urls.ent version.ent ../common/fixedchars.ent
../common/phrases.ent ../mysql-monitor/deployment.xml all-entities.ent enterprise.ent
images/published/monitor-migration-check.png
images/published/monitor-migration-confirm.png
images/published/monitor-migration-progress.png urls.ent version.ent
../common/fixedchars.ent ../common/phrases.ent ../mysql-monitor/dashboard-events.xml
all-entities.en!
 t enterprise.ent images/published/events-screen.png urls.ent v!
 ersion.e
nt ../common/fixedchars.ent ../common/phrases.ent ../mysql-monitor/monitor-faq-core.xml
all-entities.ent enterprise.ent urls.ent version.ent ../common/fixedchars.ent
../common/phrases.ent ../mysql-monitor/dashboard-graphs.xml all-entities.ent
enterprise.ent urls.ent version.ent ../common/fixedchars.ent ../common/phrases.ent
../mysql-monitor/install.xml all-entities.ent enterprise.ent
images/published/agent-install-osx1.png images/published/agent-install-osx3.png
images/published/agent-install-osx4.png images/published/agent-install-osx5.png
images/published/agent-install-osx6.png images/published/agent-install-osx7.png
images/published/agent-install-win1.png images/published/agent-install-win3.png
images/published/agent-install-win4.png images/published/agent-install-win5.png
images/published/agent-install-win6.png images/published/email-settings.png
images/published/first-dashboard-login.png images/published/monitor-install-osx1.png
images/published/monitor-install-osx2.png!
  images/published/monitor-install-osx4.png images/published/monitor-install-osx5.png
images/published/monitor-install-osx6.png images/published/monitor-install-win1.png
images/published/monitor-install-win3.png images/published/monitor-install-win4.png
images/published/monitor-install-win5.png images/published/monitor-update-install-1.png
images/published/monitor-update-install-3.png
images/published/monitor-update-install-4.png
images/published/monitor-update-install-7.png
images/published/monitor-update-install-9.png urls.ent version.ent
../common/fixedchars.ent ../common/phrases.ent ../mysql-monitor/dashboard-advisors.xml
../mysql-monitor/dashboard-configure.xml ../mysql-monitor/dashboard-events.xml
../mysql-monitor/dashboard-graphs.xml ../mysql-monitor/dashboard-overview.xml
../mysql-monitor/dashboard-query-analysis.xml ../mysql-monitor/dashboard-replication.xml
../mysql-monitor/deployment.xml ../mysql-monitor/install.xml
../mysql-monitor/introduction.xml ../mysql-monit!
 or/monitor-faq-core.xml all-entities.ent enterprise.ent images!
 /publish
ed/advisors-edit.png images/published/agent-install-osx1.png
images/published/agent-install-osx3.png images/published/agent-install-osx4.png
images/published/agent-install-osx5.png images/published/agent-install-osx6.png
images/published/agent-install-osx7.png images/published/agent-install-win1.png
images/published/agent-install-win3.png images/published/agent-install-win4.png
images/published/agent-install-win5.png images/published/agent-install-win6.png
images/published/email-settings.png images/published/events-screen.png
images/published/first-dashboard-login.png images/published/heat-chart-legend.png
images/published/heat-chart.png images/published/mem-overview.png
images/published/mem-quan-config.png images/published/mem-quan-item-example.png
images/published/mem-quan-item-explain.png images/published/mem-quan-item-summary.png
images/published/mem-quan-main.png images/published/mem-settings-global.png
images/published/mem-settings-logs.png images/published/mem-setting!
 s-notification.png images/published/mem-settings-servers.png
images/published/mem-settings-user.png images/published/mem-settings-users.png
images/published/monitor-install-osx1.png images/published/monitor-install-osx2.png
images/published/monitor-install-osx4.png images/published/monitor-install-osx5.png
images/published/monitor-install-osx6.png images/published/monitor-install-win1.png
images/published/monitor-install-win3.png images/published/monitor-install-win4.png
images/published/monitor-install-win5.png images/published/monitor-migration-check.png
images/published/monitor-migration-confirm.png
images/published/monitor-migration-progress.png
images/published/monitor-update-install-1.png
images/published/monitor-update-install-3.png
images/published/monitor-update-install-4.png
images/published/monitor-update-install-7.png
images/published/monitor-update-install-9.png images/published/quan-layout1.png
images/published/quan-layout2.png images/published/replication.png!
  images/published/server-graphs.png images/published/server-re!
 name.png
 images/published/usage-advisor-configuration.png urls.ent version.ent
../common/fixedchars.ent ../common/phrases.ent
../mysql-monitor/dashboard-query-analysis.xml all-entities.ent enterprise.ent
images/published/mem-quan-config.png images/published/mem-quan-item-example.png
images/published/mem-quan-item-explain.png images/published/mem-quan-item-summary.png
images/published/mem-quan-main.png images/published/quan-layout1.png
images/published/quan-layout2.png urls.ent version.ent ../common/fixedchars.ent
../common/phrases.ent ../mysql-monitor/dashboard-replication.xml all-entities.ent
enterprise.ent images/published/replication.png urls.ent version.ent
+monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml
monitor-refman-chapter-aspec.xml.mem-dashboard-settings.none.section.xml
monitor-refman-chapter-aspec.xml.mem-dashboard.none.section.xml
monitor-refman-chapter-aspec.xml.mem-deployment.none.section.xml
monitor-refman-chapter-aspec.xml.mem-events.none.section.xml
monitor-refman-chapter-aspec.xml.mem-faq.none.section.xml
monitor-refman-chapter-aspec.xml.mem-graphs.none.section.xml
monitor-refman-chapter-aspec.xml.mem-install.none.section.xml
monitor-refman-chapter-aspec.xml.mem-introduction.none.chapter.xml
monitor-refman-chapter-aspec.xml.mem-query-analysis.none.section.xml
monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml:
../common/fixedchars.ent ../common/phrases.ent ../mysql-monitor/dashboard-advisors.xml
../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml
all-entities.ent enterprise.ent images/published/advisors-edit.png
images/published/usage-advisor-configuration!
 .png urls.ent version.ent ../common/fixedchars.ent ../common/phrases.ent
../mysql-monitor/dashboard-configure.xml
../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-dashboard-settings.none.section.xml
all-entities.ent enterprise.ent images/published/mem-settings-global.png
images/published/mem-settings-logs.png images/published/mem-settings-notification.png
images/published/mem-settings-servers.png images/published/mem-settings-user.png
images/published/mem-settings-users.png images/published/server-rename.png urls.ent
version.ent ../common/fixedchars.ent ../common/phrases.ent
../mysql-monitor/dashboard-overview.xml
../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-dashboard.none.section.xml
all-entities.ent enterprise.ent images/published/heat-chart-legend.png
images/published/heat-chart.png images/published/server-graphs.png urls.ent version.ent
../common/fixedchars.ent ../common/phrases.ent ../mysql-monitor/deployment.xml
../mysql-monitor/monitor-refman-chapter-as!
 pec.xml.mem-deployment.none.section.xml all-entities.ent enter!
 prise.en
t images/published/monitor-migration-check.png
images/published/monitor-migration-confirm.png
images/published/monitor-migration-progress.png urls.ent version.ent
../common/fixedchars.ent ../common/phrases.ent ../mysql-monitor/dashboard-events.xml
../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-events.none.section.xml
all-entities.ent enterprise.ent images/published/events-screen.png urls.ent version.ent
../common/fixedchars.ent ../common/phrases.ent ../mysql-monitor/monitor-faq-core.xml
../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-faq.none.section.xml
all-entities.ent enterprise.ent urls.ent version.ent ../common/fixedchars.ent
../common/phrases.ent ../mysql-monitor/dashboard-graphs.xml
../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-graphs.none.section.xml
all-entities.ent enterprise.ent urls.ent version.ent ../common/fixedchars.ent
../common/phrases.ent ../mysql-monitor/install.xml
../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-install.none.sec!
 tion.xml all-entities.ent enterprise.ent images/published/agent-install-osx1.png
images/published/agent-install-osx3.png images/published/agent-install-osx4.png
images/published/agent-install-osx5.png images/published/agent-install-osx6.png
images/published/agent-install-osx7.png images/published/agent-install-win1.png
images/published/agent-install-win3.png images/published/agent-install-win4.png
images/published/agent-install-win5.png images/published/agent-install-win6.png
images/published/email-settings.png images/published/first-dashboard-login.png
images/published/monitor-install-osx1.png images/published/monitor-install-osx2.png
images/published/monitor-install-osx4.png images/published/monitor-install-osx5.png
images/published/monitor-install-osx6.png images/published/monitor-install-win1.png
images/published/monitor-install-win3.png images/published/monitor-install-win4.png
images/published/monitor-install-win5.png images/published/monitor-update-install-1.png
imag!
 es/published/monitor-update-install-3.png images/published/mon!
 itor-upd
ate-install-4.png images/published/monitor-update-install-7.png
images/published/monitor-update-install-9.png urls.ent version.ent
../common/fixedchars.ent ../common/phrases.ent ../mysql-monitor/dashboard-advisors.xml
../mysql-monitor/dashboard-configure.xml ../mysql-monitor/dashboard-events.xml
../mysql-monitor/dashboard-graphs.xml ../mysql-monitor/dashboard-overview.xml
../mysql-monitor/dashboard-query-analysis.xml ../mysql-monitor/dashboard-replication.xml
../mysql-monitor/deployment.xml ../mysql-monitor/install.xml
../mysql-monitor/introduction.xml ../mysql-monitor/monitor-faq-core.xml
../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-advisors.none.section.xml
../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-dashboard-settings.none.section.xml
../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-dashboard.none.section.xml
../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-deployment.none.section.xml
../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-event!
 s.none.section.xml
../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-faq.none.section.xml
../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-graphs.none.section.xml
../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-install.none.section.xml
../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-introduction.none.chapter.xml
../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-query-analysis.none.section.xml
../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml
all-entities.ent enterprise.ent images/published/advisors-edit.png
images/published/agent-install-osx1.png images/published/agent-install-osx3.png
images/published/agent-install-osx4.png images/published/agent-install-osx5.png
images/published/agent-install-osx6.png images/published/agent-install-osx7.png
images/published/agent-install-win1.png images/published/agent-install-win3.png
images/published/agent-install-win4.png images/published/agent-install-win5.png
images/published/!
 agent-install-win6.png images/published/email-settings.png ima!
 ges/publ
ished/events-screen.png images/published/first-dashboard-login.png
images/published/heat-chart-legend.png images/published/heat-chart.png
images/published/mem-overview.png images/published/mem-quan-config.png
images/published/mem-quan-item-example.png images/published/mem-quan-item-explain.png
images/published/mem-quan-item-summary.png images/published/mem-quan-main.png
images/published/mem-settings-global.png images/published/mem-settings-logs.png
images/published/mem-settings-notification.png images/published/mem-settings-servers.png
images/published/mem-settings-user.png images/published/mem-settings-users.png
images/published/monitor-install-osx1.png images/published/monitor-install-osx2.png
images/published/monitor-install-osx4.png images/published/monitor-install-osx5.png
images/published/monitor-install-osx6.png images/published/monitor-install-win1.png
images/published/monitor-install-win3.png images/published/monitor-install-win4.png
images/published/monitor-install!
 -win5.png images/published/monitor-migration-check.png
images/published/monitor-migration-confirm.png
images/published/monitor-migration-progress.png
images/published/monitor-update-install-1.png
images/published/monitor-update-install-3.png
images/published/monitor-update-install-4.png
images/published/monitor-update-install-7.png
images/published/monitor-update-install-9.png images/published/quan-layout1.png
images/published/quan-layout2.png images/published/replication.png
images/published/server-graphs.png images/published/server-rename.png
images/published/usage-advisor-configuration.png urls.ent version.ent
../common/fixedchars.ent ../common/phrases.ent
../mysql-monitor/dashboard-query-analysis.xml
../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-query-analysis.none.section.xml
all-entities.ent enterprise.ent images/published/mem-quan-config.png
images/published/mem-quan-item-example.png images/published/mem-quan-item-explain.png
images/published/mem-quan-item-su!
 mmary.png images/published/mem-quan-main.png images/published/!
 quan-lay
out1.png images/published/quan-layout2.png urls.ent version.ent ../common/fixedchars.ent
../common/phrases.ent ../mysql-monitor/dashboard-replication.xml
../mysql-monitor/monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml
all-entities.ent enterprise.ent images/published/replication.png urls.ent version.ent
 	$(RM) monitor-refman-chapter.xml monitor-refman-chapter-arbitrary.xml
 	$(MAKE) monitor-refman-chapter.xml
 


Modified: trunk/mysql-monitor/dashboard-advisors.xml
===================================================================
--- trunk/mysql-monitor/dashboard-advisors.xml	2008-11-26 14:53:24 UTC (rev 12667)
+++ trunk/mysql-monitor/dashboard-advisors.xml	2008-11-26 16:50:50 UTC (rev 12668)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 2; 1126 bytes

@@ -9,7 +9,13 @@
 
   <title>The Advisors Page</title>
 
-  &mem-status;
+  <note>
+    <para>
+      MySQL Enterprise is our commercial subscription offering. And,
+      MySQL Enterprise Monitor and MySQL Query Analyzer are only
+      available with this commercial subscription.
+    </para>
+  </note>
 
   <para>
     &merlin_advisor;s are a series of scripts that gather information

@@ -609,7 +615,7 @@
           <para>
             There can be multiple disks mounted on a system. To refer to
             a specific drive set <guilabel>Instance</guilabel> to the
-            name of the mounted drive. On Windows this would be
+            name of of the mounted drive. On Windows this would be
             <literal>C:, D:</literal>, and so on. On Unix systems, use
             whatever is valid for the <command>df</command> command.
           </para>


Modified: trunk/mysql-monitor/dashboard-configure.xml
===================================================================
--- trunk/mysql-monitor/dashboard-configure.xml	2008-11-26 14:53:24 UTC (rev 12667)
+++ trunk/mysql-monitor/dashboard-configure.xml	2008-11-26 16:50:50 UTC (rev 12668)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 1; 650 bytes

@@ -9,7 +9,13 @@
 
   <title>The Settings Page</title>
 
-  &mem-status;
+  <note>
+    <para>
+      MySQL Enterprise is our commercial subscription offering. And,
+      MySQL Enterprise Monitor and MySQL Query Analyzer are only
+      available with this commercial subscription.
+    </para>
+  </note>
 
   <para>
     Upon initial installation you may have configured your


Modified: trunk/mysql-monitor/dashboard-events.xml
===================================================================
--- trunk/mysql-monitor/dashboard-events.xml	2008-11-26 14:53:24 UTC (rev 12667)
+++ trunk/mysql-monitor/dashboard-events.xml	2008-11-26 16:50:50 UTC (rev 12668)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 1; 653 bytes

@@ -9,7 +9,13 @@
 
   <title>The Events Page</title>
 
-  &mem-status;
+  <note>
+    <para>
+      MySQL Enterprise is our commercial subscription offering. And,
+      MySQL Enterprise Monitor and MySQL Query Analyzer are only
+      available with this commercial subscription.
+    </para>
+  </note>
 
   <para>
     Once an advisor has been scheduled, it will run at set intervals. If


Modified: trunk/mysql-monitor/dashboard-graphs.xml
===================================================================
--- trunk/mysql-monitor/dashboard-graphs.xml	2008-11-26 14:53:24 UTC (rev 12667)
+++ trunk/mysql-monitor/dashboard-graphs.xml	2008-11-26 16:50:50 UTC (rev 12668)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 1; 647 bytes

@@ -9,7 +9,13 @@
 
   <title>The Graphs Page</title>
 
-  &mem-status;
+  <note>
+    <para>
+      MySQL Enterprise is our commercial subscription offering. And,
+      MySQL Enterprise Monitor and MySQL Query Analyzer are only
+      available with this commercial subscription.
+    </para>
+  </note>
 
   <para>
     Navigate to the <literal>Graphs</literal> page by choosing the


Modified: trunk/mysql-monitor/dashboard-overview.xml
===================================================================
--- trunk/mysql-monitor/dashboard-overview.xml	2008-11-26 14:53:24 UTC (rev 12667)
+++ trunk/mysql-monitor/dashboard-overview.xml	2008-11-26 16:50:50 UTC (rev 12668)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 1; 659 bytes

@@ -9,7 +9,13 @@
 
   <title>MySQL Enterprise Dashboard</title>
 
-  &mem-status;
+  <note>
+    <para>
+      MySQL Enterprise is our commercial subscription offering. And,
+      MySQL Enterprise Monitor and MySQL Query Analyzer are only
+      available with this commercial subscription.
+    </para>
+  </note>
 
   <para>
     The purpose of the &merlin_client; is to provide you with


Modified: trunk/mysql-monitor/dashboard-query-analysis.xml
===================================================================
--- trunk/mysql-monitor/dashboard-query-analysis.xml	2008-11-26 14:53:24 UTC (rev 12667)
+++ trunk/mysql-monitor/dashboard-query-analysis.xml	2008-11-26 16:50:50 UTC (rev 12668)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 1; 684 bytes

@@ -9,7 +9,13 @@
 
   <title>The Query Analyzer Page</title>
 
-  &mem-status;
+  <note>
+    <para>
+      MySQL Enterprise is our commercial subscription offering. And,
+      MySQL Enterprise Monitor and MySQL Query Analyzer are only
+      available with this commercial subscription.
+    </para>
+  </note>
 
   <para>
     Query Analyzer enables you to monitor the statements being executed


Modified: trunk/mysql-monitor/dashboard-replication.xml
===================================================================
--- trunk/mysql-monitor/dashboard-replication.xml	2008-11-26 14:53:24 UTC (rev 12667)
+++ trunk/mysql-monitor/dashboard-replication.xml	2008-11-26 16:50:50 UTC (rev 12668)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 1; 672 bytes

@@ -9,7 +9,13 @@
 
   <title>The Replication Page</title>
 
-  &mem-status;
+  <note>
+    <para>
+      MySQL Enterprise is our commercial subscription offering. And,
+      MySQL Enterprise Monitor and MySQL Query Analyzer are only
+      available with this commercial subscription.
+    </para>
+  </note>
 
   <para>
     Navigate to the <literal>Replication</literal> page by choosing the


Modified: trunk/mysql-monitor/data-items.xml
===================================================================
--- trunk/mysql-monitor/data-items.xml	2008-11-26 14:53:24 UTC (rev 12667)
+++ trunk/mysql-monitor/data-items.xml	2008-11-26 16:50:50 UTC (rev 12668)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 1; 624 bytes

@@ -9,7 +9,13 @@
 
   <title>The Data Collection Items Used to Create Rules</title>
 
-  &mem-status;
+  <note>
+    <para>
+      MySQL Enterprise is our commercial subscription offering. And,
+      MySQL Enterprise Monitor and MySQL Query Analyzer are only
+      available with this commercial subscription.
+    </para>
+  </note>
 
   <section id="data-collection-table">
 


Modified: trunk/mysql-monitor/deployment.xml
===================================================================
--- trunk/mysql-monitor/deployment.xml	2008-11-26 14:53:24 UTC (rev 12667)
+++ trunk/mysql-monitor/deployment.xml	2008-11-26 16:50:50 UTC (rev 12668)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 1; 635 bytes

@@ -9,7 +9,13 @@
 
   <title>Deploying &merlin_server;</title>
 
-  &mem-status;
+  <note>
+    <para>
+      MySQL Enterprise is our commercial subscription offering. And,
+      MySQL Enterprise Monitor and MySQL Query Analyzer are only
+      available with this commercial subscription.
+    </para>
+  </note>
 
   <para>
     This chapter provides some notes and guidance on deploying


Modified: trunk/mysql-monitor/error-codes.xml
===================================================================
--- trunk/mysql-monitor/error-codes.xml	2008-11-26 14:53:24 UTC (rev 12667)
+++ trunk/mysql-monitor/error-codes.xml	2008-11-26 16:50:50 UTC (rev 12668)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 1; 631 bytes

@@ -9,7 +9,13 @@
 
   <title>Error codes</title>
 
-  &mem-status;
+  <note>
+    <para>
+      MySQL Enterprise is our commercial subscription offering. And,
+      MySQL Enterprise Monitor and MySQL Query Analyzer are only
+      available with this commercial subscription.
+    </para>
+  </note>
 
   <para>
     The following table documents error codes reported by the GUI and


Modified: trunk/mysql-monitor/install.xml
===================================================================
--- trunk/mysql-monitor/install.xml	2008-11-26 14:53:24 UTC (rev 12667)
+++ trunk/mysql-monitor/install.xml	2008-11-26 16:50:50 UTC (rev 12668)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 1; 636 bytes

@@ -9,7 +9,13 @@
 
   <title>Installation and Upgrades</title>
 
-  &mem-status;
+  <note>
+    <para>
+      MySQL Enterprise is our commercial subscription offering. And,
+      MySQL Enterprise Monitor and MySQL Query Analyzer are only
+      available with this commercial subscription.
+    </para>
+  </note>
 
   <para>
     This chapter describes the process of installing the &merlin; on all


Modified: trunk/mysql-monitor/introduction.xml
===================================================================
--- trunk/mysql-monitor/introduction.xml	2008-11-26 14:53:24 UTC (rev 12667)
+++ trunk/mysql-monitor/introduction.xml	2008-11-26 16:50:50 UTC (rev 12668)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 1; 638 bytes

@@ -9,7 +9,13 @@
 
   <title>Introduction</title>
 
-  &mem-status;
+  <note>
+    <para>
+      MySQL Enterprise is our commercial subscription offering. And,
+      MySQL Enterprise Monitor and MySQL Query Analyzer are only
+      available with this commercial subscription.
+    </para>
+  </note>
 
   <para>
     The &merlin; is part of the MySQL Enterprise set of Enterprise-ready


Modified: trunk/mysql-monitor/log-files.xml
===================================================================
--- trunk/mysql-monitor/log-files.xml	2008-11-26 14:53:24 UTC (rev 12667)
+++ trunk/mysql-monitor/log-files.xml	2008-11-26 16:50:50 UTC (rev 12668)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 1; 646 bytes

@@ -9,7 +9,13 @@
 
   <title>Files Associated with The &merlin;</title>
 
-  &mem-status;
+  <note>
+    <para>
+      MySQL Enterprise is our commercial subscription offering. And,
+      MySQL Enterprise Monitor and MySQL Query Analyzer are only
+      available with this commercial subscription.
+    </para>
+  </note>
 
   <para>
     This section details the files associated with the &merlin; and


Modified: trunk/mysql-monitor/monitor-faq-core.xml
===================================================================
--- trunk/mysql-monitor/monitor-faq-core.xml	2008-11-26 14:53:24 UTC (rev 12667)
+++ trunk/mysql-monitor/monitor-faq-core.xml	2008-11-26 16:50:50 UTC (rev 12668)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 1; 649 bytes

@@ -9,7 +9,13 @@
 
   <title>&merlin; Frequently Asked Questions</title>
 
-  &mem-status;
+  <note>
+    <para>
+      MySQL Enterprise is our commercial subscription offering. And,
+      MySQL Enterprise Monitor and MySQL Query Analyzer are only
+      available with this commercial subscription.
+    </para>
+  </note>
 
   <para condition="dynamic:faq" role="2.0:monitor:all"/>
 


Modified: trunk/mysql-monitor/monitor-refman-chapter-aspec.xml
===================================================================
--- trunk/mysql-monitor/monitor-refman-chapter-aspec.xml	2008-11-26 14:53:24 UTC (rev
12667)
+++ trunk/mysql-monitor/monitor-refman-chapter-aspec.xml	2008-11-26 16:50:50 UTC (rev
12668)
Changed blocks: 1, Lines Added: 30, Lines Deleted: 16; 2596 bytes

@@ -1,20 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <book>
-<fragment id="mysql-monitor-fragment" filter="none">
-<include prefix="mysql-monitor" src="mem-introduction" markas="chapter"
filter="none">
-<title>MySQL Enterprise Monitor</title>
-<include prefix="mysql-monitor" src="mem-install" markas="section" filter="none"/>
-<include prefix="mysql-monitor" src="mem-deployment" markas="section"
filter="none"/>
-<include prefix="mysql-monitor" src="mem-dashboard" markas="section"
filter="none"/>
-<include prefix="mysql-monitor" src="mem-dashboard-settings" markas="section"
filter="none"/>
-<include prefix="mysql-monitor" src="mem-advisors" markas="section" filter="none"/>
-<include prefix="mysql-monitor" src="mem-events" markas="section" filter="none"/>
-<include prefix="mysql-monitor" src="mem-graphs" markas="section" filter="none"/>
-<include prefix="mysql-monitor" src="mem-query-analysis" markas="section"
filter="none"/>
-<include prefix="mysql-monitor" src="mem-replication" markas="section"
filter="none"/>
-<include prefix="mysql-monitor" src="mem-faq" markas="section" filter="none"/>
-</include>
-</fragment>
-</book>
 
+  <fragment id="mysql-monitor-fragment" filter="none">
 
+    <include prefix="mysql-monitor" src="mem-introduction" markas="chapter"
filter="none">
+
+      <title>MySQL Enterprise Monitor</title>
+
+      <include prefix="mysql-monitor" src="mem-install" markas="section"
filter="none"/>
+
+      <include prefix="mysql-monitor" src="mem-deployment" markas="section"
filter="none"/>
+
+      <include prefix="mysql-monitor" src="mem-dashboard" markas="section"
filter="none"/>
+
+      <include prefix="mysql-monitor" src="mem-dashboard-settings" markas="section"
filter="none"/>
+
+      <include prefix="mysql-monitor" src="mem-advisors" markas="section"
filter="none"/>
+
+      <include prefix="mysql-monitor" src="mem-events" markas="section"
filter="none"/>
+
+      <include prefix="mysql-monitor" src="mem-graphs" markas="section"
filter="none"/>
+
+      <include prefix="mysql-monitor" src="mem-query-analysis" markas="section"
filter="none"/>
+
+      <include prefix="mysql-monitor" src="mem-replication" markas="section"
filter="none"/>
+
+      <include prefix="mysql-monitor" src="mem-faq" markas="section"
filter="none"/>
+
+    </include>
+
+  </fragment>
+
+</book>


Modified: trunk/mysql-monitor/monitor-refman-chapter-base.xml
===================================================================
--- trunk/mysql-monitor/monitor-refman-chapter-base.xml	2008-11-26 14:53:24 UTC (rev
12667)
+++ trunk/mysql-monitor/monitor-refman-chapter-base.xml	2008-11-26 16:50:50 UTC (rev
12668)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 362 bytes

@@ -1,2 +1 @@
-
 <!--SRCFILE mysql-monitor-fragment-->