Author: mcbrown
Date: 2008-11-25 18:34:28 +0100 (Tue, 25 Nov 2008)
New Revision: 12649
Log:
Adding Enterprise warning to MySQL Monitor content
Modified:
trunk/common/phrases.ent
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.xml
Modified: trunk/common/phrases.ent
===================================================================
--- trunk/common/phrases.ent 2008-11-25 16:52:06 UTC (rev 12648)
+++ trunk/common/phrases.ent 2008-11-25 17:34:28 UTC (rev 12649)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 2255 bytes
@@ -9,9 +9,9 @@
<!ENTITY eol-warning '<formalpara role="depnote"><title>End of Product Lifecycle</title><para>Active development and support for MySQL database server versions 3.23, 4.0, and 4.1 has ended. However, for MySQL 4.0 and 4.1, there is still extended support available. For details, see <ulink url="http://www.mysql.com/company/legal/lifecycle/#calendar"/>. According to the MySQL Lifecycle Policy (see <ulink url="http://www.mysql.com/company/legal/lifecycle/#policy"/>), only Security and Severity Level 1 issues will still be fixed for MySQL 4.0 and 4.1. Please consider upgrading to a recent version (MySQL 5.0 or 5.1).</para></formalpara>'>
<!ENTITY enterprise-offering-note '<para>This section documents all changes and bug fixes that have been applied since the last official MySQL release. If you would like to receive more fine-grained and personalized <emphasis>update alerts</emphasis> about fixes that are relevant to the version and features you use, please consider subscribing to <emphasis>MySQL Enterprise</emphasis> (a commercial MySQL offering). For more details please see <ulink url="http://www.mysql.com/products/enterprise"/>.</para>'>
<!ENTITY es-only '<para role="es">This section does not apply to MySQL Community Server users.</para>'>
-<!ENTITY falcon-warning '<para role="deprecated"><emphasis role="bold">Falcon support is not available in the standard MySQL 5.1 release. Falcon is available only in a specially forked release of MySQL 5.1. Information is provided here for evaluation purposes only.</emphasis></para>'>
<!ENTITY questions 'Questions'>
<!ENTITY questionsandanswers 'Questions and Answers'>
+<!ENTITY 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>'>
<!-- Specific to MySQL Cluster, used in 5.1 Manual and Cluster API docs -->
<!ENTITY ndb-engine-current-6.2 "6.2.17"><!-- Current NDBCLUSTER 6.2 engine version -->
Modified: trunk/mysql-monitor/dashboard-advisors.xml
===================================================================
--- trunk/mysql-monitor/dashboard-advisors.xml 2008-11-25 16:52:06 UTC (rev 12648)
+++ trunk/mysql-monitor/dashboard-advisors.xml 2008-11-25 17:34:28 UTC (rev 12649)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 498 bytes
@@ -9,6 +9,8 @@
<title>The Advisors Page</title>
+ &mem-status;
+
<para>
&merlin_advisor;s are a series of scripts that gather information
from your MySQL servers via the Service Manager and the Service
Modified: trunk/mysql-monitor/dashboard-configure.xml
===================================================================
--- trunk/mysql-monitor/dashboard-configure.xml 2008-11-25 16:52:06 UTC (rev 12648)
+++ trunk/mysql-monitor/dashboard-configure.xml 2008-11-25 17:34:28 UTC (rev 12649)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 491 bytes
@@ -9,6 +9,8 @@
<title>The Settings Page</title>
+ &mem-status;
+
<para>
Upon initial installation you may have configured your
&mysql_enterprise; credentials and also outgoing email settings.
Modified: trunk/mysql-monitor/dashboard-events.xml
===================================================================
--- trunk/mysql-monitor/dashboard-events.xml 2008-11-25 16:52:06 UTC (rev 12648)
+++ trunk/mysql-monitor/dashboard-events.xml 2008-11-25 17:34:28 UTC (rev 12649)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 495 bytes
@@ -9,6 +9,8 @@
<title>The Events Page</title>
+ &mem-status;
+
<para>
Once an advisor has been scheduled, it will run at set intervals. If
it finds nothing of interest no alerts or emails will be created.
Modified: trunk/mysql-monitor/dashboard-graphs.xml
===================================================================
--- trunk/mysql-monitor/dashboard-graphs.xml 2008-11-25 16:52:06 UTC (rev 12648)
+++ trunk/mysql-monitor/dashboard-graphs.xml 2008-11-25 17:34:28 UTC (rev 12649)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 456 bytes
@@ -9,6 +9,8 @@
<title>The Graphs Page</title>
+ &mem-status;
+
<para>
Navigate to the <literal>Graphs</literal> page by choosing the
<guilabel>Graphs</guilabel> tab.
Modified: trunk/mysql-monitor/dashboard-overview.xml
===================================================================
--- trunk/mysql-monitor/dashboard-overview.xml 2008-11-25 16:52:06 UTC (rev 12648)
+++ trunk/mysql-monitor/dashboard-overview.xml 2008-11-25 17:34:28 UTC (rev 12649)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 499 bytes
@@ -9,6 +9,8 @@
<title>MySQL Enterprise Dashboard</title>
+ &mem-status;
+
<para>
The purpose of the &merlin_client; is to provide you with
information about your MySQL servers. It provides a list of the
Modified: trunk/mysql-monitor/dashboard-query-analysis.xml
===================================================================
--- trunk/mysql-monitor/dashboard-query-analysis.xml 2008-11-25 16:52:06 UTC (rev 12648)
+++ trunk/mysql-monitor/dashboard-query-analysis.xml 2008-11-25 17:34:28 UTC (rev 12649)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 524 bytes
@@ -9,6 +9,8 @@
<title>The Query Analyzer Page</title>
+ &mem-status;
+
<para>
Query Analyzer enables you to monitor the statements being executed
on a monitored server and retrieve information about the query,
Modified: trunk/mysql-monitor/dashboard-replication.xml
===================================================================
--- trunk/mysql-monitor/dashboard-replication.xml 2008-11-25 16:52:06 UTC (rev 12648)
+++ trunk/mysql-monitor/dashboard-replication.xml 2008-11-25 17:34:28 UTC (rev 12649)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 513 bytes
@@ -9,6 +9,8 @@
<title>The Replication Page</title>
+ &mem-status;
+
<para>
Navigate to the <literal>Replication</literal> page by choosing the
<guilabel>Replication</guilabel> tab. This page provides a quick
Modified: trunk/mysql-monitor/data-items.xml
===================================================================
--- trunk/mysql-monitor/data-items.xml 2008-11-25 16:52:06 UTC (rev 12648)
+++ trunk/mysql-monitor/data-items.xml 2008-11-25 17:34:28 UTC (rev 12649)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 437 bytes
@@ -9,6 +9,8 @@
<title>The Data Collection Items Used to Create Rules</title>
+ &mem-status;
+
<section id="data-collection-table">
<title>Data Collection Items</title>
Modified: trunk/mysql-monitor/deployment.xml
===================================================================
--- trunk/mysql-monitor/deployment.xml 2008-11-25 16:52:06 UTC (rev 12648)
+++ trunk/mysql-monitor/deployment.xml 2008-11-25 17:34:28 UTC (rev 12649)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 479 bytes
@@ -9,6 +9,8 @@
<title>Deploying &merlin_server;</title>
+ &mem-status;
+
<para>
This chapter provides some notes and guidance on deploying
&merlin_server;, including hardware and server requirements for the
Modified: trunk/mysql-monitor/error-codes.xml
===================================================================
--- trunk/mysql-monitor/error-codes.xml 2008-11-25 16:52:06 UTC (rev 12648)
+++ trunk/mysql-monitor/error-codes.xml 2008-11-25 17:34:28 UTC (rev 12649)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 431 bytes
@@ -9,6 +9,8 @@
<title>Error codes</title>
+ &mem-status;
+
<para>
The following table documents error codes reported by the GUI and
the associated message.
Modified: trunk/mysql-monitor/install.xml
===================================================================
--- trunk/mysql-monitor/install.xml 2008-11-25 16:52:06 UTC (rev 12648)
+++ trunk/mysql-monitor/install.xml 2008-11-25 17:34:28 UTC (rev 12649)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 480 bytes
@@ -9,6 +9,8 @@
<title>Installation and Upgrades</title>
+ &mem-status;
+
<para>
This chapter describes the process of installing the &merlin; on all
operating systems. A working installation requires the installation
Modified: trunk/mysql-monitor/introduction.xml
===================================================================
--- trunk/mysql-monitor/introduction.xml 2008-11-25 16:52:06 UTC (rev 12648)
+++ trunk/mysql-monitor/introduction.xml 2008-11-25 17:34:28 UTC (rev 12649)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 478 bytes
@@ -9,6 +9,8 @@
<title>Introduction</title>
+ &mem-status;
+
<para>
The &merlin; is part of the MySQL Enterprise set of Enterprise-ready
services, designed with the enterprise database professional in
Modified: trunk/mysql-monitor/log-files.xml
===================================================================
--- trunk/mysql-monitor/log-files.xml 2008-11-25 16:52:06 UTC (rev 12648)
+++ trunk/mysql-monitor/log-files.xml 2008-11-25 17:34:28 UTC (rev 12649)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 452 bytes
@@ -9,6 +9,8 @@
<title>Files Associated with The &merlin;</title>
+ &mem-status;
+
<para>
This section details the files associated with the &merlin; and
shows their default location.
Modified: trunk/mysql-monitor/monitor-faq-core.xml
===================================================================
--- trunk/mysql-monitor/monitor-faq-core.xml 2008-11-25 16:52:06 UTC (rev 12648)
+++ trunk/mysql-monitor/monitor-faq-core.xml 2008-11-25 17:34:28 UTC (rev 12649)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 0; 433 bytes
@@ -9,6 +9,8 @@
<title>&merlin; Frequently Asked Questions</title>
+ &mem-status;
+
<para condition="dynamic:faq" role="2.0:monitor:all"/>
</appendix>
Modified: trunk/mysql-monitor/monitor.xml
===================================================================
--- trunk/mysql-monitor/monitor.xml 2008-11-25 16:52:06 UTC (rev 12648)
+++ trunk/mysql-monitor/monitor.xml 2008-11-25 17:34:28 UTC (rev 12649)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 370 bytes
@@ -11,7 +11,7 @@
<bookinfo>
- <title>&merlin; 2.0</title>
+ <title>&merlin; 2.0 Manual</title>
<abstract>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r12649 - in trunk: common mysql-monitor | martin.brown | 25 Nov |
