List:Commits« Previous MessageNext Message »
From:jon Date:November 2 2007 8:30am
Subject:svn commit - mysqldoc@docsrva: r8486 - trunk/refman-5.0
View as plain text  
Author: jstephens
Date: 2007-11-02 09:30:18 +0100 (Fri, 02 Nov 2007)
New Revision: 8486

Log:

De-gunk indexterms - 5.0 Manual



Modified:
   trunk/refman-5.0/apis-c.xml
   trunk/refman-5.0/apis.xml
   trunk/refman-5.0/builds-es.xml
   trunk/refman-5.0/charset.xml
   trunk/refman-5.0/client-utility-programs.xml
   trunk/refman-5.0/connectors.xml
   trunk/refman-5.0/data-types.xml
   trunk/refman-5.0/dba-core.xml
   trunk/refman-5.0/errmsgs-client.xml
   trunk/refman-5.0/errmsgs-server.xml
   trunk/refman-5.0/errors-problems.xml
   trunk/refman-5.0/extending-mysql.xml
   trunk/refman-5.0/faqs.xml
   trunk/refman-5.0/functions-core.xml
   trunk/refman-5.0/ha.xml
   trunk/refman-5.0/information-schema.xml
   trunk/refman-5.0/installing-cs.xml
   trunk/refman-5.0/installing-es.xml
   trunk/refman-5.0/installing-outline.xml
   trunk/refman-5.0/installing-version.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.0/introduction.xml
   trunk/refman-5.0/language-structure.xml
   trunk/refman-5.0/legalnotice.en.xml
   trunk/refman-5.0/manual.xml
   trunk/refman-5.0/mysql-cluster-backup.xml
   trunk/refman-5.0/mysql-cluster-configuration.xml
   trunk/refman-5.0/mysql-cluster-glossary.xml
   trunk/refman-5.0/mysql-cluster-interconnects.xml
   trunk/refman-5.0/mysql-cluster-limitations.xml
   trunk/refman-5.0/mysql-cluster-management.xml
   trunk/refman-5.0/mysql-cluster-multi-computer.xml
   trunk/refman-5.0/mysql-cluster-overview.xml
   trunk/refman-5.0/mysql-cluster-process-management.xml
   trunk/refman-5.0/mysql-cluster-roadmap.xml
   trunk/refman-5.0/mysql-cluster-upgrade-downgrade.xml
   trunk/refman-5.0/mysql-cluster-utilities.xml
   trunk/refman-5.0/mysql-cluster.xml
   trunk/refman-5.0/news-5.0-core.xml
   trunk/refman-5.0/news.xml
   trunk/refman-5.0/optimization.xml
   trunk/refman-5.0/precision-math.xml
   trunk/refman-5.0/preface.xml
   trunk/refman-5.0/releasenotes-cs-5.0-core.xml
   trunk/refman-5.0/releasenotes-cs.xml
   trunk/refman-5.0/releasenotes-es-5.0-core.xml
   trunk/refman-5.0/releasenotes-es.xml
   trunk/refman-5.0/replication-configuration.xml
   trunk/refman-5.0/replication-implementation.xml
   trunk/refman-5.0/replication-notes.xml
   trunk/refman-5.0/replication-solutions.xml
   trunk/refman-5.0/replication-topology.xml
   trunk/refman-5.0/replication.xml
   trunk/refman-5.0/reserved-new-5.0.xml
   trunk/refman-5.0/reservedwords.xml
   trunk/refman-5.0/restrictions.xml
   trunk/refman-5.0/se-archive.xml
   trunk/refman-5.0/se-bdb.xml
   trunk/refman-5.0/se-blackhole.xml
   trunk/refman-5.0/se-csv.xml
   trunk/refman-5.0/se-example.xml
   trunk/refman-5.0/se-federated.xml
   trunk/refman-5.0/se-innodb.xml
   trunk/refman-5.0/se-memory.xml
   trunk/refman-5.0/se-merge.xml
   trunk/refman-5.0/se-myisam.xml
   trunk/refman-5.0/spatial-extensions.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.0/storage-engines.xml
   trunk/refman-5.0/stored-procedures.xml
   trunk/refman-5.0/triggers.xml
   trunk/refman-5.0/tutorial.xml
   trunk/refman-5.0/using-mysql-programs.xml
   trunk/refman-5.0/views.xml
   trunk/refman-5.0/windows-config-wizard.xml


Modified: trunk/refman-5.0/apis-c.xml
===================================================================
--- trunk/refman-5.0/apis-c.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/apis-c.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 108, Lines Added: 113, Lines Deleted: 118; 27954 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="c">
 
   <title>MySQL C API</title>

@@ -1494,7 +1492,7 @@
       <title><literal>mysql_affected_rows()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_affected_rows()</literal></primary>
+        <primary>mysql_affected_rows()</primary>
       </indexterm>
 
       <para>

@@ -1589,7 +1587,7 @@
       <title><literal>mysql_autocommit()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_autocommit()</literal></primary>
+        <primary>mysql_autocommit()</primary>
       </indexterm>
 
       <para>

@@ -1629,7 +1627,7 @@
       <title><literal>mysql_change_user()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_change_user()</literal></primary>
+        <primary>mysql_change_user()</primary>
       </indexterm>
 
       <para>

@@ -1805,7 +1803,7 @@
       <title><literal>mysql_character_set_name()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_character_set_name()</literal></primary>
+        <primary>mysql_character_set_name()</primary>
       </indexterm>
 
       <para>

@@ -1845,7 +1843,7 @@
       <title><literal>mysql_close()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_close()</literal></primary>
+        <primary>mysql_close()</primary>
       </indexterm>
 
       <para>

@@ -1888,7 +1886,7 @@
       <title><literal>mysql_commit()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_commit()</literal></primary>
+        <primary>mysql_commit()</primary>
       </indexterm>
 
       <para>

@@ -1937,7 +1935,7 @@
       <title><literal>mysql_connect()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_connect()</literal></primary>
+        <primary>mysql_connect()</primary>
       </indexterm>
 
       <para>

@@ -2008,7 +2006,7 @@
       <title><literal>mysql_create_db()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_create_db()</literal></primary>
+        <primary>mysql_create_db()</primary>
       </indexterm>
 
       <para>

@@ -2111,7 +2109,7 @@
       <title><literal>mysql_data_seek()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_data_seek()</literal></primary>
+        <primary>mysql_data_seek()</primary>
       </indexterm>
 
       <para>

@@ -2161,7 +2159,7 @@
       <title><literal>mysql_debug()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_debug()</literal></primary>
+        <primary>mysql_debug()</primary>
       </indexterm>
 
       <para>

@@ -2218,7 +2216,7 @@
       <title><literal>mysql_drop_db()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_drop_db()</literal></primary>
+        <primary>mysql_drop_db()</primary>
       </indexterm>
 
       <para>

@@ -2318,7 +2316,7 @@
       <title><literal>mysql_dump_debug_info()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_dump_debug_info()</literal></primary>
+        <primary>mysql_dump_debug_info()</primary>
       </indexterm>
 
       <para>

@@ -2399,7 +2397,7 @@
       <title><literal>mysql_eof()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_eof()</literal></primary>
+        <primary>mysql_eof()</primary>
       </indexterm>
 
       <para>

@@ -2527,7 +2525,7 @@
       <title><literal>mysql_errno()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_errno()</literal></primary>
+        <primary>mysql_errno()</primary>
       </indexterm>
 
       <para>

@@ -2602,7 +2600,7 @@
       <title><literal>mysql_error()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_error()</literal></primary>
+        <primary>mysql_error()</primary>
       </indexterm>
 
       <para>

@@ -2676,7 +2674,7 @@
       <title><literal>mysql_escape_string()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_escape_string()</literal></primary>
+        <primary>mysql_escape_string()</primary>
       </indexterm>
 
       <para>

@@ -2702,7 +2700,7 @@
       <title><literal>mysql_fetch_field()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_fetch_field()</literal></primary>
+        <primary>mysql_fetch_field()</primary>
       </indexterm>
 
       <para>

@@ -2781,7 +2779,7 @@
       <title><literal>mysql_fetch_field_direct()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_fetch_field_direct()</literal></primary>
+        <primary>mysql_fetch_field_direct()</primary>
       </indexterm>
 
       <para>

@@ -2843,7 +2841,7 @@
       <title><literal>mysql_fetch_fields()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_fetch_fields()</literal></primary>
+        <primary>mysql_fetch_fields()</primary>
       </indexterm>
 
       <para>

@@ -2902,7 +2900,7 @@
       <title><literal>mysql_fetch_lengths()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_fetch_lengths()</literal></primary>
+        <primary>mysql_fetch_lengths()</primary>
       </indexterm>
 
       <para>

@@ -2985,7 +2983,7 @@
       <title><literal>mysql_fetch_row()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_fetch_row()</literal></primary>
+        <primary>mysql_fetch_row()</primary>
       </indexterm>
 
       <para>

@@ -3100,7 +3098,7 @@
       <title><literal>mysql_field_count()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_field_count()</literal></primary>
+        <primary>mysql_field_count()</primary>
       </indexterm>
 
       <para>

@@ -3205,7 +3203,7 @@
       <title><literal>mysql_field_seek()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_field_seek()</literal></primary>
+        <primary>mysql_field_seek()</primary>
       </indexterm>
 
       <para>

@@ -3251,7 +3249,7 @@
       <title><literal>mysql_field_tell()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_field_tell()</literal></primary>
+        <primary>mysql_field_tell()</primary>
       </indexterm>
 
       <para>

@@ -3292,7 +3290,7 @@
       <title><literal>mysql_free_result()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_free_result()</literal></primary>
+        <primary>mysql_free_result()</primary>
       </indexterm>
 
       <para>

@@ -3339,7 +3337,7 @@
       <title><literal>mysql_get_character_set_info()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_get_character_set_info()</literal></primary>
+        <primary>mysql_get_character_set_info()</primary>
       </indexterm>
 
       <para>

@@ -3392,7 +3390,7 @@
       <title><literal>mysql_get_client_info()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_get_client_info()</literal></primary>
+        <primary>mysql_get_client_info()</primary>
       </indexterm>
 
       <para>

@@ -3431,7 +3429,7 @@
       <title><literal>mysql_get_client_version()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_get_client_version()</literal></primary>
+        <primary>mysql_get_client_version()</primary>
       </indexterm>
 
       <para>

@@ -3475,7 +3473,7 @@
       <title><literal>mysql_get_host_info()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_get_host_info()</literal></primary>
+        <primary>mysql_get_host_info()</primary>
       </indexterm>
 
       <para>

@@ -3515,7 +3513,7 @@
       <title><literal>mysql_get_proto_info()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_get_proto_info()</literal></primary>
+        <primary>mysql_get_proto_info()</primary>
       </indexterm>
 
       <para>

@@ -3555,7 +3553,7 @@
       <title><literal>mysql_get_server_info()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_get_server_info()</literal></primary>
+        <primary>mysql_get_server_info()</primary>
       </indexterm>
 
       <para>

@@ -3594,7 +3592,7 @@
       <title><literal>mysql_get_server_version()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_get_server_version()</literal></primary>
+        <primary>mysql_get_server_version()</primary>
       </indexterm>
 
       <para>

@@ -3687,7 +3685,7 @@
       <title><literal>mysql_hex_string()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_hex_string()</literal></primary>
+        <primary>mysql_hex_string()</primary>
       </indexterm>
 
       <para>

@@ -3783,7 +3781,7 @@
       <title><literal>mysql_info()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_info()</literal></primary>
+        <primary>mysql_info()</primary>
       </indexterm>
 
       <para>

@@ -3896,7 +3894,7 @@
       <title><literal>mysql_init()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_init()</literal></primary>
+        <primary>mysql_init()</primary>
       </indexterm>
 
       <para>

@@ -3946,7 +3944,7 @@
       <title><literal>mysql_insert_id()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_insert_id()</literal></primary>
+        <primary>mysql_insert_id()</primary>
       </indexterm>
 
       <para>

@@ -4084,7 +4082,7 @@
       <title><literal>mysql_kill()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_kill()</literal></primary>
+        <primary>mysql_kill()</primary>
       </indexterm>
 
       <para>

@@ -4174,7 +4172,7 @@
       <title><literal>mysql_library_end()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_library_end()</literal></primary>
+        <primary>mysql_library_end()</primary>
       </indexterm>
 
       <para>

@@ -4220,7 +4218,7 @@
       <title><literal>mysql_library_init()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_library_init()</literal></primary>
+        <primary>mysql_library_init()</primary>
       </indexterm>
 
       <para>

@@ -4355,7 +4353,7 @@
       <title><literal>mysql_list_dbs()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_list_dbs()</literal></primary>
+        <primary>mysql_list_dbs()</primary>
       </indexterm>
 
       <para>

@@ -4459,7 +4457,7 @@
       <title><literal>mysql_list_fields()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_list_fields()</literal></primary>
+        <primary>mysql_list_fields()</primary>
       </indexterm>
 
       <para>

@@ -4560,7 +4558,7 @@
       <title><literal>mysql_list_processes()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_list_processes()</literal></primary>
+        <primary>mysql_list_processes()</primary>
       </indexterm>
 
       <para>

@@ -4647,7 +4645,7 @@
       <title><literal>mysql_list_tables()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_list_tables()</literal></primary>
+        <primary>mysql_list_tables()</primary>
       </indexterm>
 
       <para>

@@ -4741,7 +4739,7 @@
       <title><literal>mysql_more_results()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_more_results()</literal></primary>
+        <primary>mysql_more_results()</primary>
       </indexterm>
 
       <para>

@@ -4801,7 +4799,7 @@
       <title><literal>mysql_next_result()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_next_result()</literal></primary>
+        <primary>mysql_next_result()</primary>
       </indexterm>
 
       <para>

@@ -4957,11 +4955,11 @@
       <title><literal>mysql_num_fields()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_num_fields()</literal></primary>
+        <primary>mysql_num_fields()</primary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>mysql_field_count()</literal></primary>
+        <primary>mysql_field_count()</primary>
       </indexterm>
 
       <para>

@@ -5071,7 +5069,7 @@
       <title><literal>mysql_num_rows()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_num_rows()</literal></primary>
+        <primary>mysql_num_rows()</primary>
       </indexterm>
 
       <para>

@@ -5131,7 +5129,7 @@
       <title><literal>mysql_options()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_options()</literal></primary>
+        <primary>mysql_options()</primary>
       </indexterm>
 
       <para>

@@ -5690,7 +5688,7 @@
       <title><literal>mysql_ping()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_ping()</literal></primary>
+        <primary>mysql_ping()</primary>
       </indexterm>
 
       <para>

@@ -5769,7 +5767,7 @@
       <title><literal>mysql_query()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_query()</literal></primary>
+        <primary>mysql_query()</primary>
       </indexterm>
 
       <para>

@@ -5871,7 +5869,7 @@
       <title><literal>mysql_real_connect()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_real_connect()</literal></primary>
+        <primary>mysql_real_connect()</primary>
       </indexterm>
 
       <para>

@@ -6374,7 +6372,7 @@
       <title><literal>mysql_real_escape_string()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_real_escape_string()</literal></primary>
+        <primary>mysql_real_escape_string()</primary>
       </indexterm>
 
       <para>

@@ -6493,7 +6491,7 @@
       <title><literal>mysql_real_query()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_real_query()</literal></primary>
+        <primary>mysql_real_query()</primary>
       </indexterm>
 
       <para>

@@ -6599,7 +6597,7 @@
       <title><literal>mysql_refresh()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_refresh()</literal></primary>
+        <primary>mysql_refresh()</primary>
       </indexterm>
 
       <para>

@@ -6777,7 +6775,7 @@
       <title><literal>mysql_reload()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_reload()</literal></primary>
+        <primary>mysql_reload()</primary>
       </indexterm>
 
       <para>

@@ -6866,7 +6864,7 @@
       <title><literal>mysql_rollback()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_rollback()</literal></primary>
+        <primary>mysql_rollback()</primary>
       </indexterm>
 
       <para>

@@ -6915,7 +6913,7 @@
       <title><literal>mysql_row_seek()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_row_seek()</literal></primary>
+        <primary>mysql_row_seek()</primary>
       </indexterm>
 
       <para>

@@ -6968,7 +6966,7 @@
       <title><literal>mysql_row_tell()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_row_tell()</literal></primary>
+        <primary>mysql_row_tell()</primary>
       </indexterm>
 
       <para>

@@ -7015,7 +7013,7 @@
       <title><literal>mysql_select_db()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_select_db()</literal></primary>
+        <primary>mysql_select_db()</primary>
       </indexterm>
 
       <para>

@@ -7104,7 +7102,7 @@
       <title><literal>mysql_set_character_set()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_set_character_set()</literal></primary>
+        <primary>mysql_set_character_set()</primary>
       </indexterm>
 
       <para>

@@ -7167,11 +7165,11 @@
       <title><literal>mysql_set_local_infile_default()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_set_local_infile_default()</literal></primary>
+        <primary>mysql_set_local_infile_default()</primary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>mysql_set_local_infile_default()</literal></primary>
+        <primary>mysql_set_local_infile_default()</primary>
       </indexterm>
 
       <para>

@@ -7372,7 +7370,7 @@
       <title><literal>mysql_set_server_option()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_set_server_option()</literal></primary>
+        <primary>mysql_set_server_option()</primary>
       </indexterm>
 
       <para>

@@ -7495,7 +7493,7 @@
       <title><literal>mysql_shutdown()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_shutdown()</literal></primary>
+        <primary>mysql_shutdown()</primary>
       </indexterm>
 
       <para>

@@ -7589,7 +7587,7 @@
       <title><literal>mysql_sqlstate()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_sqlstate()</literal></primary>
+        <primary>mysql_sqlstate()</primary>
       </indexterm>
 
       <para>

@@ -7666,7 +7664,7 @@
       <title><literal>mysql_ssl_set()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_ssl_set()</literal></primary>
+        <primary>mysql_ssl_set()</primary>
       </indexterm>
 
       <para>

@@ -7757,7 +7755,7 @@
       <title><literal>mysql_stat()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stat()</literal></primary>
+        <primary>mysql_stat()</primary>
       </indexterm>
 
       <para>

@@ -7839,7 +7837,7 @@
       <title><literal>mysql_store_result()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_store_result()</literal></primary>
+        <primary>mysql_store_result()</primary>
       </indexterm>
 
       <para>

@@ -8014,7 +8012,7 @@
       <title><literal>mysql_thread_id()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_thread_id()</literal></primary>
+        <primary>mysql_thread_id()</primary>
       </indexterm>
 
       <para>

@@ -8061,7 +8059,7 @@
       <title><literal>mysql_use_result()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_use_result()</literal></primary>
+        <primary>mysql_use_result()</primary>
       </indexterm>
 
       <para>

@@ -8220,7 +8218,7 @@
       <title><literal>mysql_warning_count()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_warning_count()</literal></primary>
+        <primary>mysql_warning_count()</primary>
       </indexterm>
 
       <para>

@@ -9668,7 +9666,7 @@
       <title><literal>mysql_stmt_affected_rows()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_affected_rows()</literal></primary>
+        <primary>mysql_stmt_affected_rows()</primary>
       </indexterm>
 
       <para>

@@ -9739,7 +9737,7 @@
       <title><literal>mysql_stmt_attr_get()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_attr_get()</literal></primary>
+        <primary>mysql_stmt_attr_get()</primary>
       </indexterm>
 
       <para>

@@ -9803,7 +9801,7 @@
       <title><literal>mysql_stmt_attr_set()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_attr_set()</literal></primary>
+        <primary>mysql_stmt_attr_set()</primary>
       </indexterm>
 
       <para>

@@ -9957,7 +9955,7 @@
       <title><literal>mysql_stmt_bind_param()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_bind_param()</literal></primary>
+        <primary>mysql_stmt_bind_param()</primary>
       </indexterm>
 
       <para>

@@ -10070,7 +10068,7 @@
       <title><literal>mysql_stmt_bind_result()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_bind_result()</literal></primary>
+        <primary>mysql_stmt_bind_result()</primary>
       </indexterm>
 
       <para>

@@ -10191,7 +10189,7 @@
       <title><literal>mysql_stmt_close()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_close()</literal></primary>
+        <primary>mysql_stmt_close()</primary>
       </indexterm>
 
       <para>

@@ -10266,7 +10264,7 @@
       <title><literal>mysql_stmt_data_seek()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_data_seek()</literal></primary>
+        <primary>mysql_stmt_data_seek()</primary>
       </indexterm>
 
       <para>

@@ -10315,7 +10313,7 @@
       <title><literal>mysql_stmt_errno()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_errno()</literal></primary>
+        <primary>mysql_stmt_errno()</primary>
       </indexterm>
 
       <para>

@@ -10361,7 +10359,7 @@
       <title><literal>mysql_stmt_error()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_error()</literal></primary>
+        <primary>mysql_stmt_error()</primary>
       </indexterm>
 
       <para>

@@ -10424,7 +10422,7 @@
       <title><literal>mysql_stmt_execute()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_execute()</literal></primary>
+        <primary>mysql_stmt_execute()</primary>
       </indexterm>
 
       <para>

@@ -10742,7 +10740,7 @@
       <title><literal>mysql_stmt_fetch()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_fetch()</literal></primary>
+        <primary>mysql_stmt_fetch()</primary>
       </indexterm>
 
       <para>

@@ -11239,7 +11237,7 @@
       <title><literal>mysql_stmt_fetch_column()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_fetch_column()</literal></primary>
+        <primary>mysql_stmt_fetch_column()</primary>
       </indexterm>
 
       <para>

@@ -11308,7 +11306,7 @@
       <title><literal>mysql_stmt_field_count()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_field_count()</literal></primary>
+        <primary>mysql_stmt_field_count()</primary>
       </indexterm>
 
       <para>

@@ -11357,7 +11355,7 @@
       <title><literal>mysql_stmt_free_result()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_free_result()</literal></primary>
+        <primary>mysql_stmt_free_result()</primary>
       </indexterm>
 
       <para>

@@ -11396,7 +11394,7 @@
       <title><literal>mysql_stmt_init()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_init()</literal></primary>
+        <primary>mysql_stmt_init()</primary>
       </indexterm>
 
       <para>

@@ -11446,7 +11444,7 @@
       <title><literal>mysql_stmt_insert_id()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_insert_id()</literal></primary>
+        <primary>mysql_stmt_insert_id()</primary>
       </indexterm>
 
       <para>

@@ -11506,7 +11504,7 @@
       <title><literal>mysql_stmt_num_rows()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_num_rows()</literal></primary>
+        <primary>mysql_stmt_num_rows()</primary>
       </indexterm>
 
       <para>

@@ -11567,7 +11565,7 @@
       <title><literal>mysql_stmt_param_count()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_param_count()</literal></primary>
+        <primary>mysql_stmt_param_count()</primary>
       </indexterm>
 
       <para>

@@ -11617,7 +11615,7 @@
       <title><literal>mysql_stmt_param_metadata()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_param_metadata()</literal></primary>
+        <primary>mysql_stmt_param_metadata()</primary>
       </indexterm>
 
       <para>

@@ -11648,7 +11646,7 @@
       <title><literal>mysql_stmt_prepare()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_prepare()</literal></primary>
+        <primary>mysql_stmt_prepare()</primary>
       </indexterm>
 
       <para>

@@ -11789,7 +11787,7 @@
       <title><literal>mysql_stmt_reset()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_reset()</literal></primary>
+        <primary>mysql_stmt_reset()</primary>
       </indexterm>
 
       <para>

@@ -11876,7 +11874,7 @@
       <title><literal>mysql_stmt_result_metadata()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_result_metadata</literal></primary>
+        <primary>mysql_stmt_result_metadata</primary>
       </indexterm>
 
       <para>

@@ -12023,7 +12021,7 @@
       <title><literal>mysql_stmt_row_seek()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_row_seek()</literal></primary>
+        <primary>mysql_stmt_row_seek()</primary>
       </indexterm>
 
       <para>

@@ -12077,7 +12075,7 @@
       <title><literal>mysql_stmt_row_tell()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_row_tell()</literal></primary>
+        <primary>mysql_stmt_row_tell()</primary>
       </indexterm>
 
       <para>

@@ -12123,7 +12121,7 @@
       <title><literal>mysql_stmt_send_long_data()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_send_long_data()</literal></primary>
+        <primary>mysql_stmt_send_long_data()</primary>
       </indexterm>
 
       <para>

@@ -12315,7 +12313,7 @@
       <title><literal>mysql_stmt_sqlstate()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_sqlstate()</literal></primary>
+        <primary>mysql_stmt_sqlstate()</primary>
       </indexterm>
 
       <para>

@@ -12360,7 +12358,7 @@
       <title><literal>mysql_stmt_store_result()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_stmt_store_result()</literal></primary>
+        <primary>mysql_stmt_store_result()</primary>
       </indexterm>
 
       <para>

@@ -12942,7 +12940,7 @@
       <title><literal>my_init()</literal></title>
 
       <indexterm>
-        <primary><literal>my_init()</literal></primary>
+        <primary>my_init()</primary>
       </indexterm>
 
       <para>

@@ -13000,7 +12998,7 @@
       <title><literal>mysql_thread_end()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_thread_end()</literal></primary>
+        <primary>mysql_thread_end()</primary>
       </indexterm>
 
       <para>

@@ -13038,7 +13036,7 @@
       <title><literal>mysql_thread_init()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_thread_init()</literal></primary>
+        <primary>mysql_thread_init()</primary>
       </indexterm>
 
       <para>

@@ -13081,7 +13079,7 @@
       <title><literal>mysql_thread_safe()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_thread_safe()</literal></primary>
+        <primary>mysql_thread_safe()</primary>
       </indexterm>
 
       <para>

@@ -13151,7 +13149,7 @@
       <title><literal>mysql_server_init()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_server_init()</literal></primary>
+        <primary>mysql_server_init()</primary>
       </indexterm>
 
       <para>

@@ -13191,7 +13189,7 @@
       <title><literal>mysql_server_end()</literal></title>
 
       <indexterm>
-        <primary><literal>mysql_server_end()</literal></primary>
+        <primary>mysql_server_end()</primary>
       </indexterm>
 
       <para>

@@ -13355,11 +13353,11 @@
     <title>Common Questions and Problems When Using the C API</title>
 
     <indexterm>
-      <primary><literal>mysql_query()</literal></primary>
+      <primary>mysql_query()</primary>
     </indexterm>
 
     <indexterm>
-      <primary><literal>mysql_store_result()</literal></primary>
+      <primary>mysql_store_result()</primary>
     </indexterm>
 
     <formalpara role="mnmas-kb">

@@ -13611,8 +13609,7 @@
           <para>
             For information on <literal>LAST_INSERT_ID()</literal>,
             which can be used within an SQL statement, see
-            <xref
-      linkend="function_last-insert-id"/>.
+            <xref linkend="function_last-insert-id"/>.
           </para>
         </listitem>
 

@@ -13629,8 +13626,7 @@
           <para>
             For information on obtaining the auto-incremented value when
             using Connector/J see
-            <xref
-    linkend="connector-j-usagenotes"/>.
+            <xref linkend="connector-j-usagenotes"/>.
           </para>
         </listitem>
 

@@ -13638,8 +13634,7 @@
           <para>
             For information on obtaining the auto-incremented value when
             using Connector/ODBC see
-            <xref
-      linkend="myodbc-usagenotes-functionality-last-insert-id"/>.
+            <xref linkend="myodbc-usagenotes-functionality-last-insert-id"/>.
           </para>
         </listitem>
 


Modified: trunk/refman-5.0/apis.xml
===================================================================
--- trunk/refman-5.0/apis.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/apis.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 8, Lines Added: 15, Lines Deleted: 18; 3060 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="apis">
 
   <title>APIs and Libraries</title>

@@ -18,11 +16,11 @@
   </indexterm>
 
   <indexterm>
-    <primary><literal>mysqlclient</literal> library</primary>
+    <primary>mysqlclient library</primary>
   </indexterm>
 
   <indexterm>
-    <primary><literal>mysqld</literal> library</primary>
+    <primary>mysqld library</primary>
   </indexterm>
 
   <indexterm>

@@ -32,12 +30,12 @@
 
   <indexterm>
     <primary>library</primary>
-    <secondary><literal>mysqlclient</literal></secondary>
+    <secondary>mysqlclient</secondary>
   </indexterm>
 
   <indexterm>
     <primary>library</primary>
-    <secondary><literal>mysqld</literal></secondary>
+    <secondary>mysqld</secondary>
   </indexterm>
 
   <para>

@@ -153,7 +151,7 @@
 
   </section>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apis-c.xml" />
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apis-c.xml"/>
 
   <section id="php">
 

@@ -230,10 +228,9 @@
       provides the <literal>mysql</literal> and
       <literal>mysqli</literal> extensions for the Windows operating
       system for MySQL versions as of 5.0.18 on
-      <ulink
-        url="http://dev.mysql.com/downloads/connector/php/"></ulink>.
-      You can find information why you should preferably use the
-      extensions provided by MySQL on that page.
+      <ulink url="http://dev.mysql.com/downloads/connector/php/"/>. You
+      can find information why you should preferably use the extensions
+      provided by MySQL on that page.
     </para>
 
     <formalpara role="mnmas-kb">

@@ -406,11 +403,11 @@
     </indexterm>
 
     <indexterm>
-      <primary><literal>DBI</literal> interface</primary>
+      <primary>DBI interface</primary>
     </indexterm>
 
     <indexterm>
