Author: jdrussel
Date: 2011-04-18 23:09:44 +0200 (Mon, 18 Apr 2011)
New Revision: 25937
Log:
By default, references to Ref Man URLs should go to 5.5.
Modified:
trunk/mysql-monitor-2.3/Makefile
trunk/mysql-monitor-2.3/Makefile.depends
trunk/mysql-monitor-2.3/install-unattended-core.xml
Modified: trunk/mysql-monitor-2.3/Makefile
===================================================================
--- trunk/mysql-monitor-2.3/Makefile 2011-04-18 20:22:22 UTC (rev 25936)
+++ trunk/mysql-monitor-2.3/Makefile 2011-04-18 21:09:44 UTC (rev 25937)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 486 bytes
@@ -26,6 +26,7 @@
$(REPO_ROOT)/mysql-monitor-2.1 \
$(REPO_ROOT)/mysql-monitor-common \
$(REPO_ROOT)/mysql-monitor-2.0 \
+ $(REPO_ROOT)/refman-5.5 \
$(REPO_ROOT)/refman-5.1 \
$(REPO_ROOT)/refman-common \
$(REPO_ROOT)/refman-5.0
Modified: trunk/mysql-monitor-2.3/Makefile.depends
===================================================================
--- trunk/mysql-monitor-2.3/Makefile.depends 2011-04-18 20:22:22 UTC (rev 25936)
+++ trunk/mysql-monitor-2.3/Makefile.depends 2011-04-18 21:09:44 UTC (rev 25937)
Changed blocks: 3, Lines Added: 9, Lines Deleted: 9; 2130 bytes
@@ -1589,10 +1589,10 @@
../common/metadata/license-zlib.idmap \
../mysql-monitor-common/metadata/install-upgrades-core.idmap \
../mysql-monitor-common/metadata/log-files-core.idmap \
- ../refman-5.1/metadata/functions-core.idmap \
../refman-5.1/metadata/installing-updowngrade.idmap \
- ../refman-5.1/metadata/sql-syntax-utility.idmap \
- ../refman-5.1/metadata/tutorial.idmap \
+ ../refman-5.5/metadata/functions-core.idmap \
+ ../refman-5.5/metadata/sql-syntax-utility.idmap \
+ ../refman-5.5/metadata/tutorial.idmap \
../refman-common/metadata/connector-j.idmap \
../refman-common/metadata/connector-net-connection-options.idmap \
metadata/customizing-monitor.idmap \
@@ -1828,9 +1828,9 @@
images/published/mem-quan-main.png
query_analyzer_using_ui_SOURCES = query-analyzer-using-ui.xml $(query_analyzer_using_ui_INCLUDES)
query_analyzer_using_ui_IDMAPS = \
- ../refman-5.1/metadata/functions-core.idmap \
- ../refman-5.1/metadata/sql-syntax-utility.idmap \
- ../refman-5.1/metadata/tutorial.idmap \
+ ../refman-5.5/metadata/functions-core.idmap \
+ ../refman-5.5/metadata/sql-syntax-utility.idmap \
+ ../refman-5.5/metadata/tutorial.idmap \
metadata/faq-core.idmap \
metadata/query-analyzer-using-consuming.idmap \
metadata/query-analyzer-using-ui.idmap
@@ -1893,9 +1893,9 @@
images/published/mem-quan-main.png
query_analyzer_using_SOURCES = query-analyzer-using.xml $(query_analyzer_using_INCLUDES)
query_analyzer_using_IDMAPS = \
- ../refman-5.1/metadata/functions-core.idmap \
- ../refman-5.1/metadata/sql-syntax-utility.idmap \
- ../refman-5.1/metadata/tutorial.idmap \
+ ../refman-5.5/metadata/functions-core.idmap \
+ ../refman-5.5/metadata/sql-syntax-utility.idmap \
+ ../refman-5.5/metadata/tutorial.idmap \
../refman-common/metadata/connector-j.idmap \
../refman-common/metadata/connector-net-connection-options.idmap \
metadata/faq-core.idmap \
Modified: trunk/mysql-monitor-2.3/install-unattended-core.xml
===================================================================
--- trunk/mysql-monitor-2.3/install-unattended-core.xml 2011-04-18 20:22:22 UTC (rev 25936)
+++ trunk/mysql-monitor-2.3/install-unattended-core.xml 2011-04-18 21:09:44 UTC (rev 25937)
Changed blocks: 2, Lines Added: 18, Lines Deleted: 1; 1394 bytes
@@ -1135,7 +1135,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"/>
@@ -1152,6 +1152,23 @@
<listitem>
<indexterm>
+ <primary sortas="use-external-glib">--use-external-glib option</primary>
+ </indexterm>
+
+ <para id="option_mysql-monitor-agent-installer-use-external-glib">
+ <literal>--usessl</literal>
+ </para>
+
+ <para condition="dynamic:optvar:item" role="2.3:mysql-monitor-agent-installer:use-external-glib"/>
+
+ <para>
+ Specifies to use the <literal>glib</literal> library already present on the installation machine,
+ and not to install the one bundled with &merlin_agent;.
+ </para>
+ </listitem>
+
+ <listitem>
+ <indexterm>
<primary sortas="usessl">--usessl option</primary>
</indexterm>
| Thread |
|---|
| • svn commit - mysqldoc@oter02: r25937 - trunk/mysql-monitor-2.3 | john.russell | 18 Apr |