-      <primary><literal>DBI/DBD</literal> interface</primary>
+      <primary>DBI/DBD interface</primary>
     </indexterm>
 
     <remark role="todo">

@@ -648,7 +645,7 @@
       <refentry id="msql2mysql">
 
         <indexterm>
-          <primary><command>msql2mysql</command></primary>
+          <primary>&lt;command&gt;msql2mysql&lt;/command&gt;</primary>
         </indexterm>
 
         <refmeta>

@@ -723,7 +720,7 @@
       <refentry id="mysql-config">
 
         <indexterm>
-          <primary><command>mysql_config</command></primary>
+          <primary>&lt;command&gt;mysql_config&lt;/command&gt;</primary>
         </indexterm>
 
         <refmeta>


Modified: trunk/refman-5.0/builds-es.xml
===================================================================
--- trunk/refman-5.0/builds-es.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/builds-es.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 5; 806 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="builds-es">
 
   <title>Enterprise Server Distribution Types</title>


Modified: trunk/refman-5.0/charset.xml
===================================================================
--- trunk/refman-5.0/charset.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/charset.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 6, Lines Added: 23, Lines Deleted: 25; 4004 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="charset">
 
   <title>Character Set Support</title>

@@ -831,7 +829,7 @@
         just a signal. An introducer is also legal before standard hex
         literal and numeric hex literal notation
         (<literal>x'<replaceable>literal</replaceable>'</literal> and
-        <literal>0x<replaceable>nnnn</replaceable></literal>)>.
+        <literal>0x<replaceable>nnnn</replaceable></literal>)&gt;.
       </para>
 
       <para>

@@ -1186,13 +1184,13 @@
     <title>Connection Character Sets and Collations</title>
 
     <indexterm>
-      <primary><literal>SET</literal></primary>
-      <secondary><literal>CHARACTER SET</literal></secondary>
+      <primary>SET</primary>
+      <secondary>CHARACTER SET</secondary>
     </indexterm>
 
     <indexterm>
-      <primary><literal>SET</literal></primary>
-      <secondary><literal>NAMES</literal></secondary>
+      <primary>SET</primary>
+      <secondary>NAMES</secondary>
     </indexterm>
 
     <para>

@@ -2031,15 +2029,15 @@
       </para>
 
 <programlisting>
-mysql> <userinput>CREATE TABLE german1 (</userinput>
-    -> <userinput>  c CHAR(10)</userinput>
-    -> <userinput>) CHARACTER SET latin1 COLLATE latin1_german1_ci;</userinput>
-mysql> <userinput>CREATE TABLE german2 (</userinput>
-    -> <userinput>  c CHAR(10)</userinput>
-    -> <userinput>) CHARACTER SET latin1 COLLATE latin1_german2_ci;</userinput>
-mysql> <userinput>CREATE TABLE germanutf8 (</userinput>
-    -> <userinput>  c CHAR(10)</userinput>
-    -> <userinput>) CHARACTER SET utf8 COLLATE utf8_unicode_ci;</userinput>
+mysql&gt; <userinput>CREATE TABLE german1 (</userinput>
+    -&gt; <userinput>  c CHAR(10)</userinput>
+    -&gt; <userinput>) CHARACTER SET latin1 COLLATE latin1_german1_ci;</userinput>
+mysql&gt; <userinput>CREATE TABLE german2 (</userinput>
+    -&gt; <userinput>  c CHAR(10)</userinput>
+    -&gt; <userinput>) CHARACTER SET latin1 COLLATE latin1_german2_ci;</userinput>
+mysql&gt; <userinput>CREATE TABLE germanutf8 (</userinput>
+    -&gt; <userinput>  c CHAR(10)</userinput>
+    -&gt; <userinput>) CHARACTER SET utf8 COLLATE utf8_unicode_ci;</userinput>
 </programlisting>
 
       <para>

@@ -2047,9 +2045,9 @@
       </para>
 
 <programlisting>
-mysql> <userinput>INSERT INTO german1 VALUES ('Bar'), ('Bär');</userinput>
-mysql> <userinput>INSERT INTO german2 VALUES ('Bar'), ('Bär');</userinput>
-mysql> <userinput>INSERT INTO germanutf8 VALUES ('Bar'), ('Bär');</userinput>
+mysql&gt; <userinput>INSERT INTO german1 VALUES ('Bar'), ('Bär');</userinput>
+mysql&gt; <userinput>INSERT INTO german2 VALUES ('Bar'), ('Bär');</userinput>
+mysql&gt; <userinput>INSERT INTO germanutf8 VALUES ('Bar'), ('Bär');</userinput>
 </programlisting>
 
       <para>

@@ -2060,20 +2058,20 @@
       </para>
 
 <programlisting>
-mysql> <userinput>SELECT * FROM german1 WHERE c = 'Bär';</userinput>
+mysql&gt; <userinput>SELECT * FROM german1 WHERE c = 'Bär';</userinput>
 +------+
 | c    |
 +------+
 | Bar  |
 | Bär  |
 +------+
-mysql> <userinput>SELECT * FROM german2 WHERE c = 'Bär';</userinput>
+mysql&gt; <userinput>SELECT * FROM german2 WHERE c = 'Bär';</userinput>
 +------+
 | c    |
 +------+
 | Bär  |
 +------+
-mysql> <userinput>SELECT * FROM germanutf8 WHERE c = 'Bär';</userinput>
+mysql&gt; <userinput>SELECT * FROM germanutf8 WHERE c = 'Bär';</userinput>
 +------+
 | c    |
 +------+


Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/client-utility-programs.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 21, Lines Added: 46, Lines Deleted: 53; 11700 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="client-utility-programs">
 
   <title>Client and Utility Programs</title>

@@ -508,39 +506,39 @@
     </para>
 
     <indexterm>
-      <primary><literal>MYSQL_UNIX_PORT</literal> environment variable</primary>
+      <primary>MYSQL_UNIX_PORT environment variable</primary>
     </indexterm>
 
     <indexterm>
       <primary>environment variable</primary>
-      <secondary><literal>MYSQL_UNIX_PORT</literal></secondary>
+      <secondary>MYSQL_UNIX_PORT</secondary>
     </indexterm>
 
     <indexterm>
-      <primary><literal>MYSQL_TCP_PORT</literal> environment variable</primary>
+      <primary>MYSQL_TCP_PORT environment variable</primary>
     </indexterm>
 
     <indexterm>
       <primary>environment variable</primary>
-      <secondary><literal>MYSQL_TCP_PORT</literal></secondary>
+      <secondary>MYSQL_TCP_PORT</secondary>
     </indexterm>
 
     <indexterm>
-      <primary><literal>MYSQL_PWD</literal> environment variable</primary>
+      <primary>MYSQL_PWD environment variable</primary>
     </indexterm>
 
     <indexterm>
       <primary>environment variable</primary>
-      <secondary><literal>MYSQL_PWD</literal></secondary>
+      <secondary>MYSQL_PWD</secondary>
     </indexterm>
 
     <indexterm>
-      <primary><literal>MYSQL_DEBUG</literal> environment variable</primary>
+      <primary>MYSQL_DEBUG environment variable</primary>
     </indexterm>
 
     <indexterm>
       <primary>environment variable</primary>
-      <secondary><literal>MYSQL_DEBUG</literal></secondary>
+      <secondary>MYSQL_DEBUG</secondary>
     </indexterm>
 
     <informaltable>

@@ -1602,52 +1600,47 @@
         </para>
 
         <indexterm>
-          <primary><literal>decode_bits</literal> <command>myisamchk</command> variable</primary>
+          <primary>decode_bits &lt;command&gt;myisamchk&lt;/command&gt; variable</primary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>ft_max_word_len</literal> <command>myisamchk</command> variable</primary>
+          <primary>ft_max_word_len &lt;command&gt;myisamchk&lt;/command&gt; variable</primary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>ft_min_word_len</literal> <command>myisamchk</command> variable</primary>
+          <primary>ft_min_word_len &lt;command&gt;myisamchk&lt;/command&gt; variable</primary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>ft_stopword_file</literal> <command>myisamchk</command>
-            variable</primary>
+          <primary>ft_stopword_file &lt;command&gt;myisamchk&lt;/command&gt; variable</primary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>key_buffer_size</literal> <command>myisamchk</command> variable</primary>
+          <primary>key_buffer_size &lt;command&gt;myisamchk&lt;/command&gt; variable</primary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>myisam_block_size</literal> <command>myisamchk</command>
-            variable</primary>
+          <primary>myisam_block_size &lt;command&gt;myisamchk&lt;/command&gt; variable</primary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>read_buffer_size</literal> <command>myisamchk</command>
-            variable</primary>
+          <primary>read_buffer_size &lt;command&gt;myisamchk&lt;/command&gt; variable</primary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>sort_buffer_size</literal> <command>myisamchk</command>
-            variable</primary>
+          <primary>sort_buffer_size &lt;command&gt;myisamchk&lt;/command&gt; variable</primary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>sort_key_blocks</literal> <command>myisamchk</command> variable</primary>
+          <primary>sort_key_blocks &lt;command&gt;myisamchk&lt;/command&gt; variable</primary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>stats_method</literal> <command>myisamchk</command> variable</primary>
+          <primary>stats_method &lt;command&gt;myisamchk&lt;/command&gt; variable</primary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>write_buffer_size</literal> <command>myisamchk</command>
-            variable</primary>
+          <primary>write_buffer_size &lt;command&gt;myisamchk&lt;/command&gt; variable</primary>
         </indexterm>
 
         <informaltable>

@@ -4152,7 +4145,7 @@
           </listitem>
 
           <listitem>
-            <para id="option_mysql_batch" >
+            <para id="option_mysql_batch">
               <indexterm>
                 <primary>mysql</primary>
                 <secondary>batch option</secondary>

@@ -4865,7 +4858,7 @@
           </listitem>
 
           <listitem>
-            <para id="option_mysql_safe-updates" >
+            <para id="option_mysql_safe-updates">
               <indexterm>
                 <primary>mysql</primary>
                 <secondary>safe-updates option</secondary>

@@ -5352,11 +5345,11 @@
             <para id="option_mysql_connect_timeout">
               <indexterm>
                 <primary>timeout</primary>
-                <secondary><literal>connect_timeout</literal> variable</secondary>
+                <secondary>connect_timeout variable</secondary>
               </indexterm>
 
               <indexterm>
-                <primary><literal>connect_timeout</literal> variable</primary>
+                <primary>connect_timeout variable</primary>
               </indexterm>
 
               <literal>connect_timeout</literal>

@@ -5371,7 +5364,7 @@
           <listitem>
             <para id="option_mysql_max_alowed_packet">
               <indexterm>
-                <primary><literal>max_allowed_packet</literal> variable</primary>
+                <primary>max_allowed_packet variable</primary>
               </indexterm>
 
               <literal>max_allowed_packet</literal>

@@ -5386,7 +5379,7 @@
           <listitem>
             <para id="option_mysql_max_join_size">
               <indexterm>
-                <primary><literal>max_join_size</literal> variable</primary>
+                <primary>max_join_size variable</primary>
               </indexterm>
 
               <literal>max_join_size</literal>

@@ -5402,7 +5395,7 @@
           <listitem>
             <para>
               <indexterm>
-                <primary><literal>net_buffer_length</literal> variable</primary>
+                <primary>net_buffer_length variable</primary>
               </indexterm>
 
               <literal>net_buffer_length</literal>

@@ -5417,7 +5410,7 @@
           <listitem>
             <para id="option_mysql_select_limit">
               <indexterm>
-                <primary><literal>select_limit</literal> variable</primary>
+                <primary>select_limit variable</primary>
               </indexterm>
 
               <literal>select_limit</literal>

@@ -5441,21 +5434,21 @@
         </para>
 
         <indexterm>
-          <primary><literal>MYSQL_HISTFILE</literal> environment variable</primary>
+          <primary>MYSQL_HISTFILE environment variable</primary>
         </indexterm>
 
         <indexterm>
           <primary>environment variable</primary>
-          <secondary><literal>MYSQL_HISTFILE</literal></secondary>
+          <secondary>MYSQL_HISTFILE</secondary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>HOME</literal> environment variable</primary>
+          <primary>HOME environment variable</primary>
         </indexterm>
 
         <indexterm>
           <primary>environment variable</primary>
-          <secondary><literal>HOME</literal></secondary>
+          <secondary>HOME</secondary>
         </indexterm>
 
         <indexterm>

@@ -6031,7 +6024,7 @@
         </para>
 
 <programlisting>
-mysql> <userinput>help me</userinput>
+mysql&gt; <userinput>help me</userinput>
 
 Nothing found
 Please try to run 'help contents' for a list of all accessible topics

@@ -6043,7 +6036,7 @@
         </para>
 
 <programlisting>
-mysql> <userinput>help contents</userinput>
+mysql&gt; <userinput>help contents</userinput>
 You asked for help about help category: "Contents"
 For more information, type 'help &lt;item&gt;', where &lt;item&gt; is one of the
 following categories:

@@ -6069,7 +6062,7 @@
         </para>
 
 <programlisting>
-mysql> <userinput>help logs</userinput>
+mysql&gt; <userinput>help logs</userinput>
 Many help items for your request exist.
 To make a more specific request, please type 'help &lt;item&gt;',
 where &lt;item&gt; is one of the following topics:

@@ -6085,7 +6078,7 @@
         </para>
 
 <programlisting>
-mysql> <userinput>help show binary logs</userinput>
+mysql&gt; <userinput>help show binary logs</userinput>
 Name: 'SHOW BINARY LOGS'
 Description:
 Syntax:

@@ -6096,7 +6089,7 @@
 part of the procedure described in [purge-master-logs], that shows how
 to determine which logs can be purged.
 
-mysql> SHOW BINARY LOGS;
+mysql&gt; SHOW BINARY LOGS;
 +---------------+-----------+
 | Log_name      | File_size |
 +---------------+-----------+

@@ -8022,12 +8015,12 @@
           <listitem>
             <para id="option_mysqladmin_connect_timeout">
               <indexterm>
-                <primary><literal>connect_timeout</literal> variable</primary>
+                <primary>connect_timeout variable</primary>
               </indexterm>
 
               <indexterm>
                 <primary>timeout</primary>
-                <secondary><literal>connect_timeout</literal> variable</secondary>
+                <secondary>connect_timeout variable</secondary>
               </indexterm>
 
               <literal>connect_timeout</literal>

@@ -8042,12 +8035,12 @@
           <listitem>
             <para id="option_mysqladmin_shutdown_timeout">
               <indexterm>
-                <primary><literal>shutdown_timeout</literal> variable</primary>
+                <primary>shutdown_timeout variable</primary>
               </indexterm>
 
               <indexterm>
                 <primary>timeout</primary>
-                <secondary><literal>shutdown_timeout</literal> variable</secondary>
+                <secondary>shutdown_timeout variable</secondary>
               </indexterm>
 
               <literal>shutdown_timeout</literal>

@@ -8826,7 +8819,7 @@
           <listitem>
             <para id="option_mysqlbinlog_open_files_limit">
               <indexterm>
-                <primary><literal>open_files_limit</literal> variable</primary>
+                <primary>open_files_limit variable</primary>
               </indexterm>
 
               <literal>open_files_limit</literal>

@@ -14459,7 +14452,7 @@
     <refentry id="mysql-convert-table-format">
 
       <indexterm>
-        <primary><command>mysql_convert_table_format</command></primary>
+        <primary>&lt;command&gt;mysql_convert_table_format&lt;/command&gt;</primary>
       </indexterm>
 
       <refmeta>

@@ -16550,7 +16543,7 @@
     <refentry id="resolve-stack-dump">
 
       <indexterm>
-        <primary><command>resolve_stack_dump</command></primary>
+        <primary>&lt;command&gt;resolve_stack_dump&lt;/command&gt;</primary>
       </indexterm>
 
       <refmeta>


Modified: trunk/refman-5.0/connectors.xml
===================================================================
--- trunk/refman-5.0/connectors.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/connectors.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 2, Lines Added: 9, Lines Deleted: 11; 2109 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="connectors">
 
   <title>Connectors</title>

@@ -105,16 +103,16 @@
     the <xref linkend="apis"/> chapter.
   </para>
 
-  <xi:include href="../refman-common/connector-odbc.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../refman-common/connector-odbc.xml"/>
 
-  <xi:include href="../refman-common/connector-net.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../refman-common/connector-net.xml"/>
 
-  <xi:include href="../refman-common/connector-vstudioplugin.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../refman-common/connector-vstudioplugin.xml"/>
 
-  <xi:include href="../refman-common/connector-j.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../refman-common/connector-j.xml"/>
 
-  <xi:include href="../refman-common/connector-mxj.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../refman-common/connector-mxj.xml"/>
 
-  <xi:include href="../refman-common/connector-php.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../refman-common/connector-php.xml"/>
 
 </chapter>


Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/data-types.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 3, Lines Added: 9, Lines Deleted: 11; 1987 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="data-types">
 
   <title>Data Types</title>

@@ -4573,16 +4571,16 @@
           <para>
             <indexterm>
               <primary>default values</primary>
-              <secondary><literal>BLOB</literal> and <literal>TEXT</literal> columns</secondary>
+              <secondary>BLOB and TEXT columns</secondary>
             </indexterm>
 
             <indexterm>
-              <primary><literal>BLOB</literal> columns</primary>
+              <primary>BLOB columns</primary>
               <secondary>default values</secondary>
             </indexterm>
 
             <indexterm>
-              <primary><literal>TEXT</literal> columns</primary>
+              <primary>TEXT columns</primary>
               <secondary>default values</secondary>
             </indexterm>
 

@@ -5773,17 +5771,17 @@
     </para>
 
     <indexterm>
-      <primary><literal>BLOB</literal></primary>
+      <primary>BLOB</primary>
       <secondary>size</secondary>
     </indexterm>
 
     <indexterm>
-      <primary><literal>TEXT</literal></primary>
+      <primary>TEXT</primary>
       <secondary>size</secondary>
     </indexterm>
 
     <indexterm>
-      <primary><literal>VARCHAR</literal></primary>
+      <primary>VARCHAR</primary>
       <secondary>size</secondary>
     </indexterm>
 


Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/dba-core.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 45, Lines Added: 76, Lines Deleted: 82; 18261 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="database-administration">
 
   <title>Database Administration</title>

@@ -90,7 +88,7 @@
       <listitem>
         <para>
           <indexterm>
-            <primary><command>mysqld</command></primary>
+            <primary>&lt;command&gt;mysqld&lt;/command&gt;</primary>
           </indexterm>
 
           <command>mysqld</command>

@@ -107,7 +105,7 @@
       <listitem>
         <para>
           <indexterm>
-            <primary><command>mysqld_safe</command></primary>
+            <primary>&lt;command&gt;mysqld_safe&lt;/command&gt;</primary>
           </indexterm>
 
           <command>mysqld_safe</command>

@@ -123,7 +121,7 @@
       <listitem>
         <para>
           <indexterm>
-            <primary><command>mysql.server</command></primary>
+            <primary>&lt;command&gt;mysql.server&lt;/command&gt;</primary>
           </indexterm>
 
           <command>mysql.server</command>

@@ -141,7 +139,7 @@
       <listitem>
         <para>
           <indexterm>
-            <primary><command>mysqld_multi</command></primary>
+            <primary>&lt;command&gt;mysqld_multi&lt;/command&gt;</primary>
           </indexterm>
 
           <command>mysqld_multi</command>

@@ -161,7 +159,7 @@
       <listitem>
         <para>
           <indexterm>
-            <primary><command>mysqlmanager</command></primary>
+            <primary>&lt;command&gt;mysqlmanager&lt;/command&gt;</primary>
           </indexterm>
 
           <command>mysqlmanager</command>

@@ -206,7 +204,7 @@
       <listitem>
         <para>
           <indexterm>
-            <primary><command>make_binary_distribution</command></primary>
+            <primary>&lt;command&gt;make_binary_distribution&lt;/command&gt;</primary>
           </indexterm>
 
           <command>make_binary_distribution</command>

@@ -262,7 +260,7 @@
       <listitem>
         <para>
           <indexterm>
-            <primary><command>mysql_install_db</command></primary>
+            <primary>&lt;command&gt;mysql_install_db&lt;/command&gt;</primary>
           </indexterm>
 
           <command>mysql_install_db</command>

@@ -357,13 +355,13 @@
     <refentry id="mysqld">
 
       <indexterm>
-        <primary><command>mysqld</command></primary>
+        <primary>&lt;command&gt;mysqld&lt;/command&gt;</primary>
         <secondary>MySQL server</secondary>
       </indexterm>
 
       <indexterm>
         <primary>MySQL server</primary>
-        <secondary><command>mysqld</command></secondary>
+        <secondary>&lt;command&gt;mysqld&lt;/command&gt;</secondary>
       </indexterm>
 
       <refmeta>

@@ -487,11 +485,11 @@
 
         <indexterm>
           <primary>command options</primary>
-          <secondary><command>mysqld</command></secondary>
+          <secondary>&lt;command&gt;mysqld&lt;/command&gt;</secondary>
         </indexterm>
 
         <indexterm>
-          <primary><command>mysqld</command></primary>
+          <primary>&lt;command&gt;mysqld&lt;/command&gt;</primary>
           <secondary>command options</secondary>
         </indexterm>
 

@@ -3887,7 +3885,7 @@
               <xref linkend="binary-log"/>.
             </para>
 
-            <formalpara role ="mnmas">
+            <formalpara role="mnmas">
 
               <title>MySQL Enterprise</title>
 

@@ -5159,7 +5157,7 @@
           </listitem>
 
           <listitem>
-            <para >
+            <para>
               <literal>large_pages</literal>
             </para>
 

@@ -5531,7 +5529,7 @@
               information.
             </para>
 
-            <formalpara role ="mnmas">
+            <formalpara role="mnmas">
 
               <title>MySQL Enterprise</title>
 

@@ -5611,7 +5609,7 @@
                 recommendations for the optimum setting for
                 <literal>max_heap_table_size</literal>. For more
                 information see
-                <ulink url="&base-url-enterprise;advisors.html" />.
+                <ulink url="&base-url-enterprise;advisors.html"/>.
               </para>
 
             </formalpara>

@@ -8243,7 +8241,7 @@
               Monitor continually monitors system variables and provides
               expert advice about appropriate settings. For more
               information see
-              <ulink url="&base-url-enterprise;advisors.html" />.
+              <ulink url="&base-url-enterprise;advisors.html"/>.
             </para>
 
           </formalpara>

@@ -10275,7 +10273,7 @@
             </para>
 
 <programlisting>
-mysql> <userinput>CREATE TABLE count (i INT);</userinput>
+mysql&gt; <userinput>CREATE TABLE count (i INT);</userinput>
 ERROR 1064 (42000): You have an error in your SQL syntax
 </programlisting>
 

@@ -10284,7 +10282,7 @@
             </para>
 
 <programlisting>
-mysql> <userinput>CREATE TABLE `count` (i INT);</userinput>
+mysql&gt; <userinput>CREATE TABLE `count` (i INT);</userinput>
 Query OK, 0 rows affected (0.00 sec)
 </programlisting>
 

@@ -11183,11 +11181,11 @@
       <refentry id="mysqld-safe">
 
         <indexterm>
-          <primary><command>mysqld_safe</command></primary>
+          <primary>&lt;command&gt;mysqld_safe&lt;/command&gt;</primary>
         </indexterm>
 
         <indexterm>
-          <primary><command>safe_mysqld</command></primary>
+          <primary>&lt;command&gt;safe_mysqld&lt;/command&gt;</primary>
         </indexterm>
 
         <indexterm>

@@ -11983,7 +11981,7 @@
       <refentry id="mysql-server">
 
         <indexterm>
-          <primary><command>mysql.server</command></primary>
+          <primary>&lt;command&gt;mysql.server&lt;/command&gt;</primary>
         </indexterm>
 
         <refmeta>

@@ -12236,7 +12234,7 @@
       <refentry id="mysqld-multi">
 
         <indexterm>
-          <primary><command>mysqld_multi</command></primary>
+          <primary>&lt;command&gt;mysqld_multi&lt;/command&gt;</primary>
         </indexterm>
 
         <indexterm>

@@ -12990,7 +12988,7 @@
     <refentry id="instance-manager">
 
       <indexterm>
-        <primary><command>mysqlmanager</command></primary>
+        <primary>&lt;command&gt;mysqlmanager&lt;/command&gt;</primary>
       </indexterm>
 
       <indexterm>

@@ -13159,7 +13157,7 @@
           </listitem>
 
           <listitem>
-            <para >
+            <para>
               <indexterm>
                 <primary>mysqlmanager</primary>
                 <secondary>angel-pid-file option</secondary>

@@ -13334,7 +13332,7 @@
             </para>
 
 <programlisting>
-mysqlmanager > im.log
+mysqlmanager &gt; im.log
 </programlisting>
           </listitem>
 

@@ -14485,7 +14483,7 @@
       <refentry id="comp-err">
 
         <indexterm>
-          <primary><command>comp_err</command></primary>
+          <primary>&lt;command&gt;comp_err&lt;/command&gt;</primary>
         </indexterm>
 
         <refmeta>

@@ -15741,7 +15739,7 @@
       <refentry id="mysql-upgrade">
 
         <indexterm>
-          <primary><command>mysql_upgrade</command></primary>
+          <primary>&lt;command&gt;mysql_upgrade&lt;/command&gt;</primary>
         </indexterm>
 
         <indexterm>

@@ -16625,7 +16623,7 @@
           </para>
 
           <indexterm>
-            <primary><filename>/etc/passwd</filename></primary>
+            <primary>&lt;filename&gt;/etc/passwd&lt;/filename&gt;</primary>
           </indexterm>
 
           <para>

@@ -17154,7 +17152,7 @@
           Monitor whenever a server is started with the
           <option>--local-infile</option> option enabled. For more
           information see
-          <ulink url="&base-url-enterprise;advisors.html" />.
+          <ulink url="&base-url-enterprise;advisors.html"/>.
         </para>
 
       </formalpara>

@@ -17167,11 +17165,11 @@
 
       <indexterm>
         <primary>starting</primary>
-        <secondary><command>mysqld</command></secondary>
+        <secondary>&lt;command&gt;mysqld&lt;/command&gt;</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><command>mysqld</command></primary>
+        <primary>&lt;command&gt;mysqld&lt;/command&gt;</primary>
         <secondary>starting</secondary>
       </indexterm>
 

@@ -18801,30 +18799,30 @@
         <listitem>
           <para>
             <indexterm>
-              <primary><literal>MYSQL_HOST</literal> environment variable</primary>
+              <primary>MYSQL_HOST environment variable</primary>
             </indexterm>
 
             <indexterm>
               <primary>environment variable</primary>
-              <secondary><literal>MYSQL_HOST</literal></secondary>
+              <secondary>MYSQL_HOST</secondary>
             </indexterm>
 
             <indexterm>
-              <primary><literal>MYSQL_PWD</literal> environment variable</primary>
+              <primary>MYSQL_PWD environment variable</primary>
             </indexterm>
 
             <indexterm>
               <primary>environment variable</primary>
-              <secondary><literal>MYSQL_PWD</literal></secondary>
+              <secondary>MYSQL_PWD</secondary>
             </indexterm>
 
             <indexterm>
-              <primary><literal>USER</literal> environment variable</primary>
+              <primary>USER environment variable</primary>
             </indexterm>
 
             <indexterm>
               <primary>environment variable</primary>
-              <secondary><literal>USER</literal></secondary>
+              <secondary>USER</secondary>
             </indexterm>
 
             You can specify some connection parameters using environment

@@ -18924,7 +18922,7 @@
           <para>
             <indexterm>
               <primary>wildcards</primary>
-              <secondary>in <literal>mysql.user</literal> table</secondary>
+              <secondary>in mysql.user table</secondary>
             </indexterm>
 
             You can use the wildcard characters

@@ -18958,7 +18956,7 @@
           <para>
             <indexterm>
               <primary>netmask notation</primary>
-              <secondary>in <literal>mysql.user</literal> table</secondary>
+              <secondary>in mysql.user table</secondary>
             </indexterm>
 
             For <literal>Host</literal> values specified as IP numbers,

@@ -19287,7 +19285,7 @@
       </indexterm>
 
       <indexterm>
-        <primary><literal>user</literal> table</primary>
+        <primary>user table</primary>
         <secondary>sorting</secondary>
       </indexterm>
 

@@ -19433,12 +19431,12 @@
 
       <indexterm>
         <primary>wildcards</primary>
-        <secondary>in <literal>mysql.db</literal> table</secondary>
+        <secondary>in mysql.db table</secondary>
       </indexterm>
 
       <indexterm>
         <primary>wildcards</primary>
-        <secondary>in <literal>mysql.host</literal> table</secondary>
+        <secondary>in mysql.host table</secondary>
       </indexterm>
 
       <para>

@@ -19513,12 +19511,12 @@
       </indexterm>
 
       <indexterm>
-        <primary><literal>db</literal> table</primary>
+        <primary>db table</primary>
         <secondary>sorting</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>host</literal> table</primary>
+        <primary>host table</primary>
         <secondary>sorting</secondary>
       </indexterm>
 

@@ -19539,17 +19537,17 @@
 
       <indexterm>
         <primary>wildcards</primary>
-        <secondary>in <literal>mysql.tables_priv</literal> table</secondary>
+        <secondary>in mysql.tables_priv table</secondary>
       </indexterm>
 
       <indexterm>
         <primary>wildcards</primary>
-        <secondary>in <literal>mysql.columns_priv</literal> table</secondary>
+        <secondary>in mysql.columns_priv table</secondary>
       </indexterm>
 
       <indexterm>
         <primary>wildcards</primary>
-        <secondary>in <literal>mysql.procs_priv</literal> table</secondary>
+        <secondary>in mysql.procs_priv table</secondary>
       </indexterm>
 
       <para>

@@ -19725,12 +19723,12 @@
       </para>
 
       <indexterm>
-        <primary><literal>host</literal> table</primary>
+        <primary>host table</primary>
       </indexterm>
 
       <indexterm>
         <primary>tables</primary>
-        <secondary><literal>host</literal></secondary>
+        <secondary>host</secondary>
       </indexterm>
 
       <para>

@@ -22860,7 +22858,7 @@
         </para>
 
 <programlisting>
-mysql> <userinput>SHOW STATUS LIKE 'Ssl_cipher';</userinput>
+mysql&gt; <userinput>SHOW STATUS LIKE 'Ssl_cipher';</userinput>
 +---------------+--------------------+
 | Variable_name | Value              |
 +---------------+--------------------+

@@ -25206,11 +25204,11 @@
 
         <indexterm>
           <primary>examples</primary>
-          <secondary><command>myisamchk</command> output</secondary>
+          <secondary>&lt;command&gt;myisamchk&lt;/command&gt; output</secondary>
         </indexterm>
 
         <indexterm>
-          <primary><command>myisamchk</command></primary>
+          <primary>&lt;command&gt;myisamchk&lt;/command&gt;</primary>
           <secondary>example output</secondary>
         </indexterm>
 

@@ -27738,7 +27736,7 @@
           The binary log can also be used to track significant DDL
           events. Analyzing the binary log in this way is an integral
           part of the MySQL Enterprise Monitor. For more information see
-          <ulink url="&base-url-enterprise;advisors.html" />.
+          <ulink url="&base-url-enterprise;advisors.html"/>.
         </para>
 
       </formalpara>

@@ -27754,14 +27752,15 @@
         When started with the
         <option>--log-bin[=<replaceable>base_name</replaceable>]</option>
         option, <command>mysqld</command> writes a log file containing
-        all SQL statements that update data (both DDL and DML statements).
-        If no <replaceable>base_name</replaceable> value is given, the
-        default name is the value of the <literal>pid-file</literal>
-        option (which by default is the name of host machine) followed
-        by <literal>-bin</literal>. If the basename is given, but not as
-        an absolute pathname, the server writes the file in the data
-        directory. It is recommended that you specify a basename; see
-        <xref linkend="open-bugs"/>, for the reason.
+        all SQL statements that update data (both DDL and DML
+        statements). If no <replaceable>base_name</replaceable> value is
+        given, the default name is the value of the
+        <literal>pid-file</literal> option (which by default is the name
+        of host machine) followed by <literal>-bin</literal>. If the
+        basename is given, but not as an absolute pathname, the server
+        writes the file in the data directory. It is recommended that
+        you specify a basename; see <xref linkend="open-bugs"/>, for the
+        reason.
       </para>
 
       <para>

@@ -28247,8 +28246,7 @@
 
         <listitem>
           <para>
-            <link
-              linkend="option_mysqld_sql_mode"><literal>SQL_MODE</literal></link>
+            <link linkend="option_mysqld_sql_mode"><literal>SQL_MODE</literal></link>
           </para>
         </listitem>
 

@@ -28266,29 +28264,25 @@
 
         <listitem>
           <para>
-            <link
-              linkend="option_mysqld_character_set_client"><literal>CHARACTER_SET_CLIENT</literal></link>
+            <link linkend="option_mysqld_character_set_client"><literal>CHARACTER_SET_CLIENT</literal></link>
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <link
-              linkend="option_mysqld_collation_connection"><literal>COLLATION_CONNECTION</literal></link>
+            <link linkend="option_mysqld_collation_connection"><literal>COLLATION_CONNECTION</literal></link>
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <link
-              linkend="option_mysqld_collation_database"><literal>COLLATION_DATABASE</literal></link>
+            <link linkend="option_mysqld_collation_database"><literal>COLLATION_DATABASE</literal></link>
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <link
-              linkend="option_mysqld_collation_server"><literal>COLLATION_SERVER</literal></link>
+            <link linkend="option_mysqld_collation_server"><literal>COLLATION_SERVER</literal></link>
           </para>
         </listitem>
 

@@ -28367,7 +28361,7 @@
           optimized indexes. Using an advisor specifically designed for
           the task, the MySQL Enterprise Monitor can identify such
           problems and offer advice on resolution. For more information
-          see <ulink url="&base-url-enterprise;advisors.html" />.
+          see <ulink url="&base-url-enterprise;advisors.html"/>.
         </para>
 
       </formalpara>

@@ -29267,21 +29261,21 @@
       </para>
 
       <indexterm>
-        <primary><literal>MYSQL_UNIX_PORT</literal> environment variable</primary>
+        <primary>MYSQL_UNIX_PORT environment variable</primary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>MYSQL_TCP_PORT</literal> environment variable</primary>
+        <primary>MYSQL_TCP_PORT environment variable</primary>
       </indexterm>
 
       <indexterm>
         <primary>environment variable</primary>
-        <secondary><literal>MYSQL_UNIX_PORT</literal></secondary>
+        <secondary>MYSQL_UNIX_PORT</secondary>
       </indexterm>
 
       <indexterm>
         <primary>environment variable</primary>
-        <secondary><literal>MYSQL_TCP_PORT</literal></secondary>
+        <secondary>MYSQL_TCP_PORT</secondary>
       </indexterm>
 
 <programlisting>

@@ -29471,7 +29465,7 @@
           Subscribers to MySQL Enterprise will find additional
           information on running multiple MySQL servers on one machine
           in the MySQL Enterprise Knowledge Base article found at
-          <ulink url="https://kb.mysql.com/view.php?id=4926" />.
+          <ulink url="https://kb.mysql.com/view.php?id=4926"/>.
         </para>
 
       </formalpara>


Modified: trunk/refman-5.0/errmsgs-client.xml
===================================================================
--- trunk/refman-5.0/errmsgs-client.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/errmsgs-client.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 723 bytes

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE itemizedlist PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<!DOCTYPE itemizedlist PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <!-- START_OF_CLIENT_ERROR_INFO -->
 <!-- DO NOT EDIT THIS FILE. It is generated automatically. -->
 <!-- To regenerate, use ../tools/make-errmsgs-client.pl -->


Modified: trunk/refman-5.0/errmsgs-server.xml
===================================================================
--- trunk/refman-5.0/errmsgs-server.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/errmsgs-server.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 4; 990 bytes

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE itemizedlist PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<!DOCTYPE itemizedlist PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <!-- START_OF_SERVER_ERROR_INFO -->
 <!-- DO NOT EDIT THIS FILE. It is generated automatically. -->
 <!-- To regenerate, use ../tools/make-errmsgs-server.pl -->

@@ -4843,8 +4842,8 @@
     </para>
 
     <para>
-      Message: For float(M,D), double(M,D) or decimal(M,D), M must be >=
-      D (column '%s').
+      Message: For float(M,D), double(M,D) or decimal(M,D), M must be
+      &gt;= D (column '%s').
     </para>
   </listitem>
 


Modified: trunk/refman-5.0/errors-problems.xml
===================================================================
--- trunk/refman-5.0/errors-problems.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/errors-problems.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 13, Lines Added: 23, Lines Deleted: 25; 4810 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <appendix id="error-handling">
 
   <title>Errors, Error Codes, and Common Problems</title>

@@ -23,7 +21,7 @@
     list displays client program messages.
   </para>
 
-  <formalpara role ="mnmas">
+  <formalpara role="mnmas">
 
     <title>MySQL Enterprise</title>
 

@@ -990,7 +988,7 @@
             on dynamically configuring the
             <literal>max_connections</literal> variable &mdash; avoiding
             failed connection attempts. For more information, see
-            <ulink url="&base-url-enterprise;advisors.html" />.
+            <ulink url="&base-url-enterprise;advisors.html"/>.
           </para>
 
         </formalpara>

@@ -2702,7 +2700,7 @@
           <literal>root</literal> password is as follows:
         </para>
 
-        <formalpara role ="mnmas">
+        <formalpara role="mnmas">
 
           <title>MySQL Enterprise</title>
 

@@ -3301,7 +3299,7 @@
           TABLE</literal>, the old table is left unchanged.
         </para>
 
-        <formalpara role ="mnmas">
+        <formalpara role="mnmas">
 
           <title>MySQL Enterprise</title>
 

@@ -3421,13 +3419,13 @@
         <title>How to Protect or Change the MySQL Unix Socket File</title>
 
         <indexterm>
-          <primary><literal>mysql.sock</literal></primary>
+          <primary>mysql.sock</primary>
           <secondary>protection</secondary>
         </indexterm>
 
         <indexterm>
           <primary>deletion</primary>
-          <secondary><literal>mysql.sock</literal></secondary>
+          <secondary>mysql.sock</secondary>
         </indexterm>
 
         <para>

@@ -3670,7 +3668,7 @@
 
         <indexterm>
           <primary>problems</primary>
-          <secondary><literal>DATE</literal> columns</secondary>
+          <secondary>DATE columns</secondary>
         </indexterm>
 
         <para>

@@ -3860,7 +3858,7 @@
         <title>Problems with <literal>NULL</literal> Values</title>
 
         <indexterm>
-          <primary><literal>NULL</literal> values</primary>
+          <primary>NULL values</primary>
           <secondary>vs. empty values</secondary>
         </indexterm>
 

@@ -3994,23 +3992,23 @@
 </programlisting>
 
         <indexterm>
-          <primary><literal>TIMESTAMP</literal></primary>
-          <secondary>and <literal>NULL</literal> values</secondary>
+          <primary>TIMESTAMP</primary>
+          <secondary>and NULL values</secondary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>AUTO_INCREMENT</literal></primary>
-          <secondary>and <literal>NULL</literal> values</secondary>
+          <primary>AUTO_INCREMENT</primary>
+          <secondary>and NULL values</secondary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>NULL</literal> values</primary>
-          <secondary>and <literal>TIMESTAMP</literal> columns</secondary>
+          <primary>NULL values</primary>
+          <secondary>and TIMESTAMP columns</secondary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>NULL</literal> values</primary>
-          <secondary>and <literal>AUTO_INCREMENT</literal> columns</secondary>
+          <primary>NULL values</primary>
+          <secondary>and AUTO_INCREMENT columns</secondary>
         </indexterm>
 
         <para>

@@ -4149,7 +4147,7 @@
           <xref linkend="show-variables"/>.
         </para>
 
-        <formalpara role ="mnmas">
+        <formalpara role="mnmas">
 
           <title>MySQL Enterprise</title>
 

@@ -4594,7 +4592,7 @@
 
       </itemizedlist>
 
-      <formalpara role ="mnmas">
+      <formalpara role="mnmas">
 
         <title>MySQL Enterprise</title>
 

@@ -5568,7 +5566,7 @@
       Include list of server error messages:
     </remark>
 
-    <xi:include href="errmsgs-server.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="errmsgs-server.xml"/>
 
   </section>
 

@@ -5611,7 +5609,7 @@
       Include list of client error messages:
     </remark>
 
-    <xi:include href="errmsgs-client.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="errmsgs-client.xml"/>
 
   </section>
 


Modified: trunk/refman-5.0/extending-mysql.xml
===================================================================
--- trunk/refman-5.0/extending-mysql.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/extending-mysql.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 5, Lines Added: 9, Lines Deleted: 12; 2175 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="extending-mysql">
 
   <title>Extending MySQL</title>

@@ -141,7 +139,7 @@
         <para>
           For expert advice on thread management subscribe to the MySQL
           Enterprise Monitor. For more information see,
-          <ulink url="&base-url-enterprise;advisors.html" />.
+          <ulink url="&base-url-enterprise;advisors.html"/>.
         </para>
 
       </formalpara>

@@ -2516,13 +2514,13 @@
     </para>
 
     <indexterm>
-      <primary><command>icc</command></primary>
-      <secondary>and MySQL Cluster support></secondary>
+      <primary>&lt;command&gt;icc&lt;/command&gt;</primary>
+      <secondary>and MySQL Cluster support&amp;gt;</secondary>
     </indexterm>
 
     <indexterm>
       <primary>MySQL Cluster</primary>
-      <secondary>compiling with <command>icc</command></secondary>
+      <secondary>compiling with &lt;command&gt;icc&lt;/command&gt;</secondary>
     </indexterm>
 
     <important>

@@ -2730,8 +2728,7 @@
           In the Windows MySQL distribution,
           <literal>mysqld.exe</literal> is by default compiled with
           support for trace files. See also
-          <xref
-            linkend="making-trace-files"/>.
+          <xref linkend="making-trace-files"/>.
         </para>
 
       </section>

@@ -3066,7 +3063,7 @@
 </programlisting>
 
         <indexterm>
-          <primary>DBI-&gt;trace</primary>
+          <primary>DBI-&amp;gt;trace</primary>
         </indexterm>
 
         <indexterm>


Modified: trunk/refman-5.0/faqs.xml
===================================================================
--- trunk/refman-5.0/faqs.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/faqs.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 29, Lines Added: 40, Lines Deleted: 63; 11294 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <appendix id="faqs">
 
   <title>MySQL &current-series; Frequently Asked Questions</title>

@@ -663,9 +661,7 @@
 
           <para>
             Yes. See
-            <ulink
-              url="http://forums.mysql.com/list.php?98"
-              >http://forums.mysql.com/list.php?98</ulink>.
+            <ulink url="http://forums.mysql.com/list.php?98">http://forums.mysql.com/list.php?98</ulink>.
           </para>
 
         </answer>

@@ -720,8 +716,7 @@
             about existing stored procedures using the
             <literal>ROUTINES</literal> table in the
             <literal>INFORMATION_SCHEMA</literal> database (see
-            <xref
-              linkend="routines-table"/>).
+            <xref linkend="routines-table"/>).
           </para>
 
         </answer>

@@ -754,9 +749,7 @@
 </programlisting>
 
           <para>
-            For more information, see
-            <xref
-              linkend="routines-table"/>.
+            For more information, see <xref linkend="routines-table"/>.
           </para>
 
           <para>

@@ -764,9 +757,8 @@
             <literal>SHOW CREATE FUNCTION</literal> (for a stored
             function) or <literal>SHOW CREATE PROCEDURE</literal> (for a
             stored procedure). See
-            <xref linkend="show-create-procedure"
-            />, for
-            more information.
+            <xref linkend="show-create-procedure"/>, for more
+            information.
           </para>
 
         </answer>

@@ -793,9 +785,8 @@
             FUNCTION</literal> to obtain information about stored
             functions, and <literal>SHOW CREATE PROCEDURE</literal> to
             obtain information about stored procedures. See
-            <xref
-              linkend="show-create-procedure"/>, for
-            more information about these statements.
+            <xref linkend="show-create-procedure"/>, for more
+            information about these statements.
           </para>
 
           <para>

@@ -931,9 +922,7 @@
           <para>
             MySQL implements <literal>HANDLER</literal> definitions
             according to the SQL standard. See
-            <xref
-              linkend="declare-handlers"/>, for
-            details.
+            <xref linkend="declare-handlers"/>, for details.
           </para>
 
         </answer>

@@ -1475,11 +1464,9 @@
             In MySQL &current-series;, triggers can be created using the
             <literal>CREATE TRIGGER</literal> statement, and dropped
             using <literal>DROP TRIGGER</literal>. See
-            <xref
-              linkend="create-trigger"/>, and
-            <xref
-              linkend="drop-trigger"/>, for more about
-            these statements.
+            <xref linkend="create-trigger"/>, and
+            <xref linkend="drop-trigger"/>, for more about these
+            statements.
           </para>
 
           <para>

@@ -1519,15 +1506,13 @@
 
           <para>
             For more information about this table, see
-            <xref
-              linkend="triggers-table"/>.
+            <xref linkend="triggers-table"/>.
           </para>
 
           <para>
             You can also use the <literal>SHOW TRIGGERS</literal>
             statement, which is specific to MySQL. See
-            <xref
-              linkend="show-triggers"/>.
+            <xref linkend="show-triggers"/>.
           </para>
 
         </answer>

@@ -1644,8 +1629,7 @@
           <para>
             Yes. A table on a remote server could be updated using the
             <literal>FEDERATED</literal> storage engine. (See
-            <xref
-              linkend="federated-storage-engine"/>).
+            <xref linkend="federated-storage-engine"/>).
           </para>
 
         </answer>

@@ -1792,9 +1776,7 @@
 
           <para>
             Yes. See
-            <ulink
-              url="http://forums.mysql.com/list.php?100"
-              >http://forums.mysql.com/list.php?100</ulink>
+            <ulink url="http://forums.mysql.com/list.php?100">http://forums.mysql.com/list.php?100</ulink>
           </para>
 
         </answer>

@@ -1819,8 +1801,7 @@
             alter a table or view to which the definition refers. To
             check a view definition for problems of this kind, use the
             <literal>CHECK TABLE</literal> statement. (See
-            <xref
-              linkend="check-table"/>.)
+            <xref linkend="check-table"/>.)
           </para>
 
         </answer>

@@ -1940,8 +1921,7 @@
 
           <para>
             See
-            <ulink url="http://forums.mysql.com/list.php?101"
-              >http://forums.mysql.com/list.php?101</ulink>.
+            <ulink url="http://forums.mysql.com/list.php?101">http://forums.mysql.com/list.php?101</ulink>.
           </para>
 
         </answer>

@@ -3122,7 +3102,7 @@
     </indexterm>
 
     <indexterm>
-      <primary><literal>NDB</literal> storage engine</primary>
+      <primary>NDB storage engine</primary>
       <secondary>FAQ</secondary>
     </indexterm>
 

@@ -3154,7 +3134,7 @@
         <question>
 
           <indexterm>
-            <primary><literal>NDB</literal></primary>
+            <primary>NDB</primary>
           </indexterm>
 
           <para>

@@ -3184,7 +3164,7 @@
 
           <indexterm>
             <primary>MySQL Cluster</primary>
-            <secondary><foreignphrase>vs</foreignphrase> replication</secondary>
+            <secondary>&lt;foreignphrase&gt;vs&lt;/foreignphrase&gt; replication</secondary>
           </indexterm>
 
           <para>

@@ -3594,11 +3574,11 @@
 
           <indexterm>
             <primary>MySQL Cluster</primary>
-            <secondary><filename>ndb_size.pl</filename> (utility)</secondary>
+            <secondary>&lt;filename&gt;ndb_size.pl&lt;/filename&gt; (utility)</secondary>
           </indexterm>
 
           <indexterm>
-            <primary><literal>ndb_size.pl</literal> (utility)</primary>
+            <primary>ndb_size.pl (utility)</primary>
           </indexterm>
 
           <para>

@@ -3727,13 +3707,13 @@
         <question>
 
           <indexterm>
-            <primary><errortext>Table is full</errortext> error</primary>
+            <primary>&lt;errortext&gt;Table is full&lt;/errortext&gt; error</primary>
             <secondary>MySQL Cluster</secondary>
           </indexterm>
 
           <indexterm>
             <primary>MySQL Cluster</primary>
-            <secondary><errortext>Table is full</errortext> error</secondary>
+            <secondary>&lt;errortext&gt;Table is full&lt;/errortext&gt; error</secondary>
           </indexterm>
 
           <para>

@@ -3923,12 +3903,12 @@
 
             <listitem>
               <indexterm>
-                <primary><literal>SHOW ERRORS</literal></primary>
+                <primary>SHOW ERRORS</primary>
                 <secondary>and MySQL Cluster</secondary>
               </indexterm>
 
               <indexterm>
-                <primary><literal>SHOW WARNINGS</literal></primary>
+                <primary>SHOW WARNINGS</primary>
                 <secondary>and MySQL Cluster</secondary>
               </indexterm>
 

@@ -3943,8 +3923,8 @@
 
             <listitem>
               <indexterm>
-                <primary><command>perror</command></primary>
-                <secondary><option>--ndb</option> option</secondary>
+                <primary>&lt;command&gt;perror&lt;/command&gt;</primary>
+                <secondary>&lt;option&gt;--ndb&lt;/option&gt; option</secondary>
               </indexterm>
 
               <para>

@@ -4995,7 +4975,7 @@
                 output should resemble what is shown here:
 
 <programlisting>
-mysql> <userinput>SHOW VARIABLES LIKE 'char%';</userinput>
+mysql&gt; <userinput>SHOW VARIABLES LIKE 'char%';</userinput>
 +--------------------------+----------------------------------------+
 | Variable_name            | Value                                  |
 +--------------------------+----------------------------------------+

@@ -5767,7 +5747,7 @@
             Ah, there's a warning. Let's see what it is.
 
 <programlisting>
-mysql> <userinput>SHOW WARNINGS;</userinput>
+mysql&gt; <userinput>SHOW WARNINGS;</userinput>
 +---------+------+---------------------------------------------+
 | Level   | Code | Message                                     |
 +---------+------+---------------------------------------------+

@@ -5889,7 +5869,7 @@
                &amp; "pwd=<replaceable>password</replaceable>;database=<replaceable>database</replaceable>;stmt=SET NAMES 'big5';"
 Set Conn = Server.CreateObject("ADODB.Connection") 
 Conn.Open strConnection
-%> 
+%&gt; 
 </programlisting>
 
             In much the same way, if you are using any character set

@@ -5947,7 +5927,7 @@
             agent interprets page content as <literal>UTF-8</literal>,
             you should include <literal>&lt;meta
             http-equiv="Content-Type" content="text/html;
-            charset=utf-8"></literal> in the
+            charset=utf-8"&gt;</literal> in the
             <literal>&lt;head&gt;</literal> of the HTML page.
           </para>
 

@@ -6429,7 +6409,7 @@
             version of the characters:
 
 <programlisting>
-mysql> <userinput>SELECT s1, HEX(CONVERT(s1 USING ucs2)) FROM tj;</userinput>
+mysql&gt; <userinput>SELECT s1, HEX(CONVERT(s1 USING ucs2)) FROM tj;</userinput>
 +------+-----------------------------+
 | s1   | HEX(CONVERT(s1 USING ucs2)) |
 +------+-----------------------------+

@@ -6952,7 +6932,7 @@
           <question>
 
             <indexterm>
-              <primary><literal>DRBD</literal></primary>
+              <primary>DRBD</primary>
             </indexterm>
 
             <para>

@@ -7011,7 +6991,7 @@
           <question>
 
             <indexterm>
-              <primary><literal>DRBD licence</literal></primary>
+              <primary>DRBD licence</primary>
             </indexterm>
 
             <para>

@@ -7430,9 +7410,7 @@
               <title>Active-Master MySQL server</title>
               <mediaobject>
                 <imageobject>
-                  <imagedata
-                    fileref="../refman-common/images/active-master-mysql-server.png"
-                    format="JPG" lang="en"/>
+                  <imagedata fileref="../refman-common/images/active-master-mysql-server.png" format="JPG" lang="en"/>
                 </imageobject>
                 <textobject>
                   <phrase lang="en">Active-Master MySQL server</phrase>

@@ -8069,8 +8047,7 @@
             <para>
               For more information about MySQL for DRBD, including a
               technical white paper please see:
-              <ulink
-      url="http://www.mysql.com/products/enterprise/drbd.html">DRBD
+              <ulink url="http://www.mysql.com/products/enterprise/drbd.html">DRBD
               for MySQL High Availability</ulink>.
             </para>
 


Modified: trunk/refman-5.0/functions-core.xml
===================================================================
--- trunk/refman-5.0/functions-core.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/functions-core.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 19, Lines Added: 32, Lines Deleted: 35; 7597 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="functions">
 
   <title>Functions and Operators</title>

@@ -20,8 +18,7 @@
   </remark>
 
   <indexterm>
-    <primary>functions for <literal>SELECT</literal> and <literal>WHERE</literal>
-      clauses</primary>
+    <primary>functions for SELECT and WHERE clauses</primary>
   </indexterm>
 
   <indexterm>

@@ -516,12 +513,12 @@
 
           <para id="operator_equal-to">
             <indexterm>
-              <primary><literal>NULL</literal></primary>
+              <primary>NULL</primary>
               <secondary>testing for null</secondary>
             </indexterm>
 
             <indexterm>
-              <primary>&lt;=&gt; (equal to)</primary>
+              <primary>&amp;lt;=&amp;gt; (equal to)</primary>
             </indexterm>
 
             <literal>&lt;=&gt;</literal>

@@ -564,11 +561,11 @@
 
           <para id="operator_not-equal">
             <indexterm>
-              <primary>&lt;&gt; (not equal)</primary>
+              <primary>&amp;lt;&amp;gt; (not equal)</primary>
             </indexterm>
 
             <indexterm>
-              <primary>not equal (&lt;&gt;)</primary>
+              <primary>not equal (&amp;lt;&amp;gt;)</primary>
             </indexterm>
 
             <indexterm>

@@ -611,11 +608,11 @@
 
           <para id="operator_less-than-or-equal">
             <indexterm>
-              <primary>&lt;= (less than or equal)</primary>
+              <primary>&amp;lt;= (less than or equal)</primary>
             </indexterm>
 
             <indexterm>
-              <primary>less than or equal (&lt;=)</primary>
+              <primary>less than or equal (&amp;lt;=)</primary>
             </indexterm>
 
             <literal>&lt;=</literal>

@@ -646,11 +643,11 @@
 
           <para id="operator_less-than">
             <indexterm>
-              <primary>&lt; (less than)</primary>
+              <primary>&amp;lt; (less than)</primary>
             </indexterm>
 
             <indexterm>
-              <primary>less than (&lt;)</primary>
+              <primary>less than (&amp;lt;)</primary>
             </indexterm>
 
             <literal>&lt;</literal>

@@ -681,11 +678,11 @@
 
           <para id="operator_greater-than-or-equal">
             <indexterm>
-              <primary>&gt;= (greater than or equal)</primary>
+              <primary>&amp;gt;= (greater than or equal)</primary>
             </indexterm>
 
             <indexterm>
-              <primary>greater than or equal (&gt;=)</primary>
+              <primary>greater than or equal (&amp;gt;=)</primary>
             </indexterm>
 
             <literal>&gt;=</literal>

@@ -716,11 +713,11 @@
 
           <para id="operator_greater-than">
             <indexterm>
-              <primary>&gt; (greater than)</primary>
+              <primary>&amp;gt; (greater than)</primary>
             </indexterm>
 
             <indexterm>
-              <primary>greater than (&gt;)</primary>
+              <primary>greater than (&amp;gt;)</primary>
             </indexterm>
 
             <literal>&gt;</literal>

@@ -751,17 +748,17 @@
 
           <para id="operator_is">
             <indexterm>
-              <primary><literal>TRUE</literal></primary>
+              <primary>TRUE</primary>
               <secondary>testing for</secondary>
             </indexterm>
 
             <indexterm>
-              <primary><literal>FALSE</literal></primary>
+              <primary>FALSE</primary>
               <secondary>testing for</secondary>
             </indexterm>
 
             <indexterm>
-              <primary><literal>UNKNOWN</literal></primary>
+              <primary>UNKNOWN</primary>
               <secondary>testing for</secondary>
             </indexterm>
 

@@ -819,7 +816,7 @@
 
           <para id="operator_is-null">
             <indexterm>
-              <primary><literal>NULL</literal></primary>
+              <primary>NULL</primary>
               <secondary>testing for null</secondary>
             </indexterm>
 

@@ -1017,7 +1014,7 @@
 
           <para id="function_coalesce">
             <indexterm>
-              <primary><literal>NULL</literal></primary>
+              <primary>NULL</primary>
               <secondary>testing for null</secondary>
             </indexterm>
 

@@ -1529,7 +1526,7 @@
             </indexterm>
 
             <indexterm>
-              <primary>&amp;&amp; (logical AND)</primary>
+              <primary>&amp;amp;&amp;amp; (logical AND)</primary>
             </indexterm>
 
             <literal>AND</literal>, <literal>&amp;&amp;</literal>

@@ -1910,7 +1907,7 @@
 
         <para id="function_ifnull">
           <indexterm>
-            <primary><literal>NULL</literal></primary>
+            <primary>NULL</primary>
             <secondary>testing for null</secondary>
           </indexterm>
 

@@ -12911,7 +12908,7 @@
 
           <para id="operator_bitwise-and">
             <indexterm>
-              <primary>&amp; (bitwise AND)</primary>
+              <primary>&amp;amp; (bitwise AND)</primary>
             </indexterm>
 
             <indexterm>

@@ -12995,7 +12992,7 @@
 
           <para id="operator_left-shift">
             <indexterm>
-              <primary>&lt;&lt; (left shift)</primary>
+              <primary>&amp;lt;&amp;lt; (left shift)</primary>
             </indexterm>
 
             <literal>&lt;&lt;</literal>

@@ -13031,7 +13028,7 @@
 
           <para id="operator_right-shift">
             <indexterm>
-              <primary>&gt;&gt; (right shift)</primary>
+              <primary>&amp;gt;&amp;gt; (right shift)</primary>
             </indexterm>
 
             <literal>&gt;&gt;</literal>

@@ -14575,7 +14572,7 @@
 
           <para id="function_last-insert-id">
             <indexterm>
-              <primary>LAST_INSERT_ID([<replaceable>expr</replaceable>])</primary>
+              <primary>LAST_INSERT_ID([&lt;replaceable&gt;expr&lt;/replaceable&gt;])</primary>
             </indexterm>
 
             <literal>LAST_INSERT_ID()</literal>,

@@ -16828,18 +16825,18 @@
         Fields</title>
 
       <indexterm>
-        <primary><literal>GROUP BY</literal></primary>
+        <primary>GROUP BY</primary>
         <secondary>extensions to standard SQL</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>ONLY_FULL_GROUP_BY</literal></primary>
+        <primary>ONLY_FULL_GROUP_BY</primary>
         <secondary>SQL mode</secondary>
       </indexterm>
 
       <indexterm>
         <primary>SQL mode</primary>
-        <secondary><literal>ONLY_FULL_GROUP_BY</literal></secondary>
+        <secondary>ONLY_FULL_GROUP_BY</secondary>
       </indexterm>
 
       <para>

@@ -16919,13 +16916,13 @@
       </para>
 
       <indexterm>
-        <primary><literal>GROUP BY</literal></primary>
+        <primary>GROUP BY</primary>
         <secondary>aliases in</secondary>
       </indexterm>
 
       <indexterm>
         <primary>aliases</primary>
-        <secondary>in <literal>GROUP BY</literal> clauses</secondary>
+        <secondary>in GROUP BY clauses</secondary>
       </indexterm>
 
       <indexterm>


Modified: trunk/refman-5.0/ha.xml
===================================================================
--- trunk/refman-5.0/ha.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/ha.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 3, Lines Added: 5, Lines Deleted: 8; 1279 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="ha-overview">
 
   <title>High Availability, Scalability, and DRBD</title>

@@ -152,8 +150,7 @@
 
       <para>
         For information on setting up and configuring replication, see
-        <xref
-  linkend="replication"/>.
+        <xref linkend="replication"/>.
       </para>
     </listitem>
 

@@ -447,6 +444,6 @@
     </tgroup>
   </informaltable>
 
-  <xi:include href="../refman-common/replication-drbd.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../refman-common/replication-drbd.xml"/>
 
 </chapter>


Modified: trunk/refman-5.0/information-schema.xml
===================================================================
--- trunk/refman-5.0/information-schema.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/information-schema.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 3, Lines Added: 24, Lines Deleted: 26; 4891 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="information-schema">
 
   <title><literal>INFORMATION_SCHEMA</literal> Tables</title>

@@ -2889,12 +2887,12 @@
           <row>
             <entry><literal>DEFINER</literal></entry>
             <entry/>
-            <entry></entry>
+            <entry/>
           </row>
           <row>
             <entry><literal>SECURITY_TYPE</literal></entry>
             <entry/>
-            <entry></entry>
+            <entry/>
           </row>
 <!--
          <row>

@@ -3327,92 +3325,92 @@
           <row>
             <entry><literal>QUERY_ID</literal></entry>
             <entry><literal>Query_ID</literal></entry>
-            <entry></entry>
+            <entry/>
           </row>
           <row>
             <entry><literal>SEQ</literal></entry>
-            <entry><literal></literal></entry>
-            <entry></entry>
+            <entry><literal/></entry>
+            <entry/>
           </row>
           <row>
             <entry><literal>STATE</literal></entry>
             <entry><literal>Status</literal></entry>
-            <entry></entry>
+            <entry/>
           </row>
           <row>
             <entry><literal>DURATION</literal></entry>
             <entry><literal>Duration</literal></entry>
-            <entry></entry>
+            <entry/>
           </row>
           <row>
             <entry><literal>CPU_USER</literal></entry>
             <entry><literal>CPU_user</literal></entry>
-            <entry></entry>
+            <entry/>
           </row>
           <row>
             <entry><literal>CPU_SYSTEM</literal></entry>
             <entry><literal>CPU_system</literal></entry>
-            <entry></entry>
+            <entry/>
           </row>
           <row>
             <entry><literal>CONTEXT_VOLUNTARY</literal></entry>
             <entry><literal>Context_voluntary</literal></entry>
-            <entry></entry>
+            <entry/>
           </row>
           <row>
             <entry><literal>CONTEXT_INVOLUNTARY</literal></entry>
             <entry><literal>Context_involuntary</literal></entry>
-            <entry></entry>
+            <entry/>
           </row>
           <row>
             <entry><literal>BLOCK_OPS_IN</literal></entry>
             <entry><literal>Block_ops_in</literal></entry>
-            <entry></entry>
+            <entry/>
           </row>
           <row>
             <entry><literal>BLOCK_OPS_OUT</literal></entry>
             <entry><literal>Block_ops_out</literal></entry>
-            <entry></entry>
+            <entry/>
           </row>
           <row>
             <entry><literal>MESSAGES_SENT</literal></entry>
             <entry><literal>Messages_sent</literal></entry>
-            <entry></entry>
+            <entry/>
           </row>
           <row>
             <entry><literal>MESSAGES_RECEIVED</literal></entry>
             <entry><literal>Messages_received</literal></entry>
-            <entry></entry>
+            <entry/>
           </row>
           <row>
             <entry><literal>PAGE_FAULTS_MAJOR</literal></entry>
             <entry><literal>Page_faults_major</literal></entry>
-            <entry></entry>
+            <entry/>
           </row>
           <row>
             <entry><literal>PAGE_FAULTS_MINOR</literal></entry>
             <entry><literal>Page_faults_minor</literal></entry>
-            <entry></entry>
+            <entry/>
           </row>
           <row>
             <entry><literal>SWAPS</literal></entry>
             <entry><literal>Swaps</literal></entry>
-            <entry></entry>
+            <entry/>
           </row>
           <row>
             <entry><literal>SOURCE_FUNCTION</literal></entry>
             <entry><literal>Source_function</literal></entry>
-            <entry></entry>
+            <entry/>
           </row>
           <row>
             <entry><literal>SOURCE_FILE</literal></entry>
             <entry><literal>Source_file</literal></entry>
-            <entry></entry>
+            <entry/>
           </row>
           <row>
             <entry><literal>SOURCE_LINE</literal></entry>
             <entry><literal>Source_line</literal></entry>
-            <entry></entry>
+            <entry/>
           </row>
         </tbody>
       </tgroup>


Modified: trunk/refman-5.0/installing-cs.xml
===================================================================
--- trunk/refman-5.0/installing-cs.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/installing-cs.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 35, Lines Added: 60, Lines Deleted: 93; 16283 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="installing-cs">
 
   <title>Installing MySQL Community Server</title>

@@ -378,11 +376,11 @@
           <title>Filesystem stability and performance</title>
 
           <para>
-            MySQL&apos;s stability and performance are directly affected
-            by those of the operating platform&apos;s filesystem. In
-            particular, where large tables are in use, performance is
-            affected by the ability of the filesystem to deal with large
-            files at all and to deal with them efficiently.
+            MySQL's stability and performance are directly affected by
+            those of the operating platform's filesystem. In particular,
+            where large tables are in use, performance is affected by
+            the ability of the filesystem to deal with large files at
+            all and to deal with them efficiently.
           </para>
 
         </formalpara>

@@ -2035,9 +2033,9 @@
 
       <para>
         To verify the signature for a specific package, you first need
-        to obtain a copy of MySQL AB&apos;s public GPG build key, which
-        you can download from <ulink url="http://www.keyserver.net/"/>.
-        The key that you want to obtain is named
+        to obtain a copy of MySQL AB's public GPG build key, which you
+        can download from <ulink url="http://www.keyserver.net/"/>. The
+        key that you want to obtain is named
         <literal>build@stripped</literal>. Alternatively, you can cut
         and paste the key directly from the following text:
       </para>

@@ -2190,9 +2188,9 @@
           import the key into the RPM keyring first. RPM 4.1 no longer
           uses your personal GPG keyring (or GPG itself). Rather, it
           maintains its own keyring because it is a system-wide
-          application and a user&apos;s GPG public keyring is a
-          user-specific file. To import the MySQL public key into the
-          RPM keyring, first obtain the key as described in
+          application and a user's GPG public keyring is a user-specific
+          file. To import the MySQL public key into the RPM keyring,
+          first obtain the key as described in
           <xref linkend="checking-gpg-signature"/>. Then use
           <command>rpm --import</command> to import the key. For
           example, if you have saved the public key in a file named

@@ -2902,8 +2900,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata
-              fileref="images/published/mysql-es-win32-fig1.png" format="PNG"/>
+            <imagedata fileref="images/published/mysql-es-win32-fig1.png" format="PNG"/>
           </imageobject>
           <textobject>
             <phrase lang="en">MySQL Installer Main Screen

@@ -2928,8 +2925,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata
-              fileref="images/published/mysql-es-win32-fig2.png" format="PNG"/>
+            <imagedata fileref="images/published/mysql-es-win32-fig2.png" format="PNG"/>
           </imageobject>
           <textobject>
             <phrase lang="en">MySQL Installer Setup type

@@ -2991,8 +2987,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/published/mysql-es-win32-fig3.png"
-              format="PNG"/>
+            <imagedata fileref="images/published/mysql-es-win32-fig3.png" format="PNG"/>
           </imageobject>
           <textobject>
             <phrase lang="en">MySQL Installer Custom Installation

@@ -3038,8 +3033,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata fileref="images/published/mysql-es-win32-fig4.png"
-              format="PNG"/>
+            <imagedata fileref="images/published/mysql-es-win32-fig4.png" format="PNG"/>
           </imageobject>
           <textobject>
             <phrase lang="en">MySQL Installer Installation Summary

@@ -3313,9 +3307,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata
-              fileref="images/published/mysql-cfg-fig1.png"
-              format="PNG"/>
+            <imagedata fileref="images/published/mysql-cfg-fig1.png" format="PNG"/>
           </imageobject>
           <textobject>
             <phrase lang="en">MySQL Server Configuration Wizard</phrase>

@@ -3510,9 +3502,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata
-              fileref="images/published/mysql-cfg-fig2.png"
-              format="PNG"/>
+            <imagedata fileref="images/published/mysql-cfg-fig2.png" format="PNG"/>
           </imageobject>
           <textobject>
             <phrase lang="en">MySQL Server Configuration Wizard:

@@ -3577,9 +3567,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata
-              fileref="images/published/mysql-cfg-fig3.png"
-              format="PNG"/>
+            <imagedata fileref="images/published/mysql-cfg-fig3.png" format="PNG"/>
           </imageobject>
           <textobject>
             <phrase lang="en">MySQL Server Configuration Wizard: Server

@@ -3650,9 +3638,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata
-              fileref="images/published/mysql-cfg-fig4.png"
-              format="PNG"/>
+            <imagedata fileref="images/published/mysql-cfg-fig4.png" format="PNG"/>
           </imageobject>
           <textobject>
             <phrase lang="en">MySQL Server Configuration Wizard: Usage

@@ -3716,9 +3702,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata
-              fileref="images/published/mysql-cfg-fig5.png"
-              format="PNG"/>
+            <imagedata fileref="images/published/mysql-cfg-fig5.png" format="PNG"/>
           </imageobject>
           <textobject>
             <phrase lang="en">MySQL Server Configuration Wizard: InnoDB

@@ -3760,9 +3744,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata
-              fileref="images/published/mysql-cfg-fig6.png"
-              format="PNG"/>
+            <imagedata fileref="images/published/mysql-cfg-fig6.png" format="PNG"/>
           </imageobject>
           <textobject>
             <phrase lang="en">MySQL Server Configuration Wizard:

@@ -3818,9 +3800,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata
-              fileref="images/published/mysql-cfg-fig7.png"
-              format="PNG"/>
+            <imagedata fileref="images/published/mysql-cfg-fig7.png" format="PNG"/>
           </imageobject>
           <textobject>
             <phrase lang="en">MySQL Server Configuration Wizard: Network

@@ -3869,9 +3849,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata
-              fileref="images/published/mysql-cfg-fig8.png"
-              format="PNG"/>
+            <imagedata fileref="images/published/mysql-cfg-fig8.png" format="PNG"/>
           </imageobject>
           <textobject>
             <phrase lang="en">MySQL Server Configuration Wizard:

@@ -3965,9 +3943,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata
-              fileref="images/published/mysql-cfg-fig9.png"
-              format="PNG"/>
+            <imagedata fileref="images/published/mysql-cfg-fig9.png" format="PNG"/>
           </imageobject>
           <textobject>
             <phrase lang="en">MySQL Server Configuration Wizard:

@@ -4022,9 +3998,7 @@
 
         <mediaobject>
           <imageobject>
-            <imagedata
-              fileref="images/published/mysql-cfg-fig10.png"
-              format="PNG"/>
+            <imagedata fileref="images/published/mysql-cfg-fig10.png" format="PNG"/>
           </imageobject>
           <textobject>
             <phrase lang="en">MySQL Server Configuration Wizard:

@@ -8200,12 +8174,12 @@
       </indexterm>
 
       <indexterm>
-        <primary><command>configure</command> script</primary>
+        <primary>&lt;command&gt;configure&lt;/command&gt; script</primary>
       </indexterm>
 
       <indexterm>
         <primary>options</primary>
-        <secondary><command>configure</command></secondary>
+        <secondary>&lt;command&gt;configure&lt;/command&gt;</secondary>
       </indexterm>
 
       <indexterm>

@@ -8430,35 +8404,35 @@
         <listitem>
           <para>
             <indexterm>
-              <primary><literal>CC</literal> environment variable</primary>
+              <primary>CC environment variable</primary>
             </indexterm>
 
             <indexterm>
               <primary>environment variable</primary>
-              <secondary><literal>CC</literal></secondary>
+              <secondary>CC</secondary>
             </indexterm>
 
             <indexterm>
-              <primary><literal>CXX</literal> environment variable</primary>
+              <primary>CXX environment variable</primary>
             </indexterm>
 
             <indexterm>
               <primary>environment variable</primary>
-              <secondary><literal>CXX</literal></secondary>
+              <secondary>CXX</secondary>
             </indexterm>
 
             <indexterm>
-              <primary><command>gcc</command></primary>
+              <primary>&lt;command&gt;gcc&lt;/command&gt;</primary>
             </indexterm>
 
             <indexterm>
               <primary>C++ compiler</primary>
-              <secondary><command>gcc</command></secondary>
+              <secondary>&lt;command&gt;gcc&lt;/command&gt;</secondary>
             </indexterm>
 
             <indexterm>
               <primary>compiler</primary>
-              <secondary>C++ <command>gcc</command></secondary>
+              <secondary>C++ &lt;command&gt;gcc&lt;/command&gt;</secondary>
             </indexterm>
 
             If you are using <command>gcc</command> and don't have

@@ -8683,7 +8657,7 @@
           </para>
 
           <indexterm>
-            <primary><command>myisamchk</command></primary>
+            <primary>&lt;command&gt;myisamchk&lt;/command&gt;</primary>
           </indexterm>
 
           <warning>

@@ -9263,12 +9237,12 @@
       </indexterm>
 
       <indexterm>
-        <primary><literal>config.cache</literal> file</primary>
+        <primary>config.cache file</primary>
       </indexterm>
 
       <indexterm>
         <primary>files</primary>
-        <secondary><literal>config.cache</literal></secondary>
+        <secondary>config.cache</secondary>
       </indexterm>
 
       <para>

@@ -9286,11 +9260,11 @@
       </para>
 
       <indexterm>
-        <primary>running <command>configure</command> after prior invocation</primary>
+        <primary>running &lt;command&gt;configure&lt;/command&gt; after prior invocation</primary>
       </indexterm>
 
       <indexterm>
-        <primary><command>configure</command></primary>
+        <primary>&lt;command&gt;configure&lt;/command&gt;</primary>
         <secondary>running after prior invocation</secondary>
       </indexterm>
 

@@ -9352,15 +9326,15 @@
       <itemizedlist>
 
         <indexterm>
-          <primary><literal>cc1plus</literal> problems</primary>
+          <primary>cc1plus problems</primary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>fatal signal 11</literal></primary>
+          <primary>fatal signal 11</primary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>sql_yacc.cc</literal> problems</primary>
+          <primary>sql_yacc.cc problems</primary>
         </indexterm>
 
         <indexterm>

@@ -10042,8 +10016,7 @@
             you will need CMake and Visual C++ Express Edition or Visual
             Studio. Using this method you can select the storage engines
             that are included in your build. To use this method, see
-            <xref
-            linkend="windows-source-build-cmake"/>.
+            <xref linkend="windows-source-build-cmake"/>.
           </para>
         </listitem>
 

@@ -10055,8 +10028,7 @@
             engines (except <literal>NDB</literal>). To build using
             using method you only need Visual C++ Express Edition or
             Visual Studio. To use this method, see
-            <xref
-            linkend="windows-vc-plus-plus-build"/>.
+            <xref linkend="windows-vc-plus-plus-build"/>.
           </para>
         </listitem>
 

@@ -10068,8 +10040,7 @@
             you need to create the distribution on a Unix system and
             then copy the generated files to your Windows build
             environment. To use this method, see
-            <xref
-            linkend="windows-bitkeeper-build"/>.
+            <xref linkend="windows-bitkeeper-build"/>.
           </para>
         </listitem>
 

@@ -10284,7 +10255,7 @@
               <guimenuitem>Release</guimenuitem>,
               <guimenuitem>RelwithDebInfo</guimenuitem>,
               <guimenuitem>MinRelInfo</guimenuitem> options. Then select
-              <guimenu>Solution</guimenu> >
+              <guimenu>Solution</guimenu> &gt;
               <guimenuitem>Build</guimenuitem> to build the solution.
             </para>
 

@@ -10302,16 +10273,14 @@
           <listitem>
             <para>
               You should test you build before installation. See
-              <xref
-    linkend="windows-source-testbuild"/>.
+              <xref linkend="windows-source-testbuild"/>.
             </para>
           </listitem>
 
           <listitem>
             <para>
               To install, use the instructions in
-              <xref
-  linkend="windows-source-install"/>.
+              <xref linkend="windows-source-install"/>.
             </para>
           </listitem>
 

@@ -10421,16 +10390,14 @@
           <listitem>
             <para>
               You should test you build before installation. See
-              <xref
-            linkend="windows-source-testbuild"/>.
+              <xref linkend="windows-source-testbuild"/>.
             </para>
           </listitem>
 
           <listitem>
             <para>
               To install, use the instructions in
-              <xref
-            linkend="windows-source-install"/>.
+              <xref linkend="windows-source-install"/>.
             </para>
           </listitem>
 

@@ -11349,12 +11316,12 @@
         &cs-only;
         
         <indexterm>
-          <primary><command>mysql_install_db</command> script</primary>
+          <primary>&lt;command&gt;mysql_install_db&lt;/command&gt; script</primary>
         </indexterm>
 
         <indexterm>
           <primary>scripts</primary>
-          <secondary><command>mysql_install_db</command></secondary>
+          <secondary>&lt;command&gt;mysql_install_db&lt;/command&gt;</secondary>
         </indexterm>
 
         <para>

@@ -11479,7 +11446,7 @@
 
               <indexterm>
                 <primary>files</primary>
-                <secondary><literal>tmp</literal></secondary>
+                <secondary>tmp</secondary>
               </indexterm>
 
               <emphasis role="bold">You do not have write access to the

@@ -13018,7 +12985,7 @@
 
       <indexterm>
         <primary>upgrading</primary>
-        <secondary>to &current-series;</secondary>
+        <secondary>to &amp;current-series;</secondary>
       </indexterm>
 
       <note>

@@ -14300,11 +14267,11 @@
 </programlisting>
 
       <indexterm>
-        <primary><command>mysqldump</command></primary>
+        <primary>&lt;command&gt;mysqldump&lt;/command&gt;</primary>
       </indexterm>
 
       <indexterm>
-        <primary><command>mysqlimport</command></primary>
+        <primary>&lt;command&gt;mysqlimport&lt;/command&gt;</primary>
       </indexterm>
 
       <para>

@@ -18077,7 +18044,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>pkginfo mysql 2&gt;&amp;1 > /dev/null &amp;&amp; pkgrm mysql</userinput>
+shell&gt; <userinput>pkginfo mysql 2&gt;&amp;1 &gt; /dev/null &amp;&amp; pkgrm mysql</userinput>
 </programlisting>
 
         <para>


Modified: trunk/refman-5.0/installing-es.xml
===================================================================
--- trunk/refman-5.0/installing-es.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/installing-es.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 3, Lines Added: 5, Lines Deleted: 10; 1390 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="installing-es">
 
   <title>Installing MySQL Enterprise</title>

@@ -166,8 +164,7 @@
 
     <para>
       You should also review the notes and advice contained within
-      <xref
-      linkend="upgrade"/>.
+      <xref linkend="upgrade"/>.
     </para>
 
   </section>

@@ -220,9 +217,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata
-              fileref="images/published/mysql-esi-win32-uninst.png"
-              format="PNG"/>
+          <imagedata fileref="images/published/mysql-esi-win32-uninst.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Uninstalling MySQL Enterprise</phrase>


Modified: trunk/refman-5.0/installing-outline.xml
===================================================================
--- trunk/refman-5.0/installing-outline.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/installing-outline.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 5; 828 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="installing">
 
   <title>Installing and Upgrading MySQL</title>


Modified: trunk/refman-5.0/installing-version.xml
===================================================================
--- trunk/refman-5.0/installing-version.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/installing-version.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 5; 846 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="installation-version">
 
   <title>Determining your current MySQL version</title>


Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/installing.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 8; 1369 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="installing">
 
   <title>Installing and Upgrading MySQL</title>

@@ -88,10 +86,10 @@
 
   </section>
 
-  <xi:include href="installing-version.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing-version.xml"/>
 
-  <xi:include href="installing-es.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing-es.xml"/>
 
-  <xi:include href="installing-cs.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing-cs.xml"/>
 
 </chapter>


Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/introduction.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 6, Lines Added: 10, Lines Deleted: 12; 2277 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="introduction">
 
   <title>General Information</title>

@@ -132,7 +130,7 @@
   </itemizedlist>
 
   <important>
-    <para></para>
+    <para/>
   </important>
 
   <para>

@@ -512,7 +510,7 @@
             <xref linkend="xa"/>.
           </para>
 
-          <formalpara role ="mnmas">
+          <formalpara role="mnmas">
 
             <title>MySQL Enterprise</title>
 

@@ -1684,15 +1682,15 @@
         </indexterm>
 
         <indexterm>
-          <primary><literal>InnoDB</literal> tables</primary>
+          <primary>InnoDB tables</primary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>BDB</literal> tables</primary>
+          <primary>BDB tables</primary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>ACID</literal></primary>
+          <primary>ACID</primary>
         </indexterm>
 
         <para>

@@ -1732,7 +1730,7 @@
             For expert advice on choosing and tuning storage engines,
             subscribe to the MySQL Enterprise Monitor. For more
             information see
-            <ulink url="&base-url-enterprise;advisors.html" />.
+            <ulink url="&base-url-enterprise;advisors.html"/>.
           </para>
 
         </formalpara>

@@ -2495,7 +2493,7 @@
           To be alerted when there is no form of server-enforced data
           integrity, subscribe to the MySQL Enterprise Monitor. For more
           information see
-          <ulink url="&base-url-enterprise;advisors.html" />.
+          <ulink url="&base-url-enterprise;advisors.html"/>.
         </para>
 
       </formalpara>


Modified: trunk/refman-5.0/language-structure.xml
===================================================================
--- trunk/refman-5.0/language-structure.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/language-structure.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 6, Lines Added: 10, Lines Deleted: 12; 2275 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="language-structure">
 
   <title>Language Structure</title>

@@ -503,7 +501,7 @@
       </indexterm>
 
       <indexterm>
-        <primary><literal>BLOB</literal></primary>
+        <primary>BLOB</primary>
         <secondary>inserting binary data</secondary>
       </indexterm>
 

@@ -512,7 +510,7 @@
       </indexterm>
 
       <indexterm>
-        <primary>DBI-&gt;quote</primary>
+        <primary>DBI-&amp;gt;quote</primary>
       </indexterm>
 
       <para>

@@ -683,11 +681,11 @@
       <title>Boolean Values</title>
 
       <indexterm>
-        <primary><literal>TRUE</literal></primary>
+        <primary>TRUE</primary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>FALSE</literal></primary>
+        <primary>FALSE</primary>
       </indexterm>
 
       <remark role="help-topic" condition="TRUE FALSE"/>

@@ -1237,7 +1235,7 @@
         described later in this section.
       </para>
 
-      <formalpara role ="mnmas">
+      <formalpara role="mnmas">
 
         <title>MySQL Enterprise</title>
 

@@ -1840,9 +1838,9 @@
       can be used as an identifier if you quote it.
     </para>
 
-    <xi:include href="reservedwords.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="reservedwords.xml"/>
 
-    <xi:include href="reserved-new-5.0.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="reserved-new-5.0.xml"/>
 
     <para>
       MySQL allows some keywords to be used as unquoted identifiers


Modified: trunk/refman-5.0/legalnotice.en.xml
===================================================================
--- trunk/refman-5.0/legalnotice.en.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/legalnotice.en.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 582 bytes

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <legalnotice>
 
 <!--


Modified: trunk/refman-5.0/manual.xml
===================================================================
--- trunk/refman-5.0/manual.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/manual.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 2, Lines Added: 38, Lines Deleted: 40; 6774 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <book id="refman-5-0" lang="en">
 
   <title>MySQL 5.0 Reference Manual</title>

@@ -45,77 +43,77 @@
 
     </abstract>
 
-    <xi:include href="legalnotice.en.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="legalnotice.en.xml"/>
 
   </bookinfo>
 
-  <xi:include href="preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="preface.xml"/>
 
-  <xi:include href="introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml"/>
 
-  <xi:include href="installing.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="installing.xml"/>
 
-  <xi:include href="tutorial.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tutorial.xml"/>
 
-  <xi:include href="using-mysql-programs.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="using-mysql-programs.xml"/>
 
-  <xi:include href="dynxml-local-dba.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-local-dba.xml"/>
 
-  <xi:include href="optimization.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="optimization.xml"/>
 
-  <xi:include href="client-utility-programs.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="client-utility-programs.xml"/>
 
-  <xi:include href="language-structure.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="language-structure.xml"/>
 
-  <xi:include href="charset.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="charset.xml"/>
 
-  <xi:include href="data-types.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="data-types.xml"/>
 
-  <xi:include href="dynxml-local-functions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-local-functions.xml"/>
 
-  <xi:include href="sql-syntax.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sql-syntax.xml"/>
 
-  <xi:include href="storage-engines.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="storage-engines.xml"/>
 
-  <xi:include href="ha.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ha.xml"/>
 
-  <xi:include href="replication.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="replication.xml"/>
 
-  <xi:include href="mysql-cluster.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster.xml"/>
 
-  <xi:include href="spatial-extensions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="spatial-extensions.xml"/>
 
-  <xi:include href="stored-procedures.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stored-procedures.xml"/>
 
-  <xi:include href="triggers.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="triggers.xml"/>
 
-  <xi:include href="views.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="views.xml"/>
 
-  <xi:include href="information-schema.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="information-schema.xml"/>
 
-  <xi:include href="precision-math.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="precision-math.xml"/>
 
-  <xi:include href="apis.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apis.xml"/>
 
-  <xi:include href="connectors.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="connectors.xml"/>
 
-  <xi:include href="../refman-common/mysql-proxy.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../refman-common/mysql-proxy.xml"/>
 
-  <xi:include href="extending-mysql.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="extending-mysql.xml"/>
 
-  <xi:include href="faqs.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="faqs.xml"/>
 
-  <xi:include href="errors-problems.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="errors-problems.xml"/>
 
-  <xi:include href="releasenotes-es.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="releasenotes-es.xml"/>
 
-  <xi:include href="releasenotes-cs.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="releasenotes-cs.xml"/>
 
-  <xi:include href="news.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="news.xml"/>
 
-  <xi:include href="restrictions.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="restrictions.xml"/>
 
-  <xi:include href="../refman-common/credits.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../refman-common/credits.xml"/>
 
   <index/>
 


Modified: trunk/refman-5.0/mysql-cluster-backup.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-backup.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/mysql-cluster-backup.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 11, Lines Added: 13, Lines Deleted: 15; 3162 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="mysql-cluster-backup">
 
   <title>On-line Backup of MySQL Cluster</title>

@@ -261,7 +259,7 @@
 ndb_mgm&gt; <userinput>START BACKUP WAIT STARTED</userinput>
 Waiting for started, this may take several minutes
 Node 2: Backup 3 started from node 1
-ndb_mgm>
+ndb_mgm&gt;
 </programlisting>
                 </para>
               </listitem>

@@ -469,7 +467,7 @@
     </para>
 
 <programlisting>
-shell&gt; <userinput>ndb_mgm -e &quot;ABORT BACKUP <replaceable>backup_id</replaceable>&quot;</userinput>
+shell&gt; <userinput>ndb_mgm -e "ABORT BACKUP <replaceable>backup_id</replaceable>"</userinput>
 </programlisting>
 
     <note>

@@ -560,7 +558,7 @@
 
         <indexterm>
           <primary>single user mode (MySQL Cluster)</primary>
-          <secondary>and <command>ndb_restore</command></secondary>
+          <secondary>and &lt;command&gt;ndb_restore&lt;/command&gt;</secondary>
         </indexterm>
 
         <note>

@@ -611,7 +609,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>ndb_mgm -e &quot;SHOW&quot;</userinput>
+shell&gt; <userinput>ndb_mgm -e "SHOW"</userinput>
 </programlisting>
 
         <para>

@@ -961,7 +959,7 @@
         </para>
 
         <indexterm>
-          <primary><command>ndb_restore</command></primary>
+          <primary>&lt;command&gt;ndb_restore&lt;/command&gt;</primary>
           <secondary>errors</secondary>
         </indexterm>
 

@@ -1014,7 +1012,7 @@
 
       <listitem>
         <indexterm>
-          <primary><literal>BackupDataBufferSize</literal></primary>
+          <primary>BackupDataBufferSize</primary>
         </indexterm>
 
         <para>

@@ -1029,7 +1027,7 @@
 
       <listitem>
         <indexterm>
-          <primary><literal>BackupLogBufferSize</literal></primary>
+          <primary>BackupLogBufferSize</primary>
         </indexterm>
 
         <para>

@@ -1044,7 +1042,7 @@
 
       <listitem>
         <indexterm>
-          <primary><literal>BackupMemory</literal></primary>
+          <primary>BackupMemory</primary>
         </indexterm>
 
         <para>

@@ -1060,7 +1058,7 @@
 
       <listitem>
         <indexterm>
-          <primary><literal>BackupWriteSize</literal></primary>
+          <primary>BackupWriteSize</primary>
         </indexterm>
 
         <para>

@@ -1075,7 +1073,7 @@
 
       <listitem>
         <indexterm>
-          <primary><literal>BackupMaxWriteSize</literal></primary>
+          <primary>BackupMaxWriteSize</primary>
         </indexterm>
 
         <para>


Modified: trunk/refman-5.0/mysql-cluster-configuration.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-configuration.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/mysql-cluster-configuration.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 111, Lines Added: 125, Lines Deleted: 139; 34301 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="mysql-cluster-configuration">
 
   <title>MySQL Cluster Configuration</title>

@@ -126,7 +124,7 @@
 
     <indexterm>
       <primary>MySQL Cluster</primary>
-      <secondary><quote>quick</quote> configuration</secondary>
+      <secondary>&lt;quote&gt;quick&lt;/quote&gt; configuration</secondary>
     </indexterm>
 
     <indexterm>

@@ -166,7 +164,7 @@
     </para>
 
 <programlisting>
-# file &quot;config.ini&quot; - showing minimal setup consisting of 1 data node,
+# file "config.ini" - showing minimal setup consisting of 1 data node,
 # 1 management server, and 3 MySQL servers.
 # The empty default sections are not required, and are shown only for
 # the sake of completeness.

@@ -327,7 +325,7 @@
 </programlisting>
 
     <indexterm>
-      <primary><literal>SHOW</literal></primary>
+      <primary>SHOW</primary>
       <secondary>in MySQL Cluster management client</secondary>
     </indexterm>
 

@@ -371,12 +369,12 @@
     </indexterm>
 
     <indexterm>
-      <primary><filename>my.cnf</filename></primary>
+      <primary>&lt;filename&gt;my.cnf&lt;/filename&gt;</primary>
       <secondary>and MySQL Cluster</secondary>
     </indexterm>
 
     <indexterm>
-      <primary><filename>config.ini</filename> (MySQL Cluster)</primary>
+      <primary>&lt;filename&gt;config.ini&lt;/filename&gt; (MySQL Cluster)</primary>
     </indexterm>
 
     <para>

@@ -434,12 +432,12 @@
       </indexterm>
 
       <indexterm>
-        <primary><filename>my.cnf</filename></primary>
+        <primary>&lt;filename&gt;my.cnf&lt;/filename&gt;</primary>
         <secondary>and MySQL Cluster</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><filename>config.ini</filename> (MySQL Cluster)</primary>
+        <primary>&lt;filename&gt;config.ini&lt;/filename&gt; (MySQL Cluster)</primary>
       </indexterm>
 
       <para>

@@ -576,7 +574,7 @@
       </para>
 
 <programlisting>
-# file &quot;config.ini&quot; - 2 data nodes and 2 SQL nodes
+# file "config.ini" - 2 data nodes and 2 SQL nodes
 # This file is placed in the startup directory of ndb_mgmd (the
 # management server)
 # The first MySQL Server can be started from any host. The second

@@ -760,8 +758,8 @@
       </para>
 
 <programlisting>
-example 1 (long):    &quot;nodeid=2,myhost1:1100,myhost2:1100,192.168.0.3:1200&quot;
-example 2 (short):   &quot;myhost1&quot;
+example 1 (long):    "nodeid=2,myhost1:1100,myhost2:1100,192.168.0.3:1200"
+example 2 (short):   "myhost1"
 </programlisting>
 
       <para>

@@ -936,7 +934,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>Id</literal></primary>
+            <primary>Id</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-mgm-definition-id">

@@ -953,7 +951,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>ExecuteOnComputer</literal></primary>
+            <primary>ExecuteOnComputer</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-mgm-definition-executeoncomputer">

@@ -969,7 +967,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>PortNumber</literal></primary>
+            <primary>PortNumber</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-mgm-definition-portnumber">

@@ -984,7 +982,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>HostName</literal></primary>
+            <primary>HostName</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-mgm-definition-hostname">

@@ -1002,7 +1000,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>LogDestination</literal></primary>
+            <primary>LogDestination</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-mgm-definition-logdestination">

@@ -1123,7 +1121,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>ArbitrationRank</literal></primary>
+            <primary>ArbitrationRank</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-mgm-definition-arbitrationrank">

@@ -1173,7 +1171,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>ArbitrationDelay</literal></primary>
+            <primary>ArbitrationDelay</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-mgm-definition-arbitrationdelay">

@@ -1190,7 +1188,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>DataDir</literal></primary>
+            <primary>DataDir</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-mgm-definition-datadir">

@@ -1297,7 +1295,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>Id</literal></primary>
+            <primary>Id</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-id">

@@ -1314,7 +1312,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>ExecuteOnComputer</literal></primary>
+            <primary>ExecuteOnComputer</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-executeoncomputer">

@@ -1330,7 +1328,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>HostName</literal></primary>
+            <primary>HostName</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-hostname">

@@ -1348,7 +1346,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>ServerPort</literal></primary>
+            <primary>ServerPort</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-serverport">

@@ -1369,7 +1367,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>NoOfReplicas</literal></primary>
+            <primary>NoOfReplicas</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-noofreplicas">

@@ -1403,7 +1401,7 @@
             If no node IDs are provided, the order of the data nodes
             will be the determining factor for the node group. Whether
             or not explicit assignments are made, they can be viewed in
-            the output of the management client&apos;s
+            the output of the management client's
             <literal>SHOW</literal> statement.
           </para>
 

@@ -1429,7 +1427,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>DataDir</literal></primary>
+            <primary>DataDir</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-datadir">

@@ -1444,7 +1442,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>FileSystemPath</literal></primary>
+            <primary>FileSystemPath</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-filesystempath">

@@ -1477,7 +1475,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>BackupDataDir</literal></primary>
+            <primary>BackupDataDir</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-backupdatadir">

@@ -1514,7 +1512,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>DataMemory</literal></primary>
+            <primary>DataMemory</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-datamemory">

@@ -1649,7 +1647,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>IndexMemory</literal></primary>
+            <primary>IndexMemory</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-indexmemory">

@@ -1680,7 +1678,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>StringMemory</literal></primary>
+            <primary>StringMemory</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-stringmemory">

@@ -1846,7 +1844,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>MaxNoOfConcurrentTransactions</literal></primary>
+            <primary>MaxNoOfConcurrentTransactions</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-maxnoofconcurrenttransactions">

@@ -1898,7 +1896,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>MaxNoOfConcurrentOperations</literal></primary>
+            <primary>MaxNoOfConcurrentOperations</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-maxnoofconcurrentoperations">

@@ -1980,7 +1978,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>MaxNoOfLocalOperations</literal></primary>
+            <primary>MaxNoOfLocalOperations</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-maxnooflocaloperations">

@@ -2027,7 +2025,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>MaxNoOfConcurrentIndexOperations</literal></primary>
+            <primary>MaxNoOfConcurrentIndexOperations</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-maxnoofconcurrentindexoperations">

@@ -2058,7 +2056,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>MaxNoOfFiredTriggers</literal></primary>
+            <primary>MaxNoOfFiredTriggers</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-maxnooffiredtriggers">

@@ -2089,7 +2087,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>TransactionBufferMemory</literal></primary>
+            <primary>TransactionBufferMemory</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-transactionbuffermemory">

@@ -2149,7 +2147,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>MaxNoOfConcurrentScans</literal></primary>
+            <primary>MaxNoOfConcurrentScans</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-maxnoofconcurrentscans">

@@ -2190,7 +2188,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>MaxNoOfLocalScans</literal></primary>
+            <primary>MaxNoOfLocalScans</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-maxnooflocalscans">

@@ -2208,7 +2206,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>BatchSizePerLocalScan</literal></primary>
+            <primary>BatchSizePerLocalScan</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-batchsizeperlocalscan">

@@ -2234,7 +2232,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>LongMessageBuffer</literal></primary>
+            <primary>LongMessageBuffer</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-longmessagebuffer">

@@ -2266,7 +2264,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>NoOfFragmentLogFiles</literal></primary>
+            <primary>NoOfFragmentLogFiles</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-nooffragmentlogfiles">

@@ -2332,7 +2330,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>MaxNoOfOpenFiles</literal></primary>
+            <primary>MaxNoOfOpenFiles</primary>
           </indexterm>
 
           <remark role="todo">

@@ -2358,7 +2356,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>MaxNoOfSavedMessages</literal></primary>
+            <primary>MaxNoOfSavedMessages</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-maxnoofsavedmessages">

@@ -2398,7 +2396,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>MaxNoOfAttributes</literal></primary>
+            <primary>MaxNoOfAttributes</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-maxnoofattributes">

@@ -2441,7 +2439,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>MaxNoOfTables</literal></primary>
+            <primary>MaxNoOfTables</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-maxnooftables">

@@ -2470,7 +2468,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>MaxNoOfOrderedIndexes</literal></primary>
+            <primary>MaxNoOfOrderedIndexes</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-maxnooforderedindexes">

@@ -2493,7 +2491,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>MaxNoOfUniqueHashIndexes</literal></primary>
+            <primary>MaxNoOfUniqueHashIndexes</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-maxnoofuniquehashindexes">

@@ -2517,7 +2515,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>MaxNoOfTriggers</literal></primary>
+            <primary>MaxNoOfTriggers</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-maxnooftriggers">

@@ -2545,7 +2543,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>MaxNoOfIndexes</literal></primary>
+            <primary>MaxNoOfIndexes</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-maxnoofindexes">

@@ -2591,7 +2589,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>LockPagesInMainMemory</literal></primary>
+            <primary>LockPagesInMainMemory</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-lockpagesinmainmemory">

@@ -2658,7 +2656,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>StopOnError</literal></primary>
+            <primary>StopOnError</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-stoponerror">

@@ -2678,7 +2676,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>Diskless</literal></primary>
+            <primary>Diskless</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-diskless">

@@ -2716,7 +2714,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>RestartOnErrorInsert</literal></primary>
+            <primary>RestartOnErrorInsert</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-restartonerrorinsert">

@@ -2753,7 +2751,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>TimeBetweenWatchDogCheck</literal></primary>
+            <primary>TimeBetweenWatchDogCheck</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-timebetweenwatchdogcheck">

@@ -2783,7 +2781,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>StartPartialTimeout</literal></primary>
+            <primary>StartPartialTimeout</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-startpartialtimeout">

@@ -2806,8 +2804,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>StartPartitionedTimeout</literal> (MySQL Cluster configuration
-              parameter)</primary>
+            <primary>StartPartitionedTimeout (MySQL Cluster configuration parameter)</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-startpartitionedtimeout">

@@ -2828,8 +2825,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>StartFailureTimeout</literal> (MySQL Cluster configuration
-              parameter)</primary>
+            <primary>StartFailureTimeout (MySQL Cluster configuration parameter)</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-startfailuretimeout">

@@ -2856,8 +2852,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>HeartbeatIntervalDbDb</literal> (MySQL Cluster configuration
-              parameter)</primary>
+            <primary>HeartbeatIntervalDbDb (MySQL Cluster configuration parameter)</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-heartbeatintervaldbdb">

@@ -2887,8 +2882,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>HeartbeatIntervalDbApi</literal> (MySQL Cluster configuration
-              parameter)</primary>
+            <primary>HeartbeatIntervalDbApi (MySQL Cluster configuration parameter)</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-heartbeatintervaldbapi">

@@ -2917,8 +2911,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>TimeBetweenLocalCheckpoints</literal> (MySQL Cluster
-              configuration parameter)</primary>
+            <primary>TimeBetweenLocalCheckpoints (MySQL Cluster configuration parameter)</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-timebetweenlocalcheckpoints">

@@ -2957,8 +2950,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>TimeBetweenGlobalCheckpoints</literal> (MySQL Cluster
-              configuration parameter)</primary>
+            <primary>TimeBetweenGlobalCheckpoints (MySQL Cluster configuration parameter)</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-timebetweenglobalcheckpoints">

@@ -2996,8 +2988,8 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>TimeBetweenInactiveTransactionAbortCheck</literal> (MySQL
-              Cluster configuration parameter)</primary>
+            <primary>TimeBetweenInactiveTransactionAbortCheck (MySQL Cluster configuration
+              parameter)</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-timebetweeninactivetransactionabortcheck">

@@ -3019,8 +3011,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>TransactionInactiveTimeout</literal> (MySQL Cluster
-              configuration parameter)</primary>
+            <primary>TransactionInactiveTimeout (MySQL Cluster configuration parameter)</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-transactioninactivetimeout">

@@ -3043,8 +3034,8 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>TransactionDeadlockDetectionTimeout</literal> (MySQL Cluster
-              configuration parameter)</primary>
+            <primary>TransactionDeadlockDetectionTimeout (MySQL Cluster configuration
+              parameter)</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-transactiondeadlockdetectiontimeout">

@@ -3102,7 +3093,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>NoOfDiskPagesToDiskAfterRestartTUP</literal></primary>
+            <primary>NoOfDiskPagesToDiskAfterRestartTUP</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-noofdiskpagestodiskafterrestarttup">

@@ -3152,7 +3143,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>NoOfDiskPagesToDiskAfterRestartACC</literal></primary>
+            <primary>NoOfDiskPagesToDiskAfterRestartACC</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-noofdiskpagestodiskafterrestartacc">

@@ -3174,7 +3165,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>NoOfDiskPagesToDiskDuringRestartTUP</literal></primary>
+            <primary>NoOfDiskPagesToDiskDuringRestartTUP</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-noofdiskpagestodiskduringrestarttup">

@@ -3204,7 +3195,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>NoOfDiskPagesToDiskDuringRestartACC</literal></primary>
+            <primary>NoOfDiskPagesToDiskDuringRestartACC</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-noofdiskpagestodiskduringrestartacc">

@@ -3232,7 +3223,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>ArbitrationTimeout</literal></primary>
+            <primary>ArbitrationTimeout</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-arbitrationtimeout">

@@ -3279,7 +3270,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>UndoIndexBuffer</literal></primary>
+            <primary>UndoIndexBuffer</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-undoindexbuffer">

@@ -3336,7 +3327,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>UndoDataBuffer</literal></primary>
+            <primary>UndoDataBuffer</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-undodatabuffer">

@@ -3388,7 +3379,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>RedoBuffer</literal></primary>
+            <primary>RedoBuffer</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-redobuffer">

@@ -3459,7 +3450,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>LogLevelStartup</literal></primary>
+            <primary>LogLevelStartup</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-loglevelstartup">

@@ -3478,7 +3469,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>LogLevelShutdown</literal></primary>
+            <primary>LogLevelShutdown</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-loglevelshutdown">

@@ -3497,8 +3488,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>LogLevelStatistic</literal> (MySQL Cluster configuration
-              parameter)</primary>
+            <primary>LogLevelStatistic (MySQL Cluster configuration parameter)</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-loglevelstatistic">

@@ -3518,8 +3508,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>LogLevelCheckpoint</literal> (MySQL Cluster configuration
-              parameter)</primary>
+            <primary>LogLevelCheckpoint (MySQL Cluster configuration parameter)</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-loglevelcheckpoint">

@@ -3538,8 +3527,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>LogLevelNodeRestart</literal> (MySQL Cluster configuration
-              parameter)</primary>
+            <primary>LogLevelNodeRestart (MySQL Cluster configuration parameter)</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-loglevelnoderestart">

@@ -3558,8 +3546,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>LogLevelConnection</literal> (MySQL Cluster configuration
-              parameter)</primary>
+            <primary>LogLevelConnection (MySQL Cluster configuration parameter)</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-loglevelconnection">

@@ -3578,7 +3565,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>LogLevelError</literal></primary>
+            <primary>LogLevelError</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-loglevelerror">

@@ -3599,7 +3586,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>LogLevelCongestion</literal></primary>
+            <primary>LogLevelCongestion</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-loglevelcongestion">

@@ -3619,7 +3606,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>LogLevelInfo</literal></primary>
+            <primary>LogLevelInfo</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-loglevelinfo">

@@ -3654,8 +3641,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>BackupDataBufferSize</literal> (MySQL Cluster configuration
-              parameter)</primary>
+            <primary>BackupDataBufferSize (MySQL Cluster configuration parameter)</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-backupdatabuffersize">

@@ -3682,7 +3668,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>BackupLogBufferSize</literal></primary>
+            <primary>BackupLogBufferSize</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-backuplogbuffersize">

@@ -3725,7 +3711,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>BackupMemory</literal></primary>
+            <primary>BackupMemory</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-backupmemory">

@@ -3754,7 +3740,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>BackupWriteSize</literal></primary>
+            <primary>BackupWriteSize</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-backupwritesize">

@@ -3773,7 +3759,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>BackupMaxWriteSize</literal></primary>
+            <primary>BackupMaxWriteSize</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-ndbd-definition-backupmaxwritesize">

@@ -3869,7 +3855,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>Id</literal></primary>
+            <primary>Id</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-api-definition-id">

@@ -3886,7 +3872,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>ExecuteOnComputer</literal></primary>
+            <primary>ExecuteOnComputer</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-api-definition-executeoncomputer">

@@ -3902,7 +3888,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>HostName</literal></primary>
+            <primary>HostName</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-api-definition-hostname">

@@ -3933,7 +3919,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>ArbitrationRank</literal></primary>
+            <primary>ArbitrationRank</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-api-definition-arbitrationrank">

@@ -3954,7 +3940,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>ArbitrationDelay</literal></primary>
+            <primary>ArbitrationDelay</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-api-definition-arbitrationdelay">

@@ -3972,7 +3958,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>BatchByteSize</literal></primary>
+            <primary>BatchByteSize</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-api-definition-batchbytesize">

@@ -4010,7 +3996,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>BatchSize</literal></primary>
+            <primary>BatchSize</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-api-definition-batchsize">

@@ -4025,7 +4011,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>MaxScanBatchSize</literal></primary>
+            <primary>MaxScanBatchSize</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-api-definition-maxscanbatchsize">

@@ -4134,7 +4120,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>SendBufferMemory</literal></primary>
+            <primary>SendBufferMemory</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-tcp-definition-sendbuffermemory">

@@ -4155,7 +4141,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>SendSignalId</literal></primary>
+            <primary>SendSignalId</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-tcp-definition-sendsignalid">

@@ -4174,7 +4160,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>Checksum</literal></primary>
+            <primary>Checksum</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-tcp-definition-checksum">

@@ -4195,7 +4181,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>PortNumber</literal></primary>
+            <primary>PortNumber</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-tcp-definition-portnumber">

@@ -4212,7 +4198,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>ReceiveBufferMemory</literal></primary>
+            <primary>ReceiveBufferMemory</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-tcp-definition-receivebuffermemory">

@@ -4393,7 +4379,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>ShmKey</literal></primary>
+            <primary>ShmKey</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-shm-definition-shmkey">

@@ -4410,7 +4396,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>ShmSize</literal></primary>
+            <primary>ShmSize</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-shm-definition-shmsize">

@@ -4427,7 +4413,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>SendSignalId</literal></primary>
+            <primary>SendSignalId</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-shm-definition-sendsignalid">

@@ -4446,7 +4432,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>Checksum</literal> (MySQL Cluster)</primary>
+            <primary>Checksum (MySQL Cluster)</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-shm-definition-checksum">

@@ -4553,7 +4539,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>Host*SciId*</literal> parameters</primary>
+            <primary>Host*SciId* parameters</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-sci-definition-host1sciid0">

@@ -4604,7 +4590,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>SharedBufferSize</literal></primary>
+            <primary>SharedBufferSize</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-sci-definition-sharedbuffersize">

@@ -4624,7 +4610,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>SendLimit</literal></primary>
+            <primary>SendLimit</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-sci-definition-sendlimit">

@@ -4643,7 +4629,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>SendSignalId</literal></primary>
+            <primary>SendSignalId</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-sci-definition-sendsignalid">

@@ -4661,7 +4647,7 @@
 
         <listitem>
           <indexterm>
-            <primary><literal>Checksum</literal> (MySQL Cluster)</primary>
+            <primary>Checksum (MySQL Cluster)</primary>
           </indexterm>
 
           <para id="mysql-cluster-param-sci-definition-checksum">

@@ -4682,7 +4668,7 @@
       </itemizedlist>
 
       <remark role="todo">
-        [js] What is meant by &quot;parts&quot; here??
+        [js] What is meant by "parts" here??
       </remark>
 
       <remark>

@@ -4824,11 +4810,11 @@
       </indexterm>
 
       <indexterm>
-        <primary><literal>[ndbd]</literal> (MySQL Cluster)</primary>
+        <primary>[ndbd] (MySQL Cluster)</primary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>[ndbd_DEFAULT]</literal> (MySQL Cluster)</primary>
+        <primary>[ndbd_DEFAULT] (MySQL Cluster)</primary>
       </indexterm>
 
       <para>

@@ -5443,11 +5429,11 @@
       </indexterm>
 
       <indexterm>
-        <primary><literal>[ndb_mgmd]</literal> (MySQL Cluster)</primary>
+        <primary>[ndb_mgmd] (MySQL Cluster)</primary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>[mgm]</literal> (MySQL Cluster)</primary>
+        <primary>[mgm] (MySQL Cluster)</primary>
       </indexterm>
 
       <para>

@@ -5589,11 +5575,11 @@
       </indexterm>
 
       <indexterm>
-        <primary><literal>[SQL]</literal> (MySQL Cluster)</primary>
+        <primary>[SQL] (MySQL Cluster)</primary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>[api]</literal> (MySQL Cluster)</primary>
+        <primary>[api] (MySQL Cluster)</primary>
       </indexterm>
 
       <para>

@@ -5738,25 +5724,25 @@
     <title>Configuring Parameters for Local Checkpoints</title>
 
     <indexterm>
-      <primary><literal>DataMemory</literal></primary>
+      <primary>DataMemory</primary>
     </indexterm>
 
     <indexterm>
-      <primary><literal>IndexMemory</literal></primary>
+      <primary>IndexMemory</primary>
     </indexterm>
 
     <indexterm>
-      <primary><literal>NoOfDiskPagesToDiskAfterRestartACC</literal></primary>
+      <primary>NoOfDiskPagesToDiskAfterRestartACC</primary>
       <secondary>calculating</secondary>
     </indexterm>
 
     <indexterm>
-      <primary><literal>NoOfDiskPagesToDiskAfterRestartTUP</literal></primary>
+      <primary>NoOfDiskPagesToDiskAfterRestartTUP</primary>
       <secondary>calculating</secondary>
     </indexterm>
 
     <indexterm>
-      <primary><literal>NoOfFragmentLogFiles</literal></primary>
+      <primary>NoOfFragmentLogFiles</primary>
       <secondary>calculating</secondary>
     </indexterm>
 


Modified: trunk/refman-5.0/mysql-cluster-glossary.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-glossary.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/mysql-cluster-glossary.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 5; 844 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="mysql-cluster-glossary">
 
   <title>MySQL Cluster Glossary</title>


Modified: trunk/refman-5.0/mysql-cluster-interconnects.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-interconnects.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/mysql-cluster-interconnects.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 6; 1181 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="mysql-cluster-interconnects">
 
   <title>Using High-Speed Interconnects with MySQL Cluster</title>

@@ -791,7 +789,7 @@
 
     <indexterm>
       <primary>MySQL Cluster</primary>
-      <secondary>SCI, performance <foreignphrase>vs</foreignphrase> TCP/IP</secondary>
+      <secondary>SCI, performance &lt;foreignphrase&gt;vs&lt;/foreignphrase&gt; TCP/IP</secondary>
     </indexterm>
 
     <para>


Modified: trunk/refman-5.0/mysql-cluster-limitations.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-limitations.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/mysql-cluster-limitations.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 8; 1507 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="mysql-cluster-limitations">
 
   <title>Known Limitations of MySQL Cluster</title>

@@ -228,17 +226,17 @@
           </indexterm>
 
           <indexterm>
-            <primary><literal>DELETE</literal></primary>
+            <primary>DELETE</primary>
             <secondary>and MySQL Cluster</secondary>
           </indexterm>
 
           <indexterm>
-            <primary><literal>DROP TABLE</literal></primary>
+            <primary>DROP TABLE</primary>
             <secondary>and MySQL Cluster</secondary>
           </indexterm>
 
           <indexterm>
-            <primary><literal>TRUNCATE</literal></primary>
+            <primary>TRUNCATE</primary>
             <secondary>and MySQL Cluster</secondary>
           </indexterm>
 


Modified: trunk/refman-5.0/mysql-cluster-management.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-management.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/mysql-cluster-management.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 24, Lines Added: 47, Lines Deleted: 49; 10335 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="mysql-cluster-management">
 
   <title>Management of MySQL Cluster</title>

@@ -228,7 +226,7 @@
     </para>
 
     <indexterm>
-      <primary><literal>PURGE STALE SESSIONS</literal></primary>
+      <primary>PURGE STALE SESSIONS</primary>
     </indexterm>
 
     <para>

@@ -505,7 +503,7 @@
 
     <indexterm>
       <primary>MySQL Cluster</primary>
-      <secondary><command>mgm</command> client</secondary>
+      <secondary>&lt;command&gt;mgm&lt;/command&gt; client</secondary>
     </indexterm>
 
     <para>

@@ -535,11 +533,11 @@
       <listitem>
         <indexterm>
           <primary>MySQL Cluster</primary>
-          <secondary><literal>HELP</literal> command</secondary>
+          <secondary>HELP command</secondary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>HELP</literal> command (MySQL Cluster)</primary>
+          <primary>HELP command (MySQL Cluster)</primary>
         </indexterm>
 
         <para>

@@ -554,11 +552,11 @@
       <listitem>
         <indexterm>
           <primary>MySQL Cluster</primary>
-          <secondary><literal>SHOW</literal> command</secondary>
+          <secondary>SHOW command</secondary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>SHOW</literal> command (MySQL Cluster)</primary>
+          <primary>SHOW command (MySQL Cluster)</primary>
         </indexterm>
 
         <para>

@@ -581,11 +579,11 @@
       <listitem>
         <indexterm>
           <primary>MySQL Cluster</primary>
-          <secondary><literal>START</literal> command</secondary>
+          <secondary>START command</secondary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>START</literal> command (MySQL Cluster)</primary>
+          <primary>START command (MySQL Cluster)</primary>
         </indexterm>
 
         <para>

@@ -621,11 +619,11 @@
       <listitem>
         <indexterm>
           <primary>MySQL Cluster</primary>
-          <secondary><literal>STOP</literal> command</secondary>
+          <secondary>STOP command</secondary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>STOP</literal> command (MySQL Cluster)</primary>
+          <primary>STOP command (MySQL Cluster)</primary>
         </indexterm>
 
         <para>

@@ -659,11 +657,11 @@
       <listitem>
         <indexterm>
           <primary>MySQL Cluster</primary>
-          <secondary><literal>RESTART</literal> command</secondary>
+          <secondary>RESTART command</secondary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>RESTART</literal> command (MySQL Cluster)</primary>
+          <primary>RESTART command (MySQL Cluster)</primary>
         </indexterm>
 
         <para>

@@ -705,11 +703,11 @@
       <listitem>
         <indexterm>
           <primary>MySQL Cluster</primary>
-          <secondary><literal>STATUS</literal> command</secondary>
+          <secondary>STATUS command</secondary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>STATUS</literal> command (MySQL Cluster)</primary>
+          <primary>STATUS command (MySQL Cluster)</primary>
         </indexterm>
 
         <para>

@@ -734,11 +732,11 @@
 
         <indexterm>
           <primary>MySQL Cluster</primary>
-          <secondary><literal>ENTER SINGLE USER MODE</literal> command</secondary>
+          <secondary>ENTER SINGLE USER MODE command</secondary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>ENTER SINGLE USER MODE</literal> command (MySQL Cluster)</primary>
+          <primary>ENTER SINGLE USER MODE command (MySQL Cluster)</primary>
         </indexterm>
 
         <para>

@@ -766,11 +764,11 @@
       <listitem>
         <indexterm>
           <primary>MySQL Cluster</primary>
-          <secondary><literal>EXIT SINGLE USER MODE</literal> command</secondary>
+          <secondary>EXIT SINGLE USER MODE command</secondary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>EXIT SINGLE USER MODE</literal> command (MySQL Cluster)</primary>
+          <primary>EXIT SINGLE USER MODE command (MySQL Cluster)</primary>
         </indexterm>
 
         <para>

@@ -787,20 +785,20 @@
       <listitem>
         <indexterm>
           <primary>MySQL Cluster</primary>
-          <secondary><literal>EXIT</literal> command</secondary>
+          <secondary>EXIT command</secondary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>EXIT</literal> command (MySQL Cluster)</primary>
+          <primary>EXIT command (MySQL Cluster)</primary>
         </indexterm>
 
         <indexterm>
           <primary>MySQL Cluster</primary>
-          <secondary><literal>QUIT</literal> command</secondary>
+          <secondary>QUIT command</secondary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>QUIT</literal> command (MySQL Cluster)</primary>
+          <primary>QUIT command (MySQL Cluster)</primary>
         </indexterm>
 
         <para>

@@ -820,11 +818,11 @@
       <listitem>
         <indexterm>
           <primary>MySQL Cluster</primary>
-          <secondary><literal>SHUTDOWN</literal> command</secondary>
+          <secondary>SHUTDOWN command</secondary>
         </indexterm>
 
         <indexterm>
-          <primary><literal>SHUTDOWN</literal> command (MySQL Cluster)</primary>
+          <primary>SHUTDOWN command (MySQL Cluster)</primary>
         </indexterm>
 
         <para>

@@ -1108,11 +1106,11 @@
 
       <indexterm>
         <primary>MySQL Cluster</primary>
-        <secondary><literal>CLUSTERLOG</literal> commands</secondary>
+        <secondary>CLUSTERLOG commands</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>CLUSTERLOG</literal> commands (MySQL Cluster)</primary>
+        <primary>CLUSTERLOG commands (MySQL Cluster)</primary>
       </indexterm>
 
       <itemizedlist>

@@ -1385,11 +1383,11 @@
 
       <indexterm>
         <primary>MySQL Cluster</primary>
-        <secondary><literal>CONNECTION</literal> Events</secondary>
+        <secondary>CONNECTION Events</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>CONNECTION</literal> Events (MySQL Cluster)</primary>
+        <primary>CONNECTION Events (MySQL Cluster)</primary>
       </indexterm>
 
       <para>

@@ -1450,11 +1448,11 @@
 
       <indexterm>
         <primary>MySQL Cluster</primary>
-        <secondary><literal>CHECKPOINT</literal> Events</secondary>
+        <secondary>CHECKPOINT Events</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>CHECKPOINT</literal> Events (MySQL Cluster)</primary>
+        <primary>CHECKPOINT Events (MySQL Cluster)</primary>
       </indexterm>
 
       <para>

@@ -1527,11 +1525,11 @@
 
       <indexterm>
         <primary>MySQL Cluster</primary>
-        <secondary><literal>STARTUP</literal> Events</secondary>
+        <secondary>STARTUP Events</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>STARTUP</literal> Events (MySQL Cluster)</primary>
+        <primary>STARTUP Events (MySQL Cluster)</primary>
       </indexterm>
 
       <para>

@@ -1641,11 +1639,11 @@
 
       <indexterm>
         <primary>MySQL Cluster</primary>
-        <secondary><literal>NODERESTART</literal> Events</secondary>
+        <secondary>NODERESTART Events</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>NODERESTART</literal> Events (MySQL Cluster)</primary>
+        <primary>NODERESTART Events (MySQL Cluster)</primary>
       </indexterm>
 
       <para>

@@ -1871,11 +1869,11 @@
 
       <indexterm>
         <primary>MySQL Cluster</primary>
-        <secondary><literal>STATISTICS</literal> Events</secondary>
+        <secondary>STATISTICS Events</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>STATISTICS</literal> Events (MySQL Cluster)</primary>
+        <primary>STATISTICS Events (MySQL Cluster)</primary>
       </indexterm>
 
       <para>

@@ -1951,11 +1949,11 @@
 
       <indexterm>
         <primary>MySQL Cluster</primary>
-        <secondary><literal>ERROR</literal> Events</secondary>
+        <secondary>ERROR Events</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>ERROR</literal> Events (MySQL Cluster)</primary>
+        <primary>ERROR Events (MySQL Cluster)</primary>
       </indexterm>
 
       <para>

@@ -2019,11 +2017,11 @@
 
       <indexterm>
         <primary>MySQL Cluster</primary>
-        <secondary><literal>INFO</literal> Events</secondary>
+        <secondary>INFO Events</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>INFO</literal> Events (MySQL Cluster)</primary>
+        <primary>INFO Events (MySQL Cluster)</primary>
       </indexterm>
 
       <para>

@@ -2075,11 +2073,11 @@
 
       <indexterm>
         <primary>MySQL Cluster</primary>
-        <secondary><literal>CLUSTERLOG STATISTICS</literal> command</secondary>
+        <secondary>CLUSTERLOG STATISTICS command</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>CLUSTERLOG STATISTICS</literal> command (MySQL Cluster)</primary>
+        <primary>CLUSTERLOG STATISTICS command (MySQL Cluster)</primary>
       </indexterm>
 
       <indexterm>

@@ -2094,7 +2092,7 @@
 
       <indexterm>
         <primary>MySQL Cluster</primary>
-        <secondary><command>mgm</command> management client</secondary>
+        <secondary>&lt;command&gt;mgm&lt;/command&gt; management client</secondary>
       </indexterm>
 
       <indexterm>

@@ -2173,7 +2171,7 @@
 
       <indexterm>
         <primary>MySQL Cluster</primary>
-        <secondary><command>ndbd</command> process</secondary>
+        <secondary>&lt;command&gt;ndbd&lt;/command&gt; process</secondary>
       </indexterm>
 
       <orderedlist>


Modified: trunk/refman-5.0/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-multi-computer.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/mysql-cluster-multi-computer.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 8, Lines Added: 24, Lines Deleted: 25; 5558 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="mysql-cluster-multi-computer">
 
   <title>Simple Multi-Computer How-To</title>

@@ -94,11 +92,11 @@
               <entry>192.168.0.20</entry>
             </row>
             <row>
-              <entry>Data (NDBD) node &quot;A&quot;</entry>
+              <entry>Data (NDBD) node "A"</entry>
               <entry>192.168.0.30</entry>
             </row>
             <row>
-              <entry>Data (NDBD) node &quot;B&quot;</entry>
+              <entry>Data (NDBD) node "B"</entry>
               <entry>192.168.0.40</entry>
             </row>
           </tbody>

@@ -887,12 +885,12 @@
     </indexterm>
 
     <indexterm>
-      <primary><filename>my.cnf</filename></primary>
+      <primary>&lt;filename&gt;my.cnf&lt;/filename&gt;</primary>
       <secondary>and MySQL Cluster</secondary>
     </indexterm>
 
     <indexterm>
-      <primary><filename>config.ini</filename> (MySQL Cluster)</primary>
+      <primary>&lt;filename&gt;config.ini&lt;/filename&gt; (MySQL Cluster)</primary>
     </indexterm>
 
     <para>

@@ -1018,7 +1016,7 @@
 DataMemory=80M    # How much memory to allocate for data storage
 IndexMemory=18M   # How much memory to allocate for index storage
                   # For DataMemory and IndexMemory, we have used the
-                  # default values. Since the &quot;world&quot; database takes up
+                  # default values. Since the "world" database takes up
                   # only about 500KB, this should be more than enough for
                   # this example Cluster setup.
 

@@ -1035,13 +1033,13 @@
 hostname=192.168.0.10           # Hostname or IP address of MGM node
 datadir=/var/lib/mysql-cluster  # Directory for MGM node log files
 
-# Options for data node &quot;A&quot;:
+# Options for data node "A":
 [ndbd]                          
                                 # (one [ndbd] section per data node)
 hostname=192.168.0.30           # Hostname or IP address
 datadir=/usr/local/mysql/data   # Directory for this data node's data files
 
-# Options for data node &quot;B&quot;:
+# Options for data node "B":
 [ndbd]                          
 hostname=192.168.0.40           # Hostname or IP address
 datadir=/usr/local/mysql/data   # Directory for this data node's data files

@@ -1156,11 +1154,12 @@
 
     <indexterm>
       <primary>MySQL Cluster</primary>
-      <secondary><command>ndb_mgm</command></secondary>
+      <secondary>&lt;command&gt;ndb_mgm&lt;/command&gt;</secondary>
     </indexterm>
 
     <indexterm>
-      <primary><command>ndb_mgm</command> (MySQL Cluster management node client)</primary>
+      <primary>&lt;command&gt;ndb_mgm&lt;/command&gt; (MySQL Cluster management node
+        client)</primary>
     </indexterm>
 
     <para>

@@ -1497,12 +1496,12 @@
     </para>
 
 <programlisting>
-&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot;
-  &quot;http://www.w3.org/TR/html4/loose.dtd&quot;&gt;
+&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+  "http://www.w3.org/TR/html4/loose.dtd"&gt;
 &lt;html&gt;
 &lt;head&gt;
-  &lt;meta http-equiv=&quot;Content-Type&quot;
-        content=&quot;text/html; charset=iso-8859-1&quot;&gt;
+  &lt;meta http-equiv="Content-Type"
+        content="text/html; charset=iso-8859-1"&gt;
   &lt;title&gt;SIMPLE mysqli SELECT&lt;/title&gt;
 &lt;/head&gt;
 &lt;body&gt;

@@ -1513,34 +1512,34 @@
   #   host, user, password, database
 
   if( mysqli_connect_errno() )
-    die(&quot;Connect failed: &quot; . mysqli_connect_error());
+    die("Connect failed: " . mysqli_connect_error());
 
-  $query = &quot;SELECT Name, Population
+  $query = "SELECT Name, Population
             FROM City
             ORDER BY Population DESC
-            LIMIT 5&quot;;
+            LIMIT 5";
 
   # if no errors...
   if( $result = $link-&gt;query($query) )
   {
 ?&gt;
-&lt;table border=&quot;1&quot; width=&quot;40%&quot; cellpadding=&quot;4&quot; cellspacing =&quot;1&quot;&gt;
+&lt;table border="1" width="40%" cellpadding="4" cellspacing ="1"&gt;
   &lt;tbody&gt;
   &lt;tr&gt;
-    &lt;th width=&quot;10%&quot;&gt;City&lt;/th&gt;
+    &lt;th width="10%"&gt;City&lt;/th&gt;
     &lt;th&gt;Population&lt;/th&gt;
   &lt;/tr&gt;
 &lt;?
     # then display the results...
     while($row = $result-&gt;fetch_object())
-      printf(&lt;tr&gt;\n  &lt;td align=\&quot;center\&quot;&gt;%s&lt;/td&gt;&lt;td&gt;%d&lt;/td&gt;\n&lt;/tr&gt;\n&quot;,
+      printf(&lt;tr&gt;\n  &lt;td align=\"center\"&gt;%s&lt;/td&gt;&lt;td&gt;%d&lt;/td&gt;\n&lt;/tr&gt;\n",
               $row-&gt;Name, $row-&gt;Population);
 ?&gt;
   &lt;/tbody
 &lt;/table&gt;
 &lt;?
   # ...and verify the number of rows that were retrieved
-    printf(&quot;&lt;p&gt;Affected rows: %d&lt;/p&gt;\n&quot;, $link-&gt;affected_rows);
+    printf("&lt;p&gt;Affected rows: %d&lt;/p&gt;\n", $link-&gt;affected_rows);
   }
   else
     # otherwise, tell us what went wrong


Modified: trunk/refman-5.0/mysql-cluster-overview.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-overview.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/mysql-cluster-overview.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 9; 1935 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="mysql-cluster-overview">
 
   <title>MySQL Cluster Overview</title>

@@ -110,25 +108,25 @@
     </indexterm>
 
     <indexterm>
-      <primary><command>ndbd</command> (MySQL Cluster)</primary>
+      <primary>&lt;command&gt;ndbd&lt;/command&gt; (MySQL Cluster)</primary>
       <secondary>defined</secondary>
       <seealso>data node (MySQL Cluster)</seealso>
     </indexterm>
 
     <indexterm>
-      <primary><command>mgmd</command> (MySQL Cluster)</primary>
+      <primary>&lt;command&gt;mgmd&lt;/command&gt; (MySQL Cluster)</primary>
       <secondary>defined</secondary>
       <seealso>management node (MySQL Cluster)</seealso>
     </indexterm>
 
     <indexterm>
-      <primary><command>ndb_mgmd</command> (MySQL Cluster)</primary>
+      <primary>&lt;command&gt;ndb_mgmd&lt;/command&gt; (MySQL Cluster)</primary>
       <secondary>defined</secondary>
       <seealso>management node (MySQL Cluster)</seealso>
     </indexterm>
 
     <indexterm>
-      <primary><command>mysqld</command></primary>
+      <primary>&lt;command&gt;mysqld&lt;/command&gt;</primary>
       <secondary>role in MySQL Cluster</secondary>
       <see>SQL Node (MySQL Cluster)</see>
     </indexterm>


Modified: trunk/refman-5.0/mysql-cluster-process-management.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-process-management.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/mysql-cluster-process-management.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 13, Lines Added: 19, Lines Deleted: 21; 4657 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="mysql-cluster-process-management">
 
   <title>Process Management in MySQL Cluster</title>

@@ -72,11 +70,11 @@
 
     <indexterm>
       <primary>MySQL Cluster</primary>
-      <secondary><command>mysqld</command> process</secondary>
+      <secondary>&lt;command&gt;mysqld&lt;/command&gt; process</secondary>
     </indexterm>
 
     <indexterm>
-      <primary><command>mysqld</command></primary>
+      <primary>&lt;command&gt;mysqld&lt;/command&gt;</primary>
       <secondary>as MySQL Cluster process</secondary>
     </indexterm>
 

@@ -155,7 +153,7 @@
     </indexterm>
 
     <indexterm>
-      <primary><filename>my.cnf</filename></primary>
+      <primary>&lt;filename&gt;my.cnf&lt;/filename&gt;</primary>
       <secondary>in MySQL Cluster</secondary>
     </indexterm>
 

@@ -517,7 +515,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>ndbd --connect-string=&quot;nodeid=2;host=ndb_mgmd.mysql.com:1186&quot;</userinput>
+shell&gt; <userinput>ndbd --connect-string="nodeid=2;host=ndb_mgmd.mysql.com:1186"</userinput>
 </programlisting>
 
         <para>

@@ -672,7 +670,7 @@
             </indexterm>
 
             <indexterm>
-              <primary><filename>config.ini</filename> (MySQL Cluster)</primary>
+              <primary>&lt;filename&gt;config.ini&lt;/filename&gt; (MySQL Cluster)</primary>
             </indexterm>
 
             <para>

@@ -863,17 +861,17 @@
 
     <indexterm>
       <primary>MySQL Cluster</primary>
-      <secondary><command>ndbd</command></secondary>
+      <secondary>&lt;command&gt;ndbd&lt;/command&gt;</secondary>
     </indexterm>
 
     <indexterm>
       <primary>MySQL Cluster</primary>
-      <secondary><command>mgm</command></secondary>
+      <secondary>&lt;command&gt;mgm&lt;/command&gt;</secondary>
     </indexterm>
 
     <indexterm>
       <primary>MySQL Cluster</primary>
-      <secondary><command>mgmd</command></secondary>
+      <secondary>&lt;command&gt;mgmd&lt;/command&gt;</secondary>
     </indexterm>
 
     <para>

@@ -939,7 +937,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>ndbd --connect-string=&quot;nodeid=2;host=ndb_mgmd.mysql.com:1186&quot;</userinput>
+shell&gt; <userinput>ndbd --connect-string="nodeid=2;host=ndb_mgmd.mysql.com:1186"</userinput>
 </programlisting>
       </listitem>
 

@@ -980,7 +978,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>ndb_mgm -e &quot;SHOW&quot;</userinput>
+shell&gt; <userinput>ndb_mgm -e "SHOW"</userinput>
 </programlisting>
 
         <para>

@@ -988,7 +986,7 @@
         </para>
 
 <programlisting>
-shell&gt; <userinput>ndb_mgm --execute=&quot;SHOW&quot;</userinput>
+shell&gt; <userinput>ndb_mgm --execute="SHOW"</userinput>
 </programlisting>
 
         <para>

@@ -1060,11 +1058,11 @@
 
       <indexterm>
         <primary>MySQL Cluster</primary>
-        <secondary><command>mysqld</command> process</secondary>
+        <secondary>&lt;command&gt;mysqld&lt;/command&gt; process</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><command>mysqld</command></primary>
+        <primary>&lt;command&gt;mysqld&lt;/command&gt;</primary>
         <secondary>as MySQL Cluster process</secondary>
       </indexterm>
 

@@ -1131,7 +1129,7 @@
 
       <indexterm>
         <primary>MySQL Cluster</primary>
-        <secondary><command>ndbd</command> process</secondary>
+        <secondary>&lt;command&gt;ndbd&lt;/command&gt; process</secondary>
       </indexterm>
 
       <para>

@@ -1385,7 +1383,7 @@
 
       <indexterm>
         <primary>MySQL Cluster</primary>
-        <secondary><command>mgmd</command> process</secondary>
+        <secondary>&lt;command&gt;mgmd&lt;/command&gt; process</secondary>
       </indexterm>
 
       <para>

@@ -1503,7 +1501,7 @@
 
       <indexterm>
         <primary>MySQL Cluster</primary>
-        <secondary><command>mgm</command> process</secondary>
+        <secondary>&lt;command&gt;mgm&lt;/command&gt; process</secondary>
       </indexterm>
 
       <para>


Modified: trunk/refman-5.0/mysql-cluster-roadmap.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-roadmap.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/mysql-cluster-roadmap.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 3, Lines Added: 7, Lines Deleted: 10; 1550 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="mysql-cluster-roadmap">
 
   <title>MySQL Cluster Development Roadmap</title>

@@ -23,8 +21,7 @@
 
   <remark role="todo">
     [js] Update to get rid of items already implemented that were listed
-    as &quot;future&quot; items here. (Waiting on feedback from Jeb, et
-    al.)
+    as "future" items here. (Waiting on feedback from Jeb, et al.)
   </remark>
 
   <remark role="note">

@@ -32,9 +29,9 @@
   </remark>
 
   <remark>
-    Author: Jon Stephens. Based on Mikael Ronström's &quot;Cluster
-    News&quot; announcement of 2005-04-06 and other info from Mikael
-    Ronström, Jonas Oreland, et al.
+    Author: Jon Stephens. Based on Mikael Ronström's "Cluster News"
+    announcement of 2005-04-06 and other info from Mikael Ronström,
+    Jonas Oreland, et al.
   </remark>
 
   <para>


Modified: trunk/refman-5.0/mysql-cluster-upgrade-downgrade.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-upgrade-downgrade.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/mysql-cluster-upgrade-downgrade.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 5; 897 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="mysql-cluster-upgrade-downgrade">
 
   <title>Upgrading and Downgrading MySQL Cluster</title>


Modified: trunk/refman-5.0/mysql-cluster-utilities.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-utilities.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/mysql-cluster-utilities.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 2, Lines Added: 18, Lines Deleted: 20; 3238 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="mysql-cluster-utilities">
 
   <title>Cluster Utility Programs</title>

@@ -14,63 +12,63 @@
   </indexterm>
 
   <indexterm>
-    <primary><command>ndb_config</command></primary>
+    <primary>&lt;command&gt;ndb_config&lt;/command&gt;</primary>
   </indexterm>
 
   <indexterm>
-    <primary><command>ndb_cpcd</command></primary>
+    <primary>&lt;command&gt;ndb_cpcd&lt;/command&gt;</primary>
   </indexterm>
 
   <indexterm>
-    <primary><command>ndb_delete_all</command></primary>
+    <primary>&lt;command&gt;ndb_delete_all&lt;/command&gt;</primary>
   </indexterm>
 
   <indexterm>
-    <primary><command>ndb_desc</command></primary>
+    <primary>&lt;command&gt;ndb_desc&lt;/command&gt;</primary>
   </indexterm>
 
   <indexterm>
-    <primary><command>ndb_drop_index</command></primary>
+    <primary>&lt;command&gt;ndb_drop_index&lt;/command&gt;</primary>
   </indexterm>
 
   <indexterm>
-    <primary><command>ndb_drop_table</command></primary>
+    <primary>&lt;command&gt;ndb_drop_table&lt;/command&gt;</primary>
   </indexterm>
 
   <indexterm>
-    <primary><command>ndb_error_reporter</command></primary>
+    <primary>&lt;command&gt;ndb_error_reporter&lt;/command&gt;</primary>
   </indexterm>
 
   <indexterm>
-    <primary><command>ndb_print_backup_file</command></primary>
+    <primary>&lt;command&gt;ndb_print_backup_file&lt;/command&gt;</primary>
   </indexterm>
 
   <indexterm>
-    <primary><command>ndb_print_schema_file</command></primary>
+    <primary>&lt;command&gt;ndb_print_schema_file&lt;/command&gt;</primary>
   </indexterm>
 
   <indexterm>
-    <primary><command>ndb_print_sys_file</command></primary>
+    <primary>&lt;command&gt;ndb_print_sys_file&lt;/command&gt;</primary>
   </indexterm>
 
   <indexterm>
-    <primary><command>ndb_select_all</command></primary>
+    <primary>&lt;command&gt;ndb_select_all&lt;/command&gt;</primary>
   </indexterm>
 
   <indexterm>
-    <primary><command>ndb_select_count</command></primary>
+    <primary>&lt;command&gt;ndb_select_count&lt;/command&gt;</primary>
   </indexterm>
 
   <indexterm>
-    <primary><command>ndb_show_tables</command></primary>
+    <primary>&lt;command&gt;ndb_show_tables&lt;/command&gt;</primary>
   </indexterm>
 
   <indexterm>
-    <primary><command>ndb_size.pl</command></primary>
+    <primary>&lt;command&gt;ndb_size.pl&lt;/command&gt;</primary>
   </indexterm>
 
   <indexterm>
-    <primary><command>ndb_waiter</command></primary>
+    <primary>&lt;command&gt;ndb_waiter&lt;/command&gt;</primary>
   </indexterm>
 
   <para>


Modified: trunk/refman-5.0/mysql-cluster.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/mysql-cluster.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 4, Lines Added: 21, Lines Deleted: 21; 4249 bytes

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
- <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="mysql-cluster">
 
   <title>MySQL Cluster</title>

@@ -12,7 +12,7 @@
   </indexterm>
 
   <indexterm>
-    <primary><literal>NDB</literal> storage engine</primary>
+    <primary>NDB storage engine</primary>
     <see>MySQL Cluster</see>
   </indexterm>
 

@@ -24,12 +24,12 @@
   <remark>
     Authors: Arjen Lentz, Lars Thalmann, Mikael Ronström, and Jon
     Stephens (Cluster FAQ, Cluster How-To, Cluster Glossary). Also
-    integrates &quot;MySQL Cluster for MySQL users&quot; by Anders
-    Karlsson. Additional information and feedback provided by Tomas
-    Ulin, Pekka Nousiainen, Stewart Smith, Jörg Brühe, Harrison Fisk.
-    Additional technical review and real-world testing by JD Duncan, Jeb
-    Miller, Hartmut Holzgraefe, Carsten Pedersen, and Roland Bouman.
-    Rewrite editor: Jon Stephens; Supervising editor: Stefan Hinz.
+    integrates "MySQL Cluster for MySQL users" by Anders Karlsson.
+    Additional information and feedback provided by Tomas Ulin, Pekka
+    Nousiainen, Stewart Smith, Jörg Brühe, Harrison Fisk. Additional
+    technical review and real-world testing by JD Duncan, Jeb Miller,
+    Hartmut Holzgraefe, Carsten Pedersen, and Roland Bouman. Rewrite
+    editor: Jon Stephens; Supervising editor: Stefan Hinz.
   </remark>
 
   <para>

@@ -131,28 +131,28 @@
 
   </formalpara>
 
-  <xi:include href="mysql-cluster-overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-overview.xml"/>
 
-  <xi:include href="mysql-cluster-multi-computer.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-multi-computer.xml"/>
 
-  <xi:include href="mysql-cluster-configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-configuration.xml"/>
 
-  <xi:include href="mysql-cluster-upgrade-downgrade.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-upgrade-downgrade.xml"/>
 
-  <xi:include href="mysql-cluster-process-management.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-process-management.xml"/>
 
-  <xi:include href="mysql-cluster-management.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-management.xml"/>
 
-  <xi:include href="mysql-cluster-backup.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-backup.xml"/>
 
-  <xi:include href="mysql-cluster-utilities.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-utilities.xml"/>
 
-  <xi:include href="mysql-cluster-interconnects.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-interconnects.xml"/>
 
-  <xi:include href="mysql-cluster-limitations.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-limitations.xml"/>
 
-  <xi:include href="mysql-cluster-roadmap.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-roadmap.xml"/>
 
-  <xi:include href="mysql-cluster-glossary.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mysql-cluster-glossary.xml"/>
 
 </chapter>


Modified: trunk/refman-5.0/news-5.0-core.xml
===================================================================
--- trunk/refman-5.0/news-5.0-core.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/news-5.0-core.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 30, Lines Added: 32, Lines Deleted: 63; 9173 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <!-- 
 
 WARNING: 

@@ -196,8 +194,7 @@
 
   <section id="news-5-0-26">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.26:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.26:mysqld:all"/>
 
     <para role="release-level">
       This is a bugfix release for the current production release

@@ -212,8 +209,7 @@
 
   <section id="news-5-0-25">
 
-    <title condition="dynamic:changelog:vertitle"
-    role="5.0.25:mysqld:all"/>&eol-warning;
+    <title condition="dynamic:changelog:vertitle" role="5.0.25:mysqld:all"/>&eol-warning;
     
     <para role="release-level">
       This is a bugfix release for the current production release

@@ -229,8 +225,7 @@
 
   <section id="news-5-0-24a">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.24a:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.24a:mysqld:all"/>
 
     <para role="release-level">
       This is a bugfix release for the current production release

@@ -243,8 +238,7 @@
 
   <section id="news-5-0-24">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.24:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.24:mysqld:all"/>
 
     <para role="release-level">
       This is a bugfix release for the current production release

@@ -259,8 +253,7 @@
 
   <section id="news-5-0-23">
 
-    <title condition="dynamic:changelog:vertitle"
-    role="5.0.23:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.23:mysqld:all"/>
 
     <para role="release-level">
       MySQL 5.0.23 was never officially released.

@@ -274,8 +267,7 @@
 
   <section id="news-5-0-22">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.22:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.22:mysqld:all"/>
 
     <para role="release-level">
       This is a security fix release for the previous production release

@@ -290,8 +282,7 @@
 
   <section id="news-5-0-21">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.21:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.21:mysqld:all"/>
 
     <para role="release-level">
       This is a bugfix release for the current production release

@@ -306,8 +297,7 @@
 
   <section id="news-5-0-20a">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.20a:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.20a:mysqld:all"/>
 
     <para role="release-level">
       This is a bugfix release for the current production release

@@ -320,8 +310,7 @@
 
   <section id="news-5-0-20">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.20:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.20:mysqld:all"/>
 
     <para condition="dynamic:changelog:entrylist" role="5.0.20:mysqld:all"/>
 

@@ -329,8 +318,7 @@
 
   <section id="news-5-0-19">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.19:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.19:mysqld:all"/>
 
     <para condition="dynamic:changelog:entrylist" role="5.0.19:mysqld:all"/>
 

@@ -338,8 +326,7 @@
 
   <section id="news-5-0-18">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.18:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.18:mysqld:all"/>
 
     <para condition="dynamic:changelog:entrylist" role="5.0.18:mysqld:all"/>
 

@@ -347,8 +334,7 @@
 
   <section id="news-5-0-17">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.17:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.17:mysqld:all"/>
 
     <para condition="dynamic:changelog:entrylist" role="5.0.17:mysqld:all"/>
 

@@ -356,8 +342,7 @@
 
   <section id="news-5-0-16">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.16:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.16:mysqld:all"/>
 
     <para condition="dynamic:changelog:entrylist" role="5.0.16:mysqld:all"/>
 

@@ -365,8 +350,7 @@
 
   <section id="news-5-0-15">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.15:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.15:mysqld:all"/>
 
     <para condition="dynamic:changelog:entrylist" role="5.0.15:mysqld:all"/>
 

@@ -374,8 +358,7 @@
 
   <section id="news-5-0-14">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.14:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.14:mysqld:all"/>
 
     <para condition="dynamic:changelog:entrylist" role="5.0.14:mysqld:all"/>
 

@@ -383,8 +366,7 @@
 
   <section id="news-5-0-13">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.13:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.13:mysqld:all"/>
 
     <para condition="dynamic:changelog:entrylist" role="5.0.13:mysqld:all"/>
 

@@ -392,8 +374,7 @@
 
   <section id="news-5-0-12">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.12:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.12:mysqld:all"/>
 
     <para condition="dynamic:changelog:entrylist" role="5.0.12:mysqld:all"/>
 

@@ -401,8 +382,7 @@
 
   <section id="news-5-0-11">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.11:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.11:mysqld:all"/>
 
     <para condition="dynamic:changelog:entrylist" role="5.0.11:mysqld:all"/>
 

@@ -410,8 +390,7 @@
 
   <section id="news-5-0-10">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.10:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.10:mysqld:all"/>
 
     <para condition="dynamic:changelog:entrylist" role="5.0.10:mysqld:all"/>
 

@@ -419,8 +398,7 @@
 
   <section id="news-5-0-9">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.9:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.9:mysqld:all"/>
 
     <para condition="dynamic:changelog:entrylist" role="5.0.9:mysqld:all"/>
 

@@ -428,8 +406,7 @@
 
   <section id="news-5-0-8">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.8:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.8:mysqld:all"/>
 
     <para condition="dynamic:changelog:entrylist" role="5.0.8:mysqld:all"/>
 

@@ -437,8 +414,7 @@
 
   <section id="news-5-0-7">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.7:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.7:mysqld:all"/>
 
     <para condition="dynamic:changelog:entrylist" role="5.0.7:mysqld:all"/>
 

@@ -446,8 +422,7 @@
 
   <section id="news-5-0-6">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.6:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.6:mysqld:all"/>
 
     <para condition="dynamic:changelog:entrylist" role="5.0.6:mysqld:all"/>
 

@@ -455,8 +430,7 @@
 
   <section id="news-5-0-5">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.5:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.5:mysqld:all"/>
 
     <para condition="dynamic:changelog:entrylist" role="5.0.5:mysqld:all"/>
 

@@ -464,8 +438,7 @@
 
   <section id="news-5-0-4">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.4:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.4:mysqld:all"/>
 
     <para condition="dynamic:changelog:entrylist" role="5.0.4:mysqld:all"/>
 

@@ -473,8 +446,7 @@
 
   <section id="news-5-0-3">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.3:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.3:mysqld:all"/>
 
     <note>
       <para>

@@ -494,8 +466,7 @@
 
   <section id="news-5-0-2">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.2:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.2:mysqld:all"/>
 
     <para condition="dynamic:changelog:entrylist" role="5.0.2:mysqld:all"/>
 

@@ -503,8 +474,7 @@
 
   <section id="news-5-0-1">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.1:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.1:mysqld:all"/>
 
     <note>
       <para>

@@ -526,8 +496,7 @@
 
   <section id="news-5-0-0">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.0:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.0:mysqld:all"/>
 
     <para condition="dynamic:changelog:entrylist" role="5.0.0:mysqld:all"/>
 


Modified: trunk/refman-5.0/news.xml
===================================================================
--- trunk/refman-5.0/news.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/news.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 2, Lines Added: 11, Lines Deleted: 13; 2394 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <appendix id="news">
 
   <title>MySQL Change History</title>

@@ -72,20 +70,20 @@
     version instead.
   </para>
 
-  <xi:include href="dynxml-local-news-5.0.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-local-news-5.0.xml"/>
 
-  <xi:include href="../refman-common/news-cluster.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../refman-common/news-cluster.xml"/>
 
-  <xi:include href="dynxml-common-news-codbc.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-common-news-codbc.xml"/>
 
-  <xi:include href="dynxml-common-news-cnet.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-common-news-cnet.xml"/>
 
-  <xi:include href="dynxml-common-news-vstudioplugin.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-common-news-vstudioplugin.xml"/>
 
-  <xi:include href="dynxml-common-news-cj.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-common-news-cj.xml"/>
 
-  <xi:include href="dynxml-common-news-cmxj.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-common-news-cmxj.xml"/>
 
-  <xi:include href="dynxml-common-news-mysql-proxy.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-common-news-mysql-proxy.xml"/>
 
 </appendix>


Modified: trunk/refman-5.0/optimization.xml
===================================================================
--- trunk/refman-5.0/optimization.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/optimization.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 14, Lines Added: 22, Lines Deleted: 24; 5671 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="optimization">
 
   <title>Optimization</title>

@@ -4298,7 +4296,7 @@
 <programlisting>
 SELECT * FROM T1 LEFT JOIN T2 ON T2.A=T1.A
                  INNER JOIN T3 ON T3.B=T1.B
-  WHERE T3.C > 0
+  WHERE T3.C &gt; 0
 </programlisting>
 
       <para>

@@ -6390,7 +6388,7 @@
               For optimization tips geared to your specific
               circumstances subscribe to the MySQL Enterprise Monitor.
               For more information see
-              <ulink url="&base-url-enterprise;advisors.html" />.
+              <ulink url="&base-url-enterprise;advisors.html"/>.
             </para>
 
           </formalpara>

@@ -6854,7 +6852,7 @@
           The MySQL Enterprise Monitor provides expert advice on when to
           use table-level locking and when to use row-level locking. To
           subscribe see
-          <ulink url="&base-url-enterprise;advisors.html" />.
+          <ulink url="&base-url-enterprise;advisors.html"/>.
         </para>
 
       </formalpara>

@@ -7391,7 +7389,7 @@
               Lock contention can seriously degrade performance. The
               MySQL Enterprise Monitor provides expert advice on
               avoiding this problem. To subscribe see
-              <ulink url="&base-url-enterprise;advisors.html" />.
+              <ulink url="&base-url-enterprise;advisors.html"/>.
             </para>
 
           </formalpara>

@@ -7924,23 +7922,23 @@
       </para>
 
       <indexterm>
-        <primary><literal>BLOB</literal> columns</primary>
+        <primary>BLOB columns</primary>
         <secondary>indexing</secondary>
       </indexterm>
 
       <indexterm>
         <primary>indexes</primary>
-        <secondary>and <literal>BLOB</literal> columns</secondary>
+        <secondary>and BLOB columns</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>TEXT</literal> columns</primary>
+        <primary>TEXT columns</primary>
         <secondary>indexing</secondary>
       </indexterm>
 
       <indexterm>
         <primary>indexes</primary>
-        <secondary>and <literal>TEXT</literal> columns</secondary>
+        <secondary>and TEXT columns</secondary>
       </indexterm>
 
       <para>

@@ -8306,12 +8304,12 @@
 
       <indexterm>
         <primary>indexes</primary>
-        <secondary>and <literal>LIKE</literal></secondary>
+        <secondary>and LIKE</secondary>
       </indexterm>
 
       <indexterm>
         <primary>wildcards</primary>
-        <secondary>and <literal>LIKE</literal></secondary>
+        <secondary>and LIKE</secondary>
       </indexterm>
 
       <para>

@@ -8371,7 +8369,7 @@
 
       <indexterm>
         <primary>indexes</primary>
-        <secondary>and <literal>IS NULL</literal></secondary>
+        <secondary>and IS NULL</secondary>
       </indexterm>
 
       <para>

@@ -9749,13 +9747,13 @@
       </indexterm>
 
       <indexterm>
-        <primary><command>mysqld</command> server</primary>
+        <primary>&lt;command&gt;mysqld&lt;/command&gt; server</primary>
         <secondary>buffer sizes</secondary>
       </indexterm>
 
       <indexterm>
         <primary>buffer sizes</primary>
-        <secondary><command>mysqld</command> server</secondary>
+        <secondary>&lt;command&gt;mysqld&lt;/command&gt; server</secondary>
       </indexterm>
 
       <indexterm>

@@ -9772,12 +9770,12 @@
 </programlisting>
 
       <indexterm>
-        <primary><command>mysqld</command> options</primary>
+        <primary>&lt;command&gt;mysqld&lt;/command&gt; options</primary>
       </indexterm>
 
       <indexterm>
         <primary>variables</primary>
-        <secondary><command>mysqld</command></secondary>
+        <secondary>&lt;command&gt;mysqld&lt;/command&gt;</secondary>
       </indexterm>
 
       <para>

@@ -10171,7 +10169,7 @@
       </indexterm>
 
       <indexterm>
-        <primary><literal>SELECT</literal></primary>
+        <primary>SELECT</primary>
         <secondary>Query Cache</secondary>
       </indexterm>
 

@@ -10611,7 +10609,7 @@
           <para>
             For expert advice on configuring the query cache subscribe
             to the MySQL Enterprise Monitor. For more information see
-            <ulink url="&base-url-enterprise;advisors.html" />.
+            <ulink url="&base-url-enterprise;advisors.html"/>.
           </para>
 
         </formalpara>

@@ -10805,7 +10803,7 @@
             suffer. Advice on avoiding this problem is provided to
             subscribers to the MySQL Enterprise Monitor. For more
             information see
-            <ulink url="&base-url-enterprise;advisors.html" />.
+            <ulink url="&base-url-enterprise;advisors.html"/>.
           </para>
 
         </formalpara>

@@ -14720,7 +14718,7 @@
               <literal>tmp_table_size</literal> based on actual table
               usage. For more information about the MySQL Enterprise
               Monitor please see
-              <ulink url="&base-url-enterprise;advisors.html" />.
+              <ulink url="&base-url-enterprise;advisors.html"/>.
             </para>
 
           </formalpara>


Modified: trunk/refman-5.0/precision-math.xml
===================================================================
--- trunk/refman-5.0/precision-math.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/precision-math.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 5; 804 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="precision-math">
 
   <title>Precision Math</title>


Modified: trunk/refman-5.0/preface.xml
===================================================================
--- trunk/refman-5.0/preface.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/preface.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 5; 769 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <preface id="preface">
 
   <title>Preface</title>


Modified: trunk/refman-5.0/releasenotes-cs-5.0-core.xml
===================================================================
--- trunk/refman-5.0/releasenotes-cs-5.0-core.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/releasenotes-cs-5.0-core.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 6, Lines Added: 8, Lines Deleted: 15; 2378 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <!-- 
 
 WARNING: 

@@ -34,8 +32,7 @@
 
   <section id="releasenotes-cs-5-0-45">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.45:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.45:mysqld:all"/>
 
     <para role="release-level">
       This is a bugfix release for the current production release

@@ -48,8 +45,7 @@
 
   <section id="releasenotes-cs-5-0-41">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.41:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.41:mysqld:all"/>
 
     <para role="release-level">
       This is a bugfix release for the current production release

@@ -62,8 +58,7 @@
 
   <section id="releasenotes-cs-5-0-37">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.37:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.37:mysqld:all"/>
 
     <para role="release-level">
       This is a bugfix release for the current production release

@@ -76,8 +71,7 @@
 
   <section id="releasenotes-cs-5-0-33">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.33:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.33:mysqld:all"/>
 
     <para role="release-level">
       This is a bugfix release for the current production release

@@ -97,8 +91,7 @@
 
   <section id="releasenotes-cs-5-0-27">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.27:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.27:mysqld:all"/>
 
     <para role="release-level">
       This is a bugfix release for the current production release


Modified: trunk/refman-5.0/releasenotes-cs.xml
===================================================================
--- trunk/refman-5.0/releasenotes-cs.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/releasenotes-cs.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 6; 1152 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <appendix id="releasenotes-cs">
 
   <title>MySQL Community Server Enhancements and Release Notes</title>

@@ -73,6 +71,6 @@
     type, see <xref linkend="installation-version"/>.
   </para>
 
-  <xi:include href="dynxml-local-releasenotes-cs-5.0.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-local-releasenotes-cs-5.0.xml"/>
 
 </appendix>


Modified: trunk/refman-5.0/releasenotes-es-5.0-core.xml
===================================================================
--- trunk/refman-5.0/releasenotes-es-5.0-core.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/releasenotes-es-5.0-core.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 17, Lines Added: 19, Lines Deleted: 37; 5670 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <!-- 
 
 WARNING: 

@@ -40,8 +38,7 @@
 
   <section id="releasenotes-es-5-0-52">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.52:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.52:mysqld:all"/>
 
     <para>
       This section documents all changes and bugfixes that have been

@@ -60,8 +57,7 @@
 
   <section id="releasenotes-es-5-0-50">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.50:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.50:mysqld:all"/>
 
     <para>
       This section documents all changes and bugfixes that have been

@@ -80,8 +76,7 @@
 
   <section id="releasenotes-es-5-0-48">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.48:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.48:mysqld:all"/>
 
     <para>
       This section documents all changes and bugfixes that have been

@@ -100,8 +95,7 @@
 
   <section id="releasenotes-es-5-0-46">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.46:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.46:mysqld:all"/>
 
     <para>
       This section documents all changes and bugfixes that have been

@@ -120,8 +114,7 @@
 
   <section id="releasenotes-es-5-0-44sp1">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.44sp1:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.44sp1:mysqld:all"/>
 
     <para>
       This section documents all changes and bug fixes that have been

@@ -134,8 +127,7 @@
 
   <section id="releasenotes-es-5-0-44">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.44:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.44:mysqld:all"/>
 
     <para>
       This section documents all changes and bug fixes that have been

@@ -148,8 +140,7 @@
 
   <section id="releasenotes-es-5-0-42">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.42:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.42:mysqld:all"/>
 
     <para>
       This section documents all changes and bug fixes that have been

@@ -162,8 +153,7 @@
 
   <section id="releasenotes-es-5-0-40">
 
-    <title condition="dynamic:changelog:vertitle"
-    role="5.0.40:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.40:mysqld:all"/>
 
     <para>
       This section documents all changes and bug fixes that have been

@@ -176,8 +166,7 @@
 
   <section id="releasenotes-es-5-0-38">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.38:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.38:mysqld:all"/>
 
     <para>
       This section documents all changes and bug fixes that have been

@@ -190,8 +179,7 @@
 
   <section id="releasenotes-es-5-0-36sp1">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.36sp1:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.36sp1:mysqld:all"/>
 
     <para>
       This section documents all changes and bug fixes that have been

@@ -204,8 +192,7 @@
 
   <section id="releasenotes-es-5-0-36">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.36:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.36:mysqld:all"/>
 
     <para>
       This section documents all changes and bug fixes that have been

@@ -218,8 +205,7 @@
 
   <section id="releasenotes-es-5-0-34">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.34:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.34:mysqld:all"/>
 
     <para>
       This section documents all changes and bug fixes that have been

@@ -232,8 +218,7 @@
 
   <section id="releasenotes-es-5-0-32">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.32:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.32:mysqld:all"/>
 
     <para>
       This section documents all changes and bug fixes that have been

@@ -246,8 +231,7 @@
 
   <section id="releasenotes-es-5-0-30sp1">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.30sp1:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.30sp1:mysqld:all"/>
 
     <para>
       This section documents all changes and bug fixes that have been

@@ -260,8 +244,7 @@
 
   <section id="releasenotes-es-5-0-30">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.30:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.30:mysqld:all"/>
 
     <para>
       This section documents all changes and bug fixes that have been

@@ -274,8 +257,7 @@
 
   <section id="releasenotes-es-5-0-28">
 
-    <title condition="dynamic:changelog:vertitle"
-      role="5.0.28:mysqld:all"/>
+    <title condition="dynamic:changelog:vertitle" role="5.0.28:mysqld:all"/>
 
     <para role="release-level">
       This is the first <emphasis>MySQL Enterprise Server</emphasis>


Modified: trunk/refman-5.0/releasenotes-es.xml
===================================================================
--- trunk/refman-5.0/releasenotes-es.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/releasenotes-es.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 6; 1129 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <appendix id="releasenotes-es">
 
   <title>MySQL Enterprise Release Notes</title>

@@ -96,6 +94,6 @@
     type, see <xref linkend="installation-version"/>.
   </para>
 
-  <xi:include href="dynxml-local-releasenotes-es-5.0.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dynxml-local-releasenotes-es-5.0.xml"/>
 
 </appendix>


Modified: trunk/refman-5.0/replication-configuration.xml
===================================================================
--- trunk/refman-5.0/replication-configuration.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/replication-configuration.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 20, Lines Added: 27, Lines Deleted: 45; 8000 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="replication-configuration">
 
   <title>Replication Configuration</title>

@@ -124,8 +122,7 @@
         <para>
           You must configure the master to support the binary log and
           configure a unique ID. See
-          <xref
-            linkend="replication-howto-masterbaseconfig"/>.
+          <xref linkend="replication-howto-masterbaseconfig"/>.
         </para>
       </listitem>
 

@@ -133,8 +130,7 @@
         <para>
           You must configure a unique ID for each slave that you want to
           connect to the Master. See
-          <xref
-    linkend="replication-howto-slavebaseconfig"/>.
+          <xref linkend="replication-howto-slavebaseconfig"/>.
         </para>
       </listitem>
 

@@ -145,8 +141,7 @@
           master. You will need this information when configuring the
           slave so that the slave knows where within the binary log to
           start executing events. See
-          <xref
-      linkend="replication-howto-masterstatus"/>.
+          <xref linkend="replication-howto-masterstatus"/>.
         </para>
       </listitem>
 

@@ -156,9 +151,8 @@
           synchronize your slave with this base data, then you will need
           to create a data snapshot of your database. You can create a
           snapshot using <literal>mysqldump</literal> (see
-          <xref
-    linkend="replication-howto-mysqldump"/>) or by
-          copying the data files directly (see
+          <xref linkend="replication-howto-mysqldump"/>) or by copying
+          the data files directly (see
           <xref linkend="replication-howto-rawdata"/>).
         </para>
       </listitem>

@@ -208,8 +202,7 @@
           If you are setting up additional slaves to an existing
           replication environment then you can setup the slaves without
           affecting the master. See
-          <xref
-    linkend="replication-howto-additionalslaves"/>.
+          <xref linkend="replication-howto-additionalslaves"/>.
         </para>
       </listitem>
 

@@ -499,10 +492,8 @@
         If you have existing data that needs be to synchronized with the
         slave before you start replication, leave the client running so
         that the lock remains in place and then proceed to
-        <xref
-      linkend="replication-howto-mysqldump"/>, or
-        <xref
-        linkend="replication-howto-rawdata"/>.
+        <xref linkend="replication-howto-mysqldump"/>, or
+        <xref linkend="replication-howto-rawdata"/>.
       </para>
 
       <para>

@@ -549,8 +540,7 @@
             record the binary log details for use when starting up the
             slave. The point in time of your snapshot and the binary log
             position must match. See
-            <xref
-      linkend="replication-howto-masterstatus"/>.
+            <xref linkend="replication-howto-masterstatus"/>.
           </para>
         </listitem>
 

@@ -562,7 +552,7 @@
             For example:
           </para>
 
-<programlisting>shell&gt; mysqldump --all-databases --lock-all-tables >dbdump.db</programlisting>
+<programlisting>shell&gt; mysqldump --all-databases --lock-all-tables &gt;dbdump.db</programlisting>
         </listitem>
 
         <listitem>

@@ -574,7 +564,7 @@
             process.
           </para>
 
-<programlisting>shell&gt; mysqldump --all-databases --master-data >dbdump.db</programlisting>
+<programlisting>shell&gt; mysqldump --all-databases --master-data &gt;dbdump.db</programlisting>
         </listitem>
 
       </itemizedlist>

@@ -668,7 +658,7 @@
 
         <listitem>
           <para>
-            The master&apos;s binary log files.
+            The master's binary log files.
           </para>
         </listitem>
 

@@ -689,7 +679,7 @@
 
         <listitem>
           <para>
-            Acquire a read lock and get the master&apos;s status. See
+            Acquire a read lock and get the master's status. See
             <xref linkend="replication-howto-masterstatus"/>.
           </para>
         </listitem>

@@ -736,7 +726,7 @@
 
         <listitem>
           <para>
-            Acquire a read lock and get the master&apos;s status. See
+            Acquire a read lock and get the master's status. See
             <xref linkend="replication-howto-masterstatus"/>.
           </para>
         </listitem>

@@ -817,16 +807,14 @@
         <listitem>
           <para>
             Setup a user, see
-            <xref
-    linkend="replication-howto-repuser"/>.
+            <xref linkend="replication-howto-repuser"/>.
           </para>
         </listitem>
 
         <listitem>
           <para>
             Obtain the master status information. See
-            <xref
-  linkend="replication-howto-masterstatus"/>.
+            <xref linkend="replication-howto-masterstatus"/>.
           </para>
         </listitem>
 

@@ -841,8 +829,7 @@
         <listitem>
           <para>
             On the slave, edit the MySQL configuration. See
-            <xref
-linkend="replication-howto-slavebaseconfig"/>.
+            <xref linkend="replication-howto-slavebaseconfig"/>.
           </para>
         </listitem>
 

@@ -899,8 +886,7 @@
             If you have not already configured the
             <option>server-id</option> and binary logging, you will need
             to shutdown your master to configure these options. See
-            <xref
-  linkend="replication-howto-masterbaseconfig"/>.
+            <xref linkend="replication-howto-masterbaseconfig"/>.
           </para>
 
           <para>

@@ -911,8 +897,7 @@
             taking the database down, updating the configuration and
             taking a snapshot. For information on how to create a
             snapshot using raw data files, see
-            <xref
-    linkend="replication-howto-rawdata"/>.
+            <xref linkend="replication-howto-rawdata"/>.
           </para>
         </listitem>
 

@@ -922,9 +907,8 @@
             master status (see
             <xref linkend="replication-howto-masterstatus"/>) and then
             use <literal>mysqldump</literal> to take a snapshot (see
-            <xref
-  linkend="replication-howto-mysqldump"/>) or take a
-            raw snapshot of the live database using the guide in
+            <xref linkend="replication-howto-mysqldump"/>) or take a raw
+            snapshot of the live database using the guide in
             <xref linkend="replication-howto-rawdata"/>.
           </para>
         </listitem>

@@ -933,16 +917,14 @@
           <para>
             With the MySQL master running, create a user to be used by
             the slave when connecting to the master during replication.
-            See <xref
-    linkend="replication-howto-repuser"/>.
+            See <xref linkend="replication-howto-repuser"/>.
           </para>
         </listitem>
 
         <listitem>
           <para>
             Update the configuration of the slave, see
-            <xref
-  linkend="replication-howto-slavebaseconfig"/>.
+            <xref linkend="replication-howto-slavebaseconfig"/>.
           </para>
         </listitem>
 

@@ -2808,7 +2790,7 @@
         basic information about connected slaves:
       </para>
 
-<programlisting>mysql> SHOW SLAVE HOSTS;
+<programlisting>mysql&gt; SHOW SLAVE HOSTS;
 +-----------+--------+------+-------------------+-----------+
 | Server_id | Host   | Port | Rpl_recovery_rank | Master_id |
 +-----------+--------+------+-------------------+-----------+


Modified: trunk/refman-5.0/replication-implementation.xml
===================================================================
--- trunk/refman-5.0/replication-implementation.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/replication-implementation.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 5; 873 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="replication-implementation">
 
   <title>Replication Implementation Overview</title>


Modified: trunk/refman-5.0/replication-notes.xml
===================================================================
--- trunk/refman-5.0/replication-notes.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/replication-notes.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 7; 1229 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="replication-notes">
 
   <title>Replication Notes and Tips</title>

@@ -32,12 +30,12 @@
     </indexterm>
 
     <indexterm>
-      <primary><filename>my.cnf</filename> file</primary>
+      <primary>&lt;filename&gt;my.cnf&lt;/filename&gt; file</primary>
     </indexterm>
 
     <indexterm>
       <primary>files</primary>
-      <secondary><filename>my.cnf</filename></secondary>
+      <secondary>&lt;filename&gt;my.cnf&lt;/filename&gt;</secondary>
     </indexterm>
 
     <para>


Modified: trunk/refman-5.0/replication-solutions.xml
===================================================================
--- trunk/refman-5.0/replication-solutions.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/replication-solutions.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 15, Lines Added: 26, Lines Deleted: 54; 8969 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="replication-solutions">
 
   <title>Replication Solutions</title>

@@ -18,8 +16,7 @@
   <para>
     For information on using replication in a backup environment,
     including notes on the setup, backup procedure, and files to backup,
-    see <xref
-      linkend="replication-solutions-backups"/>.
+    see <xref linkend="replication-solutions-backups"/>.
   </para>
 
   <para>

@@ -30,15 +27,13 @@
   <para>
     Using replication as a scale-out solution requires some changes in
     the logic and operation of applications that use the solution. See
-    <xref
-    linkend="replication-solutions-scaleout"/>.
+    <xref linkend="replication-solutions-scaleout"/>.
   </para>
 
   <para>
     For performance or data distribution reasons you may want to
     replicate different databases to different replication slaves. See
-    <xref
-    linkend="replication-solutions-partitioning"/>
+    <xref linkend="replication-solutions-partitioning"/>
   </para>
 
   <para>

@@ -53,8 +48,7 @@
   <para>
     For guidance on switching masters, or converting slaves into masters
     as part of an emergency failover solution, see
-    <xref
-  linkend="replication-solutions-switch"/>.
+    <xref linkend="replication-solutions-switch"/>.
   </para>
 
   <para>

@@ -88,9 +82,7 @@
       If you are using replication as a solution to enable you to backup
       the data on the master, and the size of your database is not too
       large, then the <literal>mysqldump</literal> tool may be suitable.
-      See
-      <xref
-        linkend="replication-solutions-backups-mysqldump"/>.
+      See <xref linkend="replication-solutions-backups-mysqldump"/>.
     </para>
 
     <para>

@@ -99,9 +91,7 @@
       instead. Using the raw data files option also means that you can
       backup the binary and relay logs that will enable you to recreate
       the slave in the event of a slave failure. For more information,
-      see
-      <xref
-        linkend="replication-solutions-backups-rawdata"/>.
+      see <xref linkend="replication-solutions-backups-rawdata"/>.
     </para>
 
     <section id="replication-solutions-backups-mysqldump">

@@ -151,12 +141,11 @@
             Run <command>mysqldump</command> to dump your databases. You
             may either select databases to be dumped, or dump all
             databases. For more information see
-            <xref
-    linkend="mysqldump"/>. For example, to dump all
+            <xref linkend="mysqldump"/>. For example, to dump all
             databases:
           </para>
 
-<programlisting>shell&gt; mysqldump --all-databases >fulldb.dump</programlisting>
+<programlisting>shell&gt; mysqldump --all-databases &gt;fulldb.dump</programlisting>
         </listitem>
 
         <listitem>

@@ -184,8 +173,7 @@
         slave is unable to keep up you may want to add another server
         and distribute the backup process. For an example of how to
         configure this scenario, see
-        <xref
-          linkend="replication-solutions-partitioning"/>.
+        <xref linkend="replication-solutions-partitioning"/>.
       </para>
 
     </section>

@@ -303,10 +291,9 @@
       that you can take advantage of different engine types for
       different replication scenarios. For example, in a typical
       scaleout scenario (see
-      <xref
-  linkend="replication-solutions-scaleout"/>), you want to
-      use <literal>InnoDB</literal> tables on the master to take
-      advantage of the transactional functionality, but use
+      <xref linkend="replication-solutions-scaleout"/>), you want to use
+      <literal>InnoDB</literal> tables on the master to take advantage
+      of the transactional functionality, but use
       <literal>MyISAM</literal> on the slaves where transaction support
       is not required because the data is only read. When using
       replication in a data logging environment you may want to use the

@@ -462,17 +449,14 @@
       over the replication slaves, while still allowing your web servers
       to communicate with the replication master when a write is
       required. You can see a sample replication layout for this
-      scenario in <xref
-    linkend="figure_replication-scaleout"/>.
+      scenario in <xref linkend="figure_replication-scaleout"/>.
     </para>
 
     <figure id="figure_replication-scaleout">
       <title>Using replication to improve the performance during scaleout</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-              fileref="../refman-common/images/published/scaleout.png"
-              format="PNG" lang="en"/>
+          <imagedata fileref="../refman-common/images/published/scaleout.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Using replication to improve the performance

@@ -574,9 +558,7 @@
       <title>Using replication to replicate separate DBs to multiple hosts</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-              fileref="../refman-common/images/published/multi-db.png"
-              format="PNG" lang="en"/>
+          <imagedata fileref="../refman-common/images/published/multi-db.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Using replication to replicate separate DBs

@@ -595,9 +577,8 @@
 
     <para>
       For example, to support the separation as shown in
-      <xref
-    linkend="figure_replication-multi-db"/>, you would
-      configure each slave as follows before enabling replication using
+      <xref linkend="figure_replication-multi-db"/>, you would configure
+      each slave as follows before enabling replication using
       <literal>START SLAVE</literal>:
     </para>
 

@@ -697,17 +678,14 @@
       to replicate to only one slave, and for the remaining slaves to
       connect to this primary slave for their individual replication
       requirements. A sample of this structure is shown in
-      <xref
-        linkend="figure_replication-performance"/>.
+      <xref linkend="figure_replication-performance"/>.
     </para>
 
     <figure id="figure_replication-performance">
       <title>Using an additional replication host to improve performance</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-              fileref="../refman-common/images/published/submaster-performance.png"
-              format="PNG" lang="en"/>
+          <imagedata fileref="../refman-common/images/published/submaster-performance.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Using an additional replication host to

@@ -843,17 +821,14 @@
       <literal>STOP SLAVE</literal>; <literal>RESET MASTER</literal>,
       and <literal>CHANGE MASTER TO</literal> statement on the other
       slaves. For example, assume that you have the structure shown in
-      <xref
-              linkend="figure_replication-redundancy-before"/>.
+      <xref linkend="figure_replication-redundancy-before"/>.
     </para>
 
     <figure id="figure_replication-redundancy-before">
       <title>Redundancy using replication, initial structure</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-                  fileref="../refman-common/images/published/redundancy-before.png"
-                  format="PNG" lang="en"/>
+          <imagedata fileref="../refman-common/images/published/redundancy-before.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Redundancy using replication, initial

@@ -947,17 +922,14 @@
 
     <para>
       The resulting server structure is shown in
-      <xref
-              linkend="figure_replication-redundancy-after"/>.
+      <xref linkend="figure_replication-redundancy-after"/>.
     </para>
 
     <figure id="figure_replication-redundancy-after">
       <title>Redundancy using replication, after master failure</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-                  fileref="../refman-common/images/published/redundancy-after.png"
-                  format="PNG" lang="en"/>
+          <imagedata fileref="../refman-common/images/published/redundancy-after.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Redundancy using replication, after master


Modified: trunk/refman-5.0/replication-topology.xml
===================================================================
--- trunk/refman-5.0/replication-topology.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/replication-topology.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 7, Lines Added: 10, Lines Deleted: 23; 3939 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="replication-topology">
 
   <title>Replication Topologies</title>

@@ -37,9 +35,7 @@
       <title>Replication with a single slave</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-            fileref="../refman-common/images/published/slave-single.png"
-            format="PNG" lang="en"/>
+          <imagedata fileref="../refman-common/images/published/slave-single.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Replication with a single slave</phrase>

@@ -61,9 +57,7 @@
       <title>Replication with multiple slaves</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-            fileref="../refman-common/images/published/slaves-multiple.png"
-            format="PNG" lang="en"/>
+          <imagedata fileref="../refman-common/images/published/slaves-multiple.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Replication with a multiple slaves</phrase>

@@ -85,9 +79,7 @@
       <title>Replication with twin masters</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-            fileref="../refman-common/images/published/twinmaster.png"
-            format="PNG" lang="en"/>
+          <imagedata fileref="../refman-common/images/published/twinmaster.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Replication with twin masters</phrase>

@@ -173,7 +165,7 @@
         For additional information about
         <literal>auto_increment_increment</literal> and
         <literal>auto_increment_offset</literal>, see
-        <xref linkend="server-system-variables" />.
+        <xref linkend="server-system-variables"/>.
       </para>
 
     </section>

@@ -192,17 +184,14 @@
       It is safe to connect servers in a circular master/slave
       relationship if you use the <option>--log-slave-updates</option>
       option. That means that you can create a setup as shown in
-      <xref
-        linkend="figure_replication-multimaster-chain"/>.
+      <xref linkend="figure_replication-multimaster-chain"/>.
     </para>
 
     <figure id="figure_replication-multimaster-circular">
       <title>Replication with multiple masters in a circular topology</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-            fileref="../refman-common/images/published/multimaster-circular.png"
-            format="PNG" lang="en"/>
+          <imagedata fileref="../refman-common/images/published/multimaster-circular.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Replication with multiple masters in a

@@ -246,9 +235,7 @@
       <title>Replication with multiple masters in a chain topology</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-            fileref="../refman-common/images/published/multimaster-chain.png"
-            format="PNG" lang="en"/>
+          <imagedata fileref="../refman-common/images/published/multimaster-chain.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Replication with multiple masters in a chain


Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/replication.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 5; 789 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="replication">
 
   <title>Replication</title>


Modified: trunk/refman-5.0/reserved-new-5.0.xml
===================================================================
--- trunk/refman-5.0/reserved-new-5.0.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/reserved-new-5.0.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 723 bytes

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<!DOCTYPE para PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <!-- START_OF_NEW_RESERVED_WORDS_INFO -->
 <!-- DO NOT EDIT THIS FILE. It is generated automatically. -->
 <!-- To regenerate, use ../tools/make-reserved-words-new.rb -->


Modified: trunk/refman-5.0/reservedwords.xml
===================================================================
--- trunk/refman-5.0/reservedwords.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/reservedwords.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 721 bytes

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE informaltable PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
+<!DOCTYPE informaltable PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
 <!-- START_OF_RESERVED_WORDS -->
 <!-- DO NOT EDIT THIS FILE. It is generated automatically. -->
 <!-- To regenerate, use ../tools/update-reserved-words.pl -->


Modified: trunk/refman-5.0/restrictions.xml
===================================================================
--- trunk/refman-5.0/restrictions.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/restrictions.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 5; 808 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <appendix id="restrictions">
 
   <title>Limits and Restrictions</title>


Modified: trunk/refman-5.0/se-archive.xml
===================================================================
--- trunk/refman-5.0/se-archive.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/se-archive.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 6; 988 bytes

@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="archive-storage-engine">
 
   <title>The <literal>ARCHIVE</literal> Storage Engine</title>
 
   <indexterm>
-    <primary><literal>ARCHIVE</literal> storage engine</primary>
+    <primary>ARCHIVE storage engine</primary>
   </indexterm>
 
   <indexterm>


Modified: trunk/refman-5.0/se-bdb.xml
===================================================================
--- trunk/refman-5.0/se-bdb.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/se-bdb.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 9; 1436 bytes

@@ -1,31 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="bdb-storage-engine">
 
   <title>The <literal>BDB</literal> (<literal>BerkeleyDB</literal>) Storage
     Engine</title>
 
   <indexterm>
-    <primary><literal>BDB</literal> storage engine</primary>
+    <primary>BDB storage engine</primary>
   </indexterm>
 
   <indexterm>
-    <primary><literal>BerkeleyDB</literal> storage engine</primary>
+    <primary>BerkeleyDB storage engine</primary>
   </indexterm>
 
   <indexterm>
     <primary>tables</primary>
-    <secondary><literal>BDB</literal></secondary>
+    <secondary>BDB</secondary>
   </indexterm>
 
   <indexterm>
     <primary>tables</primary>
-    <secondary><literal>Berkeley DB</literal></secondary>
+    <secondary>Berkeley DB</secondary>
   </indexterm>
 
   <para>


Modified: trunk/refman-5.0/se-blackhole.xml
===================================================================
--- trunk/refman-5.0/se-blackhole.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/se-blackhole.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 6; 1002 bytes

@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="blackhole-storage-engine">
 
   <title>The <literal>BLACKHOLE</literal> Storage Engine</title>
 
   <indexterm>
-    <primary><literal>BLACKHOLE</literal> storage engine</primary>
+    <primary>BLACKHOLE storage engine</primary>
   </indexterm>
 
   <indexterm>


Modified: trunk/refman-5.0/se-csv.xml
===================================================================
--- trunk/refman-5.0/se-csv.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/se-csv.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 6; 960 bytes

@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="csv-storage-engine">
 
   <title>The <literal>CSV</literal> Storage Engine</title>
 
   <indexterm>
-    <primary><literal>CSV</literal> storage engine</primary>
+    <primary>CSV storage engine</primary>
   </indexterm>
 
   <indexterm>


Modified: trunk/refman-5.0/se-example.xml
===================================================================
--- trunk/refman-5.0/se-example.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/se-example.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 6; 988 bytes

@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="example-storage-engine">
 
   <title>The <literal>EXAMPLE</literal> Storage Engine</title>
 
   <indexterm>
-    <primary><literal>EXAMPLE</literal> storage engine</primary>
+    <primary>EXAMPLE storage engine</primary>
   </indexterm>
 
   <indexterm>


Modified: trunk/refman-5.0/se-federated.xml
===================================================================
--- trunk/refman-5.0/se-federated.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/se-federated.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 6; 1002 bytes

@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="federated-storage-engine">
 
   <title>The <literal>FEDERATED</literal> Storage Engine</title>
 
   <indexterm>
-    <primary><literal>FEDERATED</literal> storage engine</primary>
+    <primary>FEDERATED storage engine</primary>
   </indexterm>
 
   <indexterm>


Modified: trunk/refman-5.0/se-innodb.xml
===================================================================
--- trunk/refman-5.0/se-innodb.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/se-innodb.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 8; 1458 bytes

@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="innodb">
 
   <title>The <literal>InnoDB</literal> Storage Engine</title>
 
   <indexterm>
-    <primary><literal>InnoDB</literal> storage engine</primary>
+    <primary>InnoDB storage engine</primary>
   </indexterm>
 
   <indexterm>
     <primary>tables</primary>
-    <secondary><literal>InnoDB</literal></secondary>
+    <secondary>InnoDB</secondary>
   </indexterm>
 
   <remark role="todo">

@@ -5194,7 +5192,7 @@
         For optimization recommendations geared to your specific
         circumstances subscribe to the MySQL Enterprise Monitor. For
         more information see
-        <ulink url="&base-url-enterprise;advisors.html" />.
+        <ulink url="&base-url-enterprise;advisors.html"/>.
       </para>
 
     </formalpara>


Modified: trunk/refman-5.0/se-memory.xml
===================================================================
--- trunk/refman-5.0/se-memory.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/se-memory.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 9; 1457 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="memory-storage-engine">
 
   <title>The <literal>MEMORY</literal> (<literal>HEAP</literal>) Storage Engine</title>

@@ -15,21 +13,21 @@
   </remark>
 
   <indexterm>
-    <primary><literal>HEAP</literal> storage engine</primary>
+    <primary>HEAP storage engine</primary>
   </indexterm>
 
   <indexterm>
-    <primary><literal>MEMORY</literal> storage engine</primary>
+    <primary>MEMORY storage engine</primary>
   </indexterm>
 
   <indexterm>
     <primary>tables</primary>
-    <secondary><literal>MEMORY</literal></secondary>
+    <secondary>MEMORY</secondary>
   </indexterm>
 
   <indexterm>
     <primary>tables</primary>
-    <secondary><literal>HEAP</literal></secondary>
+    <secondary>HEAP</secondary>
   </indexterm>
 
   <para>


Modified: trunk/refman-5.0/se-merge.xml
===================================================================
--- trunk/refman-5.0/se-merge.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/se-merge.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 7; 1119 bytes

@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="merge-storage-engine">
 
   <title>The <literal>MERGE</literal> Storage Engine</title>
 
   <indexterm>
-    <primary><literal>MERGE</literal> storage engine</primary>
+    <primary>MERGE storage engine</primary>
   </indexterm>
 
   <indexterm>
     <primary>tables</primary>
-    <secondary><literal>MERGE</literal></secondary>
+    <secondary>MERGE</secondary>
   </indexterm>
 
   <indexterm>


Modified: trunk/refman-5.0/se-myisam.xml
===================================================================
--- trunk/refman-5.0/se-myisam.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/se-myisam.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 8; 1339 bytes

@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="myisam-storage-engine">
 
   <title>The <literal>MyISAM</literal> Storage Engine</title>
 
   <indexterm>
-    <primary><literal>MyISAM</literal> storage engine</primary>
+    <primary>MyISAM storage engine</primary>
   </indexterm>
 
   <indexterm>
     <primary>tables</primary>
-    <secondary><literal>MyISAM</literal></secondary>
+    <secondary>MyISAM</secondary>
   </indexterm>
 
   <para>

@@ -863,7 +861,7 @@
       </indexterm>
 
       <indexterm>
-        <primary><command>myisampack</command></primary>
+        <primary>&lt;command&gt;myisampack&lt;/command&gt;</primary>
       </indexterm>
 
       <para>


Modified: trunk/refman-5.0/spatial-extensions.xml
===================================================================
--- trunk/refman-5.0/spatial-extensions.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/spatial-extensions.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 6; 1215 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="spatial-extensions">
 
   <title>Spatial Extensions</title>

@@ -3332,7 +3330,7 @@
               earlier in the chapter includes the specific conditions
               that cause an instance of that class to be classified as
               not simple. (See
-              <xref linkend= "gis-geometry-class-hierarchy"/>.)
+              <xref linkend="gis-geometry-class-hierarchy"/>.)
             </para>
 
             <remark role="help-description-end"/>


Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/sql-syntax.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 28, Lines Added: 85, Lines Deleted: 87; 14827 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="sql-syntax">
 
   <title>SQL Statement Syntax</title>

@@ -1174,7 +1172,7 @@
       </para>
 
       <indexterm>
-        <primary><command>mysqladmin</command></primary>
+        <primary>&lt;command&gt;mysqladmin&lt;/command&gt;</primary>
       </indexterm>
 
       <para>

@@ -2120,7 +2118,7 @@
         <listitem>
           <para>
             <indexterm>
-              <primary><literal>_rowid</literal></primary>
+              <primary>_rowid</primary>
             </indexterm>
 
             If a <literal>PRIMARY KEY</literal> or

@@ -2178,13 +2176,13 @@
         <listitem>
           <para>
             <indexterm>
-              <primary><literal>NULL</literal> values</primary>
+              <primary>NULL values</primary>
               <secondary>and indexes</secondary>
             </indexterm>
 
             <indexterm>
               <primary>indexes</primary>
-              <secondary>and <literal>NULL</literal> values</secondary>
+              <secondary>and NULL values</secondary>
             </indexterm>
 
             In MySQL &current-series;, only the

@@ -2222,23 +2220,23 @@
           </para>
 
           <indexterm>
-            <primary><literal>BLOB</literal> columns</primary>
+            <primary>BLOB columns</primary>
             <secondary>indexing</secondary>
           </indexterm>
 
           <indexterm>
             <primary>indexes</primary>
-            <secondary>and <literal>BLOB</literal> columns</secondary>
+            <secondary>and BLOB columns</secondary>
           </indexterm>
 
           <indexterm>
-            <primary><literal>TEXT</literal> columns</primary>
+            <primary>TEXT columns</primary>
             <secondary>indexing</secondary>
           </indexterm>
 
           <indexterm>
             <primary>indexes</primary>
-            <secondary>and <literal>TEXT</literal> columns</secondary>
+            <secondary>and TEXT columns</secondary>
           </indexterm>
 
           <para>

@@ -3216,7 +3214,7 @@
         </para>
 
         <indexterm>
-          <primary><command>myisampack</command></primary>
+          <primary>&lt;command&gt;myisampack&lt;/command&gt;</primary>
         </indexterm>
 
         <para>

@@ -3384,7 +3382,7 @@
       </para>
 
       <indexterm>
-        <primary><command>mysqladmin</command></primary>
+        <primary>&lt;command&gt;mysqladmin&lt;/command&gt;</primary>
       </indexterm>
 
       <para>

@@ -5422,7 +5420,7 @@
       </para>
 
       <indexterm>
-        <primary><command>mysqlimport</command></primary>
+        <primary>&lt;command&gt;mysqlimport&lt;/command&gt;</primary>
       </indexterm>
 
       <para>

@@ -6898,7 +6896,7 @@
 
       <para>
         <indexterm>
-          <primary><literal>DUAL</literal></primary>
+          <primary>DUAL</primary>
         </indexterm>
 
         You are allowed to specify <literal>DUAL</literal> as a dummy

@@ -7169,7 +7167,7 @@
         <listitem>
           <para>
             <indexterm>
-              <primary><literal>GROUP BY</literal></primary>
+              <primary>GROUP BY</primary>
               <secondary>extensions to standard SQL</secondary>
             </indexterm>
 

@@ -11158,8 +11156,8 @@
 Returns the string str with all occurrences of the string from_str
 replaced by the string to_str. REPLACE() performs a case-sensitive
 match when searching for from_str.
-example: mysql> SELECT REPLACE('www.mysql.com', 'w', 'Ww');
-        -> 'WwWwWw.mysql.com'
+example: mysql&gt; SELECT REPLACE('www.mysql.com', 'w', 'Ww');
+        -&gt; 'WwWwWw.mysql.com'
 </programlisting>
         </listitem>
 

@@ -12837,7 +12835,7 @@
         </para>
 
 <programlisting>
-mysql> <userinput>XA RECOVER;</userinput>
+mysql&gt; <userinput>XA RECOVER;</userinput>
 +----------+--------------+--------------+--------+
 | formatID | gtrid_length | bqual_length | data   |
 +----------+--------------+--------------+--------+

@@ -14008,7 +14006,7 @@
           <secondary>setting</secondary>
         </indexterm>
 
-        <formalpara role = "mnmas">
+        <formalpara role="mnmas">
 
           <title>MySQL Enterprise</title>
 

@@ -15836,123 +15834,123 @@
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>AUTOCOMMIT</literal></secondary>
+        <primary>SET</primary>
+        <secondary>AUTOCOMMIT</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>BIG_TABLES</literal></secondary>
+        <primary>SET</primary>
+        <secondary>BIG_TABLES</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>CHARACTER SET</literal></secondary>
+        <primary>SET</primary>
+        <secondary>CHARACTER SET</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>FOREIGN_KEY_CHECKS</literal></secondary>
+        <primary>SET</primary>
+        <secondary>FOREIGN_KEY_CHECKS</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>IDENTITY</literal></secondary>
+        <primary>SET</primary>
+        <secondary>IDENTITY</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>INSERT_ID</literal></secondary>
+        <primary>SET</primary>
+        <secondary>INSERT_ID</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>LAST_INSERT_ID</literal></secondary>
+        <primary>SET</primary>
+        <secondary>LAST_INSERT_ID</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>NAMES</literal></secondary>
+        <primary>SET</primary>
+        <secondary>NAMES</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>ONE_SHOT</literal></secondary>
+        <primary>SET</primary>
+        <secondary>ONE_SHOT</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>PROFILING</literal></secondary>
+        <primary>SET</primary>
+        <secondary>PROFILING</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>PROFILING_HISTORY_SIZE</literal></secondary>
+        <primary>SET</primary>
+        <secondary>PROFILING_HISTORY_SIZE</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>SQL_AUTO_IS_NULL</literal></secondary>
+        <primary>SET</primary>
+        <secondary>SQL_AUTO_IS_NULL</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>SQL_BIG_SELECTS</literal></secondary>
+        <primary>SET</primary>
+        <secondary>SQL_BIG_SELECTS</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>SQL_BUFFER_SELECT</literal></secondary>
+        <primary>SET</primary>
+        <secondary>SQL_BUFFER_SELECT</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>SQL_LOG_BIN</literal></secondary>
+        <primary>SET</primary>
+        <secondary>SQL_LOG_BIN</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>SQL_LOG_OFF</literal></secondary>
+        <primary>SET</primary>
+        <secondary>SQL_LOG_OFF</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>SQL_LOG_UPDATE</literal></secondary>
+        <primary>SET</primary>
+        <secondary>SQL_LOG_UPDATE</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>SQL_NOTES</literal></secondary>
+        <primary>SET</primary>
+        <secondary>SQL_NOTES</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>SQL_QUOTE_SHOW_CREATE</literal></secondary>
+        <primary>SET</primary>
+        <secondary>SQL_QUOTE_SHOW_CREATE</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>SQL_SAFE_UPDATES</literal></secondary>
+        <primary>SET</primary>
+        <secondary>SQL_SAFE_UPDATES</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>SQL_SELECT_LIMIT</literal></secondary>
+        <primary>SET</primary>
+        <secondary>SQL_SELECT_LIMIT</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>SQL_WARNINGS</literal></secondary>
+        <primary>SET</primary>
+        <secondary>SQL_WARNINGS</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>TIMESTAMP</literal></secondary>
+        <primary>SET</primary>
+        <secondary>TIMESTAMP</secondary>
       </indexterm>
 
       <indexterm>
-        <primary><literal>SET</literal></primary>
-        <secondary><literal>UNIQUE_CHECKS</literal></secondary>
+        <primary>SET</primary>
+        <secondary>UNIQUE_CHECKS</secondary>
       </indexterm>
 
       <remark role="help-category" condition="Data Manipulation"/>

@@ -16524,7 +16522,7 @@
           </para>
 
 <programlisting>
-mysql> <userinput>SET ONE_SHOT max_allowed_packet = 1;</userinput>
+mysql&gt; <userinput>SET ONE_SHOT max_allowed_packet = 1;</userinput>
 ERROR 1382 (HY000): The 'SET ONE_SHOT' syntax is reserved for purposes
 internal to the MySQL server
 </programlisting>

@@ -16539,11 +16537,11 @@
           </para>
 
 <programlisting>
-mysql> <userinput>SET ONE_SHOT character_set_connection = latin5;</userinput>
+mysql&gt; <userinput>SET ONE_SHOT character_set_connection = latin5;</userinput>
 
-mysql> <userinput>SET ONE_SHOT collation_connection = latin5_turkish_ci;</userinput>
+mysql&gt; <userinput>SET ONE_SHOT collation_connection = latin5_turkish_ci;</userinput>
 
-mysql> <userinput>SHOW VARIABLES LIKE '%_connection';</userinput>
+mysql&gt; <userinput>SHOW VARIABLES LIKE '%_connection';</userinput>
 +--------------------------+-------------------+
 | Variable_name            | Value             |
 +--------------------------+-------------------+

@@ -16551,7 +16549,7 @@
 | collation_connection     | latin5_turkish_ci |
 +--------------------------+-------------------+
 
-mysql> <userinput>SHOW VARIABLES LIKE '%_connection';</userinput>
+mysql&gt; <userinput>SHOW VARIABLES LIKE '%_connection';</userinput>
 +--------------------------+-------------------+
 | Variable_name            | Value             |
 +--------------------------+-------------------+

@@ -18899,7 +18897,7 @@
     -&gt;   <userinput>END//</userinput>
 Query OK, 0 rows affected (0.00 sec)
 
-mysql> <userinput>SHOW PROCEDURE CODE p1//</userinput>
+mysql&gt; <userinput>SHOW PROCEDURE CODE p1//</userinput>
 +-----+----------------------------------------+
 | Pos | Instruction                            |
 +-----+----------------------------------------+

@@ -19052,7 +19050,7 @@
           the <literal>Info</literal> field.
         </para>
 
-        <formalpara role = "mnmas">
+        <formalpara role="mnmas">
 
           <title>MySQL Enterprise</title>
 

@@ -19088,7 +19086,7 @@
         </para>
 
 <programlisting>
-mysql> SHOW FULL PROCESSLIST\G
+mysql&gt; SHOW FULL PROCESSLIST\G
 *************************** 1. row ***************************
 Id: 1
 User: system user

@@ -19594,7 +19592,7 @@
 </programlisting>
 
         <indexterm>
-          <primary><command>mysqladmin</command></primary>
+          <primary>&lt;command&gt;mysqladmin&lt;/command&gt;</primary>
         </indexterm>
 
         <remark role="help-description-begin"/>

@@ -20327,7 +20325,7 @@
 </programlisting>
 
         <indexterm>
-          <primary><command>mysqladmin</command></primary>
+          <primary>&lt;command&gt;mysqladmin&lt;/command&gt;</primary>
         </indexterm>
 
         <remark role="help-description-begin"/>

@@ -20780,7 +20778,7 @@
         </indexterm>
 
         <indexterm>
-          <primary><command>mysqladmin</command></primary>
+          <primary>&lt;command&gt;mysqladmin&lt;/command&gt;</primary>
         </indexterm>
 
         <indexterm>

@@ -21098,7 +21096,7 @@
         </indexterm>
 
         <indexterm>
-          <primary><command>mysqladmin</command></primary>
+          <primary>&lt;command&gt;mysqladmin&lt;/command&gt;</primary>
         </indexterm>
 
         <remark role="help-topic" condition="KILL"/>

@@ -21841,7 +21839,7 @@
           server). The output looks like this:
 
 <programlisting>
-            mysql> <userinput>SHOW SLAVE HOSTS</userinput>;
+            mysql&gt; <userinput>SHOW SLAVE HOSTS</userinput>;
             +------------+-----------+------+-----------+
             | Server_id  | Host      | Port | Master_id |
             +------------+-----------+------+-----------+

@@ -23334,7 +23332,7 @@
 
         <para>
           <indexterm>
-            <primary><literal>PREPARE</literal></primary>
+            <primary>PREPARE</primary>
           </indexterm>
 
           <literal>PREPARE <replaceable>stmt_name</replaceable> FROM

@@ -23390,7 +23388,7 @@
 
         <para>
           <indexterm>
-            <primary><literal>EXECUTE</literal> statement</primary>
+            <primary>EXECUTE statement</primary>
           </indexterm>
 
           <literal>EXECUTE <replaceable>stmt_name</replaceable> [USING

@@ -23434,11 +23432,11 @@
 
         <para>
           <indexterm>
-            <primary><literal>DEALLOCATE PREPARE</literal></primary>
+            <primary>DEALLOCATE PREPARE</primary>
           </indexterm>
 
           <indexterm>
-            <primary><literal>DROP PREPARE</literal></primary>
+            <primary>DROP PREPARE</primary>
           </indexterm>
 
           <literal>{DEALLOCATE | DROP} PREPARE


Modified: trunk/refman-5.0/storage-engines.xml
===================================================================
--- trunk/refman-5.0/storage-engines.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/storage-engines.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 3, Lines Added: 25, Lines Deleted: 27; 4201 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="storage-engines">
 
   <title>Storage Engines</title>

@@ -31,51 +29,51 @@
   </indexterm>
 
   <indexterm>
-    <primary><literal>BDB</literal> storage engine</primary>
+    <primary>BDB storage engine</primary>
   </indexterm>
 
   <indexterm>
-    <primary><literal>BerkeleyDB</literal> storage engine</primary>
+    <primary>BerkeleyDB storage engine</primary>
   </indexterm>
 
   <indexterm>
-    <primary><literal>HEAP</literal> storage engine</primary>
+    <primary>HEAP storage engine</primary>
   </indexterm>
 
   <indexterm>
-    <primary><literal>InnoDB</literal> storage engine</primary>
+    <primary>InnoDB storage engine</primary>
   </indexterm>
 
   <indexterm>
-    <primary><literal>MEMORY</literal> storage engine</primary>
+    <primary>MEMORY storage engine</primary>
   </indexterm>
 
   <indexterm>
-    <primary><literal>MERGE</literal> storage engine</primary>
+    <primary>MERGE storage engine</primary>
   </indexterm>
 
   <indexterm>
-    <primary><literal>MyISAM</literal> storage engine</primary>
+    <primary>MyISAM storage engine</primary>
   </indexterm>
 
   <indexterm>
-    <primary><literal>EXAMPLE</literal> storage engine</primary>
+    <primary>EXAMPLE storage engine</primary>
   </indexterm>
 
   <indexterm>
-    <primary><literal>CSV</literal> storage engine</primary>
+    <primary>CSV storage engine</primary>
   </indexterm>
 
   <indexterm>
-    <primary><literal>ARCHIVE</literal> storage engine</primary>
+    <primary>ARCHIVE storage engine</primary>
   </indexterm>
 
   <indexterm>
-    <primary><literal>BLACKHOLE</literal> storage engine</primary>
+    <primary>BLACKHOLE storage engine</primary>
   </indexterm>
 
   <indexterm>
-    <primary><literal>FEDERATED</literal> storage engine</primary>
+    <primary>FEDERATED storage engine</primary>
   </indexterm>
 
   <para>

@@ -399,24 +397,24 @@
 
   </itemizedlist>
 
-  <xi:include href="se-myisam.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="se-myisam.xml"/>
 
-  <xi:include href="se-innodb.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="se-innodb.xml"/>
 
-  <xi:include href="se-merge.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="se-merge.xml"/>
 
-  <xi:include href="se-memory.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="se-memory.xml"/>
 
-  <xi:include href="se-bdb.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="se-bdb.xml"/>
 
-  <xi:include href="se-example.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="se-example.xml"/>
 
-  <xi:include href="se-federated.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="se-federated.xml"/>
 
-  <xi:include href="se-archive.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="se-archive.xml"/>
 
-  <xi:include href="se-csv.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="se-csv.xml"/>
 
-  <xi:include href="se-blackhole.xml"  xmlns:xi="http://www.w3.org/2001/XInclude"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="se-blackhole.xml"/>
 
 </chapter>


Modified: trunk/refman-5.0/stored-procedures.xml
===================================================================
--- trunk/refman-5.0/stored-procedures.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/stored-procedures.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 6; 1148 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="stored-procedures">
 
   <title>Stored Procedures and Functions</title>

@@ -41,7 +39,7 @@
     <para>
       For expert advice on using stored procedures and functions
       subscribe to the MySQL Enterprise Monitor. For more information
-      see <ulink url="&base-url-enterprise;advisors.html" />.
+      see <ulink url="&base-url-enterprise;advisors.html"/>.
     </para>
 
   </formalpara>


Modified: trunk/refman-5.0/triggers.xml
===================================================================
--- trunk/refman-5.0/triggers.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/triggers.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 6; 1082 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="triggers">
 
   <title>Triggers</title>

@@ -106,7 +104,7 @@
       <para>
         For expert advice on creating triggers subscribe to the MySQL
         Enterprise Monitor. For more information see,
-        <ulink url="&base-url-enterprise;advisors.html" />.
+        <ulink url="&base-url-enterprise;advisors.html"/>.
       </para>
 
     </formalpara>


Modified: trunk/refman-5.0/tutorial.xml
===================================================================
--- trunk/refman-5.0/tutorial.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/tutorial.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 6; 951 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="tutorial">
 
   <title>Tutorial</title>

@@ -3636,7 +3634,7 @@
       </indexterm>
 
       <indexterm>
-        <primary>&lt;&lt;</primary>
+        <primary>&amp;lt;&amp;lt;</primary>
       </indexterm>
 
       <indexterm>


Modified: trunk/refman-5.0/using-mysql-programs.xml
===================================================================
--- trunk/refman-5.0/using-mysql-programs.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/using-mysql-programs.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 5; 834 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="using-mysql-programs">
 
   <title>Using MySQL Programs</title>


Modified: trunk/refman-5.0/views.xml
===================================================================
--- trunk/refman-5.0/views.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/views.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 5; 759 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <chapter id="views">
 
   <title>Views</title>


Modified: trunk/refman-5.0/windows-config-wizard.xml
===================================================================
--- trunk/refman-5.0/windows-config-wizard.xml	2007-11-02 08:26:40 UTC (rev 8485)
+++ trunk/refman-5.0/windows-config-wizard.xml	2007-11-02 08:30:18 UTC (rev 8486)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 5; 860 bytes

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
-]>
+<!-- Current MySQL Version - update with new releases -->]>
 <section id="windows-config-wizard" role="cses">
 
   <title>Using the Configuration Wizard</title>


Thread
svn commit - mysqldoc@docsrva: r8486 - trunk/refman-5.0jon2 Nov