List:Commits« Previous MessageNext Message »
From:jon Date:October 31 2007 12:46pm
Subject:svn commit - mysqldoc@docsrva: r8430 - in trunk: it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-5.2 refman-6.0
View as plain text  
Author: jstephens
Date: 2007-10-31 13:46:46 +0100 (Wed, 31 Oct 2007)
New Revision: 8430

Log:

Fixed some search-and-replace oopsies



Modified:
   trunk/it/refman-5.1/mysql-cluster-ccsg-merge-temp.xml
   trunk/it/refman-5.1/mysql-cluster-configuration.xml
   trunk/it/refman-5.1/mysql-cluster-disk-data.xml
   trunk/it/refman-5.1/mysql-cluster-multi-computer.xml
   trunk/pt/refman-5.1/mysql-cluster-ccsg-merge-temp.xml
   trunk/pt/refman-5.1/mysql-cluster-configuration.xml
   trunk/pt/refman-5.1/mysql-cluster-disk-data.xml
   trunk/pt/refman-5.1/mysql-cluster-multi-computer.xml
   trunk/refman-4.1/mysql-cluster-configuration.xml
   trunk/refman-4.1/mysql-cluster-multi-computer.xml
   trunk/refman-5.0/mysql-cluster-configuration.xml
   trunk/refman-5.0/mysql-cluster-multi-computer.xml
   trunk/refman-5.1/mysql-cluster-ccsg-merge-temp.xml
   trunk/refman-5.1/mysql-cluster-configuration.xml
   trunk/refman-5.1/mysql-cluster-disk-data.xml
   trunk/refman-5.1/mysql-cluster-multi-computer.xml
   trunk/refman-5.2/mysql-cluster-configuration.xml
   trunk/refman-5.2/mysql-cluster-disk-data.xml
   trunk/refman-5.2/mysql-cluster-multi-computer.xml
   trunk/refman-6.0/mysql-cluster-configuration.xml
   trunk/refman-6.0/mysql-cluster-disk-data.xml
   trunk/refman-6.0/mysql-cluster-multi-computer.xml


Modified: trunk/it/refman-5.1/mysql-cluster-ccsg-merge-temp.xml
===================================================================
--- trunk/it/refman-5.1/mysql-cluster-ccsg-merge-temp.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/it/refman-5.1/mysql-cluster-ccsg-merge-temp.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 15, Lines Added: 20, Lines Deleted: 20; 6683 bytes

@@ -2390,7 +2390,7 @@
 
 <programlisting>
 # Options affecting ndbd processes on all data nodes:
-[ndbddefault]    
+[ndbd default]    
 NoOfReplicas=2    # Number of replicas
 DataMemory=80M    # How much memory to allocate for data storage
 IndexMemory=18M   # How much memory to allocate for index storage

@@ -3285,14 +3285,14 @@
 # If you don't know the hostname for your machine, use localhost.
 # The DataDir parameter also has a default value, but it is recommended to
 # set it explicitly.
-# Note: DB, API, and MGM are aliases for NDBD, MYSQLD, and NDB_MGMD
-# respectively. DB and API are deprecated and should not be used in new
-# installations.
-[ndbddefault]
+# Note: [db], [api], and [mgm] are aliases for [ndbd], [mysqld], and [ndb_mgmd],
+# respectively. [db] is deprecated and should not be used in new installations.
+
+[ndbd default]
 NoOfReplicas= 1
 
 [mysqld  default]
-[NDB_MGMD default]
+[ndb_mgmd default]
 [tcp default]
 
 [ndb_mgmd]

@@ -3695,11 +3695,11 @@
           default value section, simply add the word
           <literal>default</literal> to the section name. For example,
           an <literal>[ndbd]</literal> section contains parameters that
-          apply to a particular data node, whereas an <literal>[NDBD
+          apply to a particular data node, whereas an <literal>[ndbd
           default]</literal> section contains parameters that apply to
           all data nodes. Suppose that all data nodes should use the
           same data memory size. To configure them all, create an
-          <literal>[ndbddefault]</literal> section that contains a
+          <literal>[ndbd default]</literal> section that contains a
           <literal>DataMemory</literal> line to specify the data memory
           size.
         </para>

@@ -3719,7 +3719,7 @@
 # The first MySQL Server can be started from any host. The second
 # can be started only on the host mysqld_5.mysql.com
 
-[ndbddefault]
+[ndbd default]
 NoOfReplicas= 2
 DataDir= /var/lib/mysql-cluster
 

@@ -4385,7 +4385,7 @@
         </indexterm>
 
         <para>
-          The <literal>[ndbd]</literal> and [ndbddefault] sections are
+          The <literal>[ndbd]</literal> and<literal>[ndbd default]</literal>sections are
           used to configure the behavior of the cluster's data nodes.
           There are many parameters which control buffer sizes, pool
           sizes, timeouts, and so forth. The only mandatory parameters

@@ -4405,7 +4405,7 @@
           <listitem>
             <para>
               The parameter <literal>NoOfReplicas</literal>, which must
-              be defined in the [ndbddefault] section, as it is common
+              be defined in the<literal>[ndbd default]</literal>section, as it is common
               to all Cluster data nodes.
             </para>
           </listitem>

@@ -4413,7 +4413,7 @@
         </itemizedlist>
 
         <para>
-          Most data node parameters are set in the <literal>[NDBD
+          Most data node parameters are set in the <literal>[ndbd
           default]</literal> section. Only those parameters explicitly
           stated as being able to set local values are allowed to be
           changed in the <literal>[ndbd]</literal> section. Where

@@ -4554,7 +4554,7 @@
 
             <para>
               This global parameter can be set only in the
-              <literal>[ndbddefault]</literal> section, and defines the
+              <literal>[ndbd default]</literal> section, and defines the
               number of replicas for each table stored in the cluster.
               This parameter also specifies the size of node groups. A
               node group is a set of nodes all storing the same

@@ -4874,7 +4874,7 @@
             <para>
               This parameter determines how much memory is allocated for
               strings such as table names, and is specified in an
-              <literal>[ndbd]</literal> or <literal>[NDBD
+              <literal>[ndbd]</literal> or <literal>[ndbd
               default]</literal> section of the
               <filename>config.ini</filename> file. A value between
               <literal>0</literal> and <literal>100</literal> inclusive

@@ -7028,7 +7028,7 @@
             <para>
               <literal>MemReportFrequency</literal> is not a required
               parameter. If used, it can be set for all cluster data
-              nodes in the <literal>[ndbddefault]</literal> section of
+              nodes in the <literal>[ndbd default]</literal> section of
               <filename>config.ini</filename>, and can also be set or
               overridden for individual data nodes in the corresponding
               <literal>[ndbd]</literal> sections of the configuration

@@ -7548,7 +7548,7 @@
 
         <para>
           It is also possible to change the default values for these
-          parameters by setting them in the <literal>[TCP
+          parameters by setting them in the <literal>[tcp
           default]</literal> section.
         </para>
 

@@ -8267,7 +8267,7 @@
         </indexterm>
 
         <indexterm>
-          <primary><literal>[NDBD_DEFAULT]</literal> (MySQL Cluster)</primary>
+          <primary><literal>[ndbd_DEFAULT]</literal> (MySQL Cluster)</primary>
         </indexterm>
 
         <para>

@@ -21531,7 +21531,7 @@
         <filename>config.ini</filename> includes the following:
         
         <programlisting>
-[ndbddefault]
+[ndbd default]
 DataDir= /data0
 </programlisting>
         

@@ -21732,7 +21732,7 @@
           <para>
             This determines the amount of space used for caching pages
             on disk, and is set in the <literal>[ndbd]</literal> or
-            <literal>[ndbddefault]</literal> section of the
+            <literal>[ndbd default]</literal> section of the
             <filename>config.ini</filename> file. It is measured in
             bytes. Each page takes up 32 KB. This means that Cluster
             Disk Data storage always uses <replaceable>N</replaceable> *

@@ -21755,7 +21755,7 @@
             buffers, disk operations (such as page requests and wait
             queues), and metadata for tablespaces, log file groups,
             <literal>UNDO</literal> files, and data files. It can be set
-            in the <literal>[ndbd]</literal> or <literal>[NDBD
+            in the <literal>[ndbd]</literal> or <literal>[ndbd
             default]</literal> section of the
             <filename>config.ini</filename> configuration file, and is
             measured in bytes.


Modified: trunk/it/refman-5.1/mysql-cluster-configuration.xml
===================================================================
--- trunk/it/refman-5.1/mysql-cluster-configuration.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/it/refman-5.1/mysql-cluster-configuration.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 12, Lines Added: 17, Lines Deleted: 17; 5599 bytes

@@ -210,14 +210,14 @@
 # If you don't know the hostname for your machine, use localhost.
 # The DataDir parameter also has a default value, but it is recommended to
 # set it explicitly.
-# Note: DB, API, and MGM are aliases for NDBD, MYSQLD, and NDB_MGMD
-# respectively. DB and API are deprecated and should not be used in new
-# installations.
-[ndbddefault]
+# Note: [db], [api], and [mgm] are aliases for [ndbd], [mysqld], and [ndb_mgmd],
+# respectively. [db] is deprecated and should not be used in new installations.
+
+[ndbd default]
 NoOfReplicas= 1
 
 [mysqld  default]
-[NDB_MGMD default]
+[ndb_mgmd default]
 [tcp default]
 
 [ndb_mgmd]

@@ -580,7 +580,7 @@
         and values. One deviation from the standard INI format is that
         the parameter name and value can be separated by a colon
         (<quote><literal>:</literal></quote>) as well as the equals sign
-        (<quote><literal>=</literal></quote>). Another deviation is that
+        (<quote><literal>=</literal></quote>); however, the equals sign is preferred. Another deviation is that
         sections are not uniquely identified by section name. Instead,
         unique sections (such as two different nodes of the same type)
         are identified by a unique ID specified as a parameter within

@@ -593,10 +593,10 @@
         default value section, simply add the word
         <literal>default</literal> to the section name. For example, an
         <literal>[ndbd]</literal> section contains parameters that apply
-        to a particular data node, whereas an <literal>[NDBD
+        to a particular data node, whereas an <literal>[ndbd
         default]</literal> section contains parameters that apply to all
         data nodes. Suppose that all data nodes should use the same data
-        memory size. To configure them all, create an <literal>[NDBD
+        memory size. To configure them all, create an <literal>[ndbd
         default]</literal> section that contains a
         <literal>DataMemory</literal> line to specify the data memory
         size.

@@ -617,7 +617,7 @@
 # The first MySQL Server can be started from any host. The second
 # can be started only on the host mysqld_5.mysql.com
 
-[ndbddefault]
+[ndbd default]
 NoOfReplicas= 2
 DataDir= /var/lib/mysql-cluster
 

@@ -1275,7 +1275,7 @@
       </indexterm>
 
       <para>
-        The <literal>[ndbd]</literal> and [ndbddefault] sections are
+        The <literal>[ndbd]</literal> and<literal>[ndbd default]</literal>sections are
         used to configure the behavior of the cluster's data nodes.
         There are many parameters which control buffer sizes, pool
         sizes, timeouts, and so forth. The only mandatory parameters

@@ -1295,7 +1295,7 @@
         <listitem>
           <para>
             The parameter <literal>NoOfReplicas</literal>, which must be
-            defined in the [ndbddefault] section, as it is common to
+            defined in the<literal>[ndbd default]</literal>section, as it is common to
             all Cluster data nodes.
           </para>
         </listitem>

@@ -1303,7 +1303,7 @@
       </itemizedlist>
 
       <para>
-        Most data node parameters are set in the <literal>[NDBD
+        Most data node parameters are set in the <literal>[ndbd
         default]</literal> section. Only those parameters explicitly
         stated as being able to set local values are allowed to be
         changed in the <literal>[ndbd]</literal> section. Where present,

@@ -1444,7 +1444,7 @@
           </para>
 
           <para>
-            This global parameter can be set only in the <literal>[NDBD
+            This global parameter can be set only in the <literal>[ndbd
             default]</literal> section, and defines the number of
             replicas for each table stored in the cluster. This
             parameter also specifies the size of node groups. A node

@@ -1764,7 +1764,7 @@
           <para>
             This parameter determines how much memory is allocated for
             strings such as table names, and is specified in an
-            <literal>[ndbd]</literal> or <literal>[NDBD
+            <literal>[ndbd]</literal> or <literal>[ndbd
             default]</literal> section of the
             <filename>config.ini</filename> file. A value between
             <literal>0</literal> and <literal>100</literal> inclusive is

@@ -4073,7 +4073,7 @@
           <para>
             <literal>MemReportFrequency</literal> is not a required
             parameter. If used, it can be set for all cluster data nodes
-            in the <literal>[ndbddefault]</literal> section of
+            in the <literal>[ndbd default]</literal> section of
             <filename>config.ini</filename>, and can also be set or
             overridden for individual data nodes in the corresponding
             <literal>[ndbd]</literal> sections of the configuration

@@ -4726,7 +4726,7 @@
 
       <para>
         It is also possible to change the default values for these
-        parameters by setting them in the <literal>[TCP
+        parameters by setting them in the <literal>[tcp
         default]</literal> section.
       </para>
 

@@ -5440,7 +5440,7 @@
       </indexterm>
 
       <indexterm>
-        <primary><literal>[NDBD_DEFAULT]</literal> (MySQL Cluster)</primary>
+        <primary><literal>[ndbd_DEFAULT]</literal> (MySQL Cluster)</primary>
       </indexterm>
 
       <para>


Modified: trunk/it/refman-5.1/mysql-cluster-disk-data.xml
===================================================================
--- trunk/it/refman-5.1/mysql-cluster-disk-data.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/it/refman-5.1/mysql-cluster-disk-data.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1494 bytes

@@ -526,7 +526,7 @@
         <filename>config.ini</filename> includes the following:
         
         <programlisting>
-[ndbddefault]
+[ndbd default]
 DataDir= /data0
 </programlisting>
         

@@ -725,7 +725,7 @@
           <para>
             This determines the amount of space used for caching pages
             on disk, and is set in the <literal>[ndbd]</literal> or
-            <literal>[ndbddefault]</literal> section of the
+            <literal>[ndbd default]</literal> section of the
             <filename>config.ini</filename> file. It is measured in
             bytes. Each page takes up 32 KB. This means that Cluster
             Disk Data storage always uses <replaceable>N</replaceable> *

@@ -748,7 +748,7 @@
             buffers, disk operations (such as page requests and wait
             queues), and metadata for tablespaces, log file groups,
             <literal>UNDO</literal> files, and data files. It can be set
-            in the <literal>[ndbd]</literal> or <literal>[NDBD
+            in the <literal>[ndbd]</literal> or <literal>[ndbd
             default]</literal> section of the
             <filename>config.ini</filename> configuration file, and is
             measured in bytes.


Modified: trunk/it/refman-5.1/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/it/refman-5.1/mysql-cluster-multi-computer.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/it/refman-5.1/mysql-cluster-multi-computer.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 611 bytes

@@ -1037,7 +1037,7 @@
 
 <programlisting>
 # Options affecting ndbd processes on all data nodes:
-[ndbddefault]    
+[ndbd default]    
 NoOfReplicas=2    # Number of replicas
 DataMemory=80M    # How much memory to allocate for data storage
 IndexMemory=18M   # How much memory to allocate for index storage


Modified: trunk/pt/refman-5.1/mysql-cluster-ccsg-merge-temp.xml
===================================================================
--- trunk/pt/refman-5.1/mysql-cluster-ccsg-merge-temp.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/pt/refman-5.1/mysql-cluster-ccsg-merge-temp.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 15, Lines Added: 20, Lines Deleted: 20; 6683 bytes

@@ -2390,7 +2390,7 @@
 
 <programlisting>
 # Options affecting ndbd processes on all data nodes:
-[ndbddefault]    
+[ndbd default]    
 NoOfReplicas=2    # Number of replicas
 DataMemory=80M    # How much memory to allocate for data storage
 IndexMemory=18M   # How much memory to allocate for index storage

@@ -3285,14 +3285,14 @@
 # If you don't know the hostname for your machine, use localhost.
 # The DataDir parameter also has a default value, but it is recommended to
 # set it explicitly.
-# Note: DB, API, and MGM are aliases for NDBD, MYSQLD, and NDB_MGMD
-# respectively. DB and API are deprecated and should not be used in new
-# installations.
-[ndbddefault]
+# Note: [db], [api], and [mgm] are aliases for [ndbd], [mysqld], and [ndb_mgmd],
+# respectively. [db] is deprecated and should not be used in new installations.
+
+[ndbd default]
 NoOfReplicas= 1
 
 [mysqld  default]
-[NDB_MGMD default]
+[ndb_mgmd default]
 [tcp default]
 
 [ndb_mgmd]

@@ -3695,11 +3695,11 @@
           default value section, simply add the word
           <literal>default</literal> to the section name. For example,
           an <literal>[ndbd]</literal> section contains parameters that
-          apply to a particular data node, whereas an <literal>[NDBD
+          apply to a particular data node, whereas an <literal>[ndbd
           default]</literal> section contains parameters that apply to
           all data nodes. Suppose that all data nodes should use the
           same data memory size. To configure them all, create an
-          <literal>[ndbddefault]</literal> section that contains a
+          <literal>[ndbd default]</literal> section that contains a
           <literal>DataMemory</literal> line to specify the data memory
           size.
         </para>

@@ -3719,7 +3719,7 @@
 # The first MySQL Server can be started from any host. The second
 # can be started only on the host mysqld_5.mysql.com
 
-[ndbddefault]
+[ndbd default]
 NoOfReplicas= 2
 DataDir= /var/lib/mysql-cluster
 

@@ -4385,7 +4385,7 @@
         </indexterm>
 
         <para>
-          The <literal>[ndbd]</literal> and [ndbddefault] sections are
+          The <literal>[ndbd]</literal> and<literal>[ndbd default]</literal>sections are
           used to configure the behavior of the cluster's data nodes.
           There are many parameters which control buffer sizes, pool
           sizes, timeouts, and so forth. The only mandatory parameters

@@ -4405,7 +4405,7 @@
           <listitem>
             <para>
               The parameter <literal>NoOfReplicas</literal>, which must
-              be defined in the [ndbddefault] section, as it is common
+              be defined in the<literal>[ndbd default]</literal>section, as it is common
               to all Cluster data nodes.
             </para>
           </listitem>

@@ -4413,7 +4413,7 @@
         </itemizedlist>
 
         <para>
-          Most data node parameters are set in the <literal>[NDBD
+          Most data node parameters are set in the <literal>[ndbd
           default]</literal> section. Only those parameters explicitly
           stated as being able to set local values are allowed to be
           changed in the <literal>[ndbd]</literal> section. Where

@@ -4554,7 +4554,7 @@
 
             <para>
               This global parameter can be set only in the
-              <literal>[ndbddefault]</literal> section, and defines the
+              <literal>[ndbd default]</literal> section, and defines the
               number of replicas for each table stored in the cluster.
               This parameter also specifies the size of node groups. A
               node group is a set of nodes all storing the same

@@ -4874,7 +4874,7 @@
             <para>
               This parameter determines how much memory is allocated for
               strings such as table names, and is specified in an
-              <literal>[ndbd]</literal> or <literal>[NDBD
+              <literal>[ndbd]</literal> or <literal>[ndbd
               default]</literal> section of the
               <filename>config.ini</filename> file. A value between
               <literal>0</literal> and <literal>100</literal> inclusive

@@ -7028,7 +7028,7 @@
             <para>
               <literal>MemReportFrequency</literal> is not a required
               parameter. If used, it can be set for all cluster data
-              nodes in the <literal>[ndbddefault]</literal> section of
+              nodes in the <literal>[ndbd default]</literal> section of
               <filename>config.ini</filename>, and can also be set or
               overridden for individual data nodes in the corresponding
               <literal>[ndbd]</literal> sections of the configuration

@@ -7548,7 +7548,7 @@
 
         <para>
           It is also possible to change the default values for these
-          parameters by setting them in the <literal>[TCP
+          parameters by setting them in the <literal>[tcp
           default]</literal> section.
         </para>
 

@@ -8267,7 +8267,7 @@
         </indexterm>
 
         <indexterm>
-          <primary><literal>[NDBD_DEFAULT]</literal> (MySQL Cluster)</primary>
+          <primary><literal>[ndbd_DEFAULT]</literal> (MySQL Cluster)</primary>
         </indexterm>
 
         <para>

@@ -21531,7 +21531,7 @@
         <filename>config.ini</filename> includes the following:
         
         <programlisting>
-[ndbddefault]
+[ndbd default]
 DataDir= /data0
 </programlisting>
         

@@ -21732,7 +21732,7 @@
           <para>
             This determines the amount of space used for caching pages
             on disk, and is set in the <literal>[ndbd]</literal> or
-            <literal>[ndbddefault]</literal> section of the
+            <literal>[ndbd default]</literal> section of the
             <filename>config.ini</filename> file. It is measured in
             bytes. Each page takes up 32 KB. This means that Cluster
             Disk Data storage always uses <replaceable>N</replaceable> *

@@ -21755,7 +21755,7 @@
             buffers, disk operations (such as page requests and wait
             queues), and metadata for tablespaces, log file groups,
             <literal>UNDO</literal> files, and data files. It can be set
-            in the <literal>[ndbd]</literal> or <literal>[NDBD
+            in the <literal>[ndbd]</literal> or <literal>[ndbd
             default]</literal> section of the
             <filename>config.ini</filename> configuration file, and is
             measured in bytes.


Modified: trunk/pt/refman-5.1/mysql-cluster-configuration.xml
===================================================================
--- trunk/pt/refman-5.1/mysql-cluster-configuration.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/pt/refman-5.1/mysql-cluster-configuration.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 12, Lines Added: 17, Lines Deleted: 17; 5599 bytes

@@ -210,14 +210,14 @@
 # If you don't know the hostname for your machine, use localhost.
 # The DataDir parameter also has a default value, but it is recommended to
 # set it explicitly.
-# Note: DB, API, and MGM are aliases for NDBD, MYSQLD, and NDB_MGMD
-# respectively. DB and API are deprecated and should not be used in new
-# installations.
-[ndbddefault]
+# Note: [db], [api], and [mgm] are aliases for [ndbd], [mysqld], and [ndb_mgmd],
+# respectively. [db] is deprecated and should not be used in new installations.
+
+[ndbd default]
 NoOfReplicas= 1
 
 [mysqld  default]
-[NDB_MGMD default]
+[ndb_mgmd default]
 [tcp default]
 
 [ndb_mgmd]

@@ -580,7 +580,7 @@
         and values. One deviation from the standard INI format is that
         the parameter name and value can be separated by a colon
         (<quote><literal>:</literal></quote>) as well as the equals sign
-        (<quote><literal>=</literal></quote>). Another deviation is that
+        (<quote><literal>=</literal></quote>); however, the equals sign is preferred. Another deviation is that
         sections are not uniquely identified by section name. Instead,
         unique sections (such as two different nodes of the same type)
         are identified by a unique ID specified as a parameter within

@@ -593,10 +593,10 @@
         default value section, simply add the word
         <literal>default</literal> to the section name. For example, an
         <literal>[ndbd]</literal> section contains parameters that apply
-        to a particular data node, whereas an <literal>[NDBD
+        to a particular data node, whereas an <literal>[ndbd
         default]</literal> section contains parameters that apply to all
         data nodes. Suppose that all data nodes should use the same data
-        memory size. To configure them all, create an <literal>[NDBD
+        memory size. To configure them all, create an <literal>[ndbd
         default]</literal> section that contains a
         <literal>DataMemory</literal> line to specify the data memory
         size.

@@ -617,7 +617,7 @@
 # The first MySQL Server can be started from any host. The second
 # can be started only on the host mysqld_5.mysql.com
 
-[ndbddefault]
+[ndbd default]
 NoOfReplicas= 2
 DataDir= /var/lib/mysql-cluster
 

@@ -1275,7 +1275,7 @@
       </indexterm>
 
       <para>
-        The <literal>[ndbd]</literal> and [ndbddefault] sections are
+        The <literal>[ndbd]</literal> and<literal>[ndbd default]</literal>sections are
         used to configure the behavior of the cluster's data nodes.
         There are many parameters which control buffer sizes, pool
         sizes, timeouts, and so forth. The only mandatory parameters

@@ -1295,7 +1295,7 @@
         <listitem>
           <para>
             The parameter <literal>NoOfReplicas</literal>, which must be
-            defined in the [ndbddefault] section, as it is common to
+            defined in the<literal>[ndbd default]</literal>section, as it is common to
             all Cluster data nodes.
           </para>
         </listitem>

@@ -1303,7 +1303,7 @@
       </itemizedlist>
 
       <para>
-        Most data node parameters are set in the <literal>[NDBD
+        Most data node parameters are set in the <literal>[ndbd
         default]</literal> section. Only those parameters explicitly
         stated as being able to set local values are allowed to be
         changed in the <literal>[ndbd]</literal> section. Where present,

@@ -1444,7 +1444,7 @@
           </para>
 
           <para>
-            This global parameter can be set only in the <literal>[NDBD
+            This global parameter can be set only in the <literal>[ndbd
             default]</literal> section, and defines the number of
             replicas for each table stored in the cluster. This
             parameter also specifies the size of node groups. A node

@@ -1764,7 +1764,7 @@
           <para>
             This parameter determines how much memory is allocated for
             strings such as table names, and is specified in an
-            <literal>[ndbd]</literal> or <literal>[NDBD
+            <literal>[ndbd]</literal> or <literal>[ndbd
             default]</literal> section of the
             <filename>config.ini</filename> file. A value between
             <literal>0</literal> and <literal>100</literal> inclusive is

@@ -4073,7 +4073,7 @@
           <para>
             <literal>MemReportFrequency</literal> is not a required
             parameter. If used, it can be set for all cluster data nodes
-            in the <literal>[ndbddefault]</literal> section of
+            in the <literal>[ndbd default]</literal> section of
             <filename>config.ini</filename>, and can also be set or
             overridden for individual data nodes in the corresponding
             <literal>[ndbd]</literal> sections of the configuration

@@ -4726,7 +4726,7 @@
 
       <para>
         It is also possible to change the default values for these
-        parameters by setting them in the <literal>[TCP
+        parameters by setting them in the <literal>[tcp
         default]</literal> section.
       </para>
 

@@ -5440,7 +5440,7 @@
       </indexterm>
 
       <indexterm>
-        <primary><literal>[NDBD_DEFAULT]</literal> (MySQL Cluster)</primary>
+        <primary><literal>[ndbd_DEFAULT]</literal> (MySQL Cluster)</primary>
       </indexterm>
 
       <para>


Modified: trunk/pt/refman-5.1/mysql-cluster-disk-data.xml
===================================================================
--- trunk/pt/refman-5.1/mysql-cluster-disk-data.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/pt/refman-5.1/mysql-cluster-disk-data.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1494 bytes

@@ -526,7 +526,7 @@
         <filename>config.ini</filename> includes the following:
         
         <programlisting>
-[ndbddefault]
+[ndbd default]
 DataDir= /data0
 </programlisting>
         

@@ -725,7 +725,7 @@
           <para>
             This determines the amount of space used for caching pages
             on disk, and is set in the <literal>[ndbd]</literal> or
-            <literal>[ndbddefault]</literal> section of the
+            <literal>[ndbd default]</literal> section of the
             <filename>config.ini</filename> file. It is measured in
             bytes. Each page takes up 32 KB. This means that Cluster
             Disk Data storage always uses <replaceable>N</replaceable> *

@@ -748,7 +748,7 @@
             buffers, disk operations (such as page requests and wait
             queues), and metadata for tablespaces, log file groups,
             <literal>UNDO</literal> files, and data files. It can be set
-            in the <literal>[ndbd]</literal> or <literal>[NDBD
+            in the <literal>[ndbd]</literal> or <literal>[ndbd
             default]</literal> section of the
             <filename>config.ini</filename> configuration file, and is
             measured in bytes.


Modified: trunk/pt/refman-5.1/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/pt/refman-5.1/mysql-cluster-multi-computer.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/pt/refman-5.1/mysql-cluster-multi-computer.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 611 bytes

@@ -1037,7 +1037,7 @@
 
 <programlisting>
 # Options affecting ndbd processes on all data nodes:
-[ndbddefault]    
+[ndbd default]    
 NoOfReplicas=2    # Number of replicas
 DataMemory=80M    # How much memory to allocate for data storage
 IndexMemory=18M   # How much memory to allocate for index storage


Modified: trunk/refman-4.1/mysql-cluster-configuration.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-configuration.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/refman-4.1/mysql-cluster-configuration.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 10, Lines Added: 25, Lines Deleted: 25; 5648 bytes

@@ -175,14 +175,14 @@
 # If you don't know the hostname for your machine, use localhost.
 # The DataDir parameter also has a default value, but it is recommended to
 # set it explicitly.
-# Note: DB, API, and MGM are aliases for NDBD, MYSQLD, and NDB_MGMD
-# respectively. DB and API are deprecated and should not be used in new
-# installations.
-[ndbddefault]
+# Note: [db], [api], and [mgm] are aliases for [ndbd], [mysqld], and [ndb_mgmd],
+# respectively. [db] is deprecated and should not be used in new installations.
+
+[ndbd default]
 NoOfReplicas= 1
 
 [mysqld  default]
-[NDB_MGMD default]
+[ndb_mgmd default]
 [tcp default]
 
 [ndb_mgmd]

@@ -557,11 +557,11 @@
         and values. One deviation from the standard INI format is that
         the parameter name and value can be separated by a colon
         (<quote><literal>:</literal></quote>) as well as the equals sign
-        (<quote><literal>=</literal></quote>). Another deviation is that
-        sections are not uniquely identified by section name. Instead,
-        unique sections (such as two different nodes of the same type)
-        are identified by a unique ID specified as a parameter within
-        the section.
+        (<quote><literal>=</literal></quote>); however, the equals sign
+        is preferred. Another deviation is that sections are not
+        uniquely identified by section name. Instead, unique sections
+        (such as two different nodes of the same type) are identified by
+        a unique ID specified as a parameter within the section.
       </para>
 
       <para>

@@ -570,10 +570,10 @@
         default value section, simply add the word
         <literal>default</literal> to the section name. For example, an
         <literal>[ndbd]</literal> section contains parameters that apply
-        to a particular data node, whereas an <literal>[NDBD
+        to a particular data node, whereas an <literal>[ndbd
         default]</literal> section contains parameters that apply to all
         data nodes. Suppose that all data nodes should use the same data
-        memory size. To configure them all, create an <literal>[NDBD
+        memory size. To configure them all, create an <literal>[ndbd
         default]</literal> section that contains a
         <literal>DataMemory</literal> line to specify the data memory
         size.

@@ -594,7 +594,7 @@
 # The first MySQL Server can be started from any host. The second
 # can be started only on the host mysqld_5.mysql.com
 
-[ndbddefault]
+[ndbd default]
 NoOfReplicas= 2
 DataDir= /var/lib/mysql-cluster
 

@@ -1255,11 +1255,11 @@
       </indexterm>
 
       <para>
-        The <literal>[ndbd]</literal> and [ndbddefault] sections are
-        used to configure the behavior of the cluster's data nodes.
-        There are many parameters which control buffer sizes, pool
-        sizes, timeouts, and so forth. The only mandatory parameters
-        are:
+        The <literal>[ndbd]</literal> and<literal>[ndbd
+        default]</literal>sections are used to configure the behavior of
+        the cluster's data nodes. There are many parameters which
+        control buffer sizes, pool sizes, timeouts, and so forth. The
+        only mandatory parameters are:
       </para>
 
       <itemizedlist>

@@ -1275,15 +1275,15 @@
         <listitem>
           <para>
             The parameter <literal>NoOfReplicas</literal>, which must be
-            defined in the [ndbddefault] section, as it is common to all
-            Cluster data nodes.
+            defined in the<literal>[ndbd default]</literal>section, as
+            it is common to all Cluster data nodes.
           </para>
         </listitem>
 
       </itemizedlist>
 
       <para>
-        Most data node parameters are set in the <literal>[NDBD
+        Most data node parameters are set in the <literal>[ndbd
         default]</literal> section. Only those parameters explicitly
         stated as being able to set local values are allowed to be
         changed in the <literal>[ndbd]</literal> section. Where present,

@@ -1400,7 +1400,7 @@
           </para>
 
           <para>
-            This global parameter can be set only in the <literal>[NDBD
+            This global parameter can be set only in the <literal>[ndbd
             default]</literal> section, and defines the number of
             replicas for each table stored in the cluster. This
             parameter also specifies the size of node groups. A node

@@ -1713,7 +1713,7 @@
           <para>
             This parameter determines how much memory is allocated for
             strings such as table names, and is specified in an
-            <literal>[ndbd]</literal> or <literal>[NDBD
+            <literal>[ndbd]</literal> or <literal>[ndbd
             default]</literal> section of the
             <filename>config.ini</filename> file. A value between
             <literal>0</literal> and <literal>100</literal> inclusive is

@@ -4070,7 +4070,7 @@
 
       <para>
         It is also possible to change the default values for these
-        parameters by setting them in the <literal>[TCP
+        parameters by setting them in the <literal>[tcp
         default]</literal> section.
       </para>
 

@@ -4786,7 +4786,7 @@
       </indexterm>
 
       <indexterm>
-        <primary><literal>[NDBD_DEFAULT]</literal> (MySQL Cluster)</primary>
+        <primary><literal>[ndbd_DEFAULT]</literal> (MySQL Cluster)</primary>
       </indexterm>
 
       <para>


Modified: trunk/refman-4.1/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-multi-computer.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/refman-4.1/mysql-cluster-multi-computer.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 602 bytes

@@ -1015,7 +1015,7 @@
 
 <programlisting>
 # Options affecting ndbd processes on all data nodes:
-[ndbddefault]    
+[ndbd default]    
 NoOfReplicas=2    # Number of replicas
 DataMemory=80M    # How much memory to allocate for data storage
 IndexMemory=18M   # How much memory to allocate for index storage


Modified: trunk/refman-5.0/mysql-cluster-configuration.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-configuration.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/refman-5.0/mysql-cluster-configuration.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 10, Lines Added: 25, Lines Deleted: 25; 5648 bytes

@@ -175,14 +175,14 @@
 # If you don't know the hostname for your machine, use localhost.
 # The DataDir parameter also has a default value, but it is recommended to
 # set it explicitly.
-# Note: DB, API, and MGM are aliases for NDBD, MYSQLD, and NDB_MGMD
-# respectively. DB and API are deprecated and should not be used in new
-# installations.
-[ndbddefault]
+# Note: [db], [api], and [mgm] are aliases for [ndbd], [mysqld], and [ndb_mgmd],
+# respectively. [db] is deprecated and should not be used in new installations.
+
+[ndbd default]
 NoOfReplicas= 1
 
 [mysqld  default]
-[NDB_MGMD default]
+[ndb_mgmd default]
 [tcp default]
 
 [ndb_mgmd]

@@ -545,11 +545,11 @@
         and values. One deviation from the standard INI format is that
         the parameter name and value can be separated by a colon
         (<quote><literal>:</literal></quote>) as well as the equals sign
-        (<quote><literal>=</literal></quote>). Another deviation is that
-        sections are not uniquely identified by section name. Instead,
-        unique sections (such as two different nodes of the same type)
-        are identified by a unique ID specified as a parameter within
-        the section.
+        (<quote><literal>=</literal></quote>); however, the equals sign
+        is preferred. Another deviation is that sections are not
+        uniquely identified by section name. Instead, unique sections
+        (such as two different nodes of the same type) are identified by
+        a unique ID specified as a parameter within the section.
       </para>
 
       <para>

@@ -558,10 +558,10 @@
         default value section, simply add the word
         <literal>default</literal> to the section name. For example, an
         <literal>[ndbd]</literal> section contains parameters that apply
-        to a particular data node, whereas an <literal>[NDBD
+        to a particular data node, whereas an <literal>[ndbd
         default]</literal> section contains parameters that apply to all
         data nodes. Suppose that all data nodes should use the same data
-        memory size. To configure them all, create an <literal>[NDBD
+        memory size. To configure them all, create an <literal>[ndbd
         default]</literal> section that contains a
         <literal>DataMemory</literal> line to specify the data memory
         size.

@@ -582,7 +582,7 @@
 # The first MySQL Server can be started from any host. The second
 # can be started only on the host mysqld_5.mysql.com
 
-[ndbddefault]
+[ndbd default]
 NoOfReplicas= 2
 DataDir= /var/lib/mysql-cluster
 

@@ -1232,11 +1232,11 @@
       </indexterm>
 
       <para>
-        The <literal>[ndbd]</literal> and [ndbddefault] sections are
-        used to configure the behavior of the cluster's data nodes.
-        There are many parameters which control buffer sizes, pool
-        sizes, timeouts, and so forth. The only mandatory parameters
-        are:
+        The <literal>[ndbd]</literal> and<literal>[ndbd
+        default]</literal>sections are used to configure the behavior of
+        the cluster's data nodes. There are many parameters which
+        control buffer sizes, pool sizes, timeouts, and so forth. The
+        only mandatory parameters are:
       </para>
 
       <itemizedlist>

@@ -1252,15 +1252,15 @@
         <listitem>
           <para>
             The parameter <literal>NoOfReplicas</literal>, which must be
-            defined in the [ndbddefault] section, as it is common to all
-            Cluster data nodes.
+            defined in the<literal>[ndbd default]</literal>section, as
+            it is common to all Cluster data nodes.
           </para>
         </listitem>
 
       </itemizedlist>
 
       <para>
-        Most data node parameters are set in the <literal>[NDBD
+        Most data node parameters are set in the <literal>[ndbd
         default]</literal> section. Only those parameters explicitly
         stated as being able to set local values are allowed to be
         changed in the <literal>[ndbd]</literal> section. Where present,

@@ -1377,7 +1377,7 @@
           </para>
 
           <para>
-            This global parameter can be set only in the <literal>[NDBD
+            This global parameter can be set only in the <literal>[ndbd
             default]</literal> section, and defines the number of
             replicas for each table stored in the cluster. This
             parameter also specifies the size of node groups. A node

@@ -1690,7 +1690,7 @@
           <para>
             This parameter determines how much memory is allocated for
             strings such as table names, and is specified in an
-            <literal>[ndbd]</literal> or <literal>[NDBD
+            <literal>[ndbd]</literal> or <literal>[ndbd
             default]</literal> section of the
             <filename>config.ini</filename> file. A value between
             <literal>0</literal> and <literal>100</literal> inclusive is

@@ -4112,7 +4112,7 @@
 
       <para>
         It is also possible to change the default values for these
-        parameters by setting them in the <literal>[TCP
+        parameters by setting them in the <literal>[tcp
         default]</literal> section.
       </para>
 

@@ -4828,7 +4828,7 @@
       </indexterm>
 
       <indexterm>
-        <primary><literal>[NDBD_DEFAULT]</literal> (MySQL Cluster)</primary>
+        <primary><literal>[ndbd_DEFAULT]</literal> (MySQL Cluster)</primary>
       </indexterm>
 
       <para>


Modified: trunk/refman-5.0/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-multi-computer.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/refman-5.0/mysql-cluster-multi-computer.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 602 bytes

@@ -1013,7 +1013,7 @@
 
 <programlisting>
 # Options affecting ndbd processes on all data nodes:
-[ndbddefault]    
+[ndbd default]    
 NoOfReplicas=2    # Number of replicas
 DataMemory=80M    # How much memory to allocate for data storage
 IndexMemory=18M   # How much memory to allocate for index storage


Modified: trunk/refman-5.1/mysql-cluster-ccsg-merge-temp.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-ccsg-merge-temp.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/refman-5.1/mysql-cluster-ccsg-merge-temp.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 15, Lines Added: 20, Lines Deleted: 20; 6674 bytes

@@ -2390,7 +2390,7 @@
 
 <programlisting>
 # Options affecting ndbd processes on all data nodes:
-[ndbddefault]    
+[ndbd default]    
 NoOfReplicas=2    # Number of replicas
 DataMemory=80M    # How much memory to allocate for data storage
 IndexMemory=18M   # How much memory to allocate for index storage

@@ -3285,14 +3285,14 @@
 # If you don't know the hostname for your machine, use localhost.
 # The DataDir parameter also has a default value, but it is recommended to
 # set it explicitly.
-# Note: DB, API, and MGM are aliases for NDBD, MYSQLD, and NDB_MGMD
-# respectively. DB and API are deprecated and should not be used in new
-# installations.
-[ndbddefault]
+# Note: [db], [api], and [mgm] are aliases for [ndbd], [mysqld], and [ndb_mgmd],
+# respectively. [db] is deprecated and should not be used in new installations.
+
+[ndbd default]
 NoOfReplicas= 1
 
 [mysqld  default]
-[NDB_MGMD default]
+[ndb_mgmd default]
 [tcp default]
 
 [ndb_mgmd]

@@ -3695,11 +3695,11 @@
           default value section, simply add the word
           <literal>default</literal> to the section name. For example,
           an <literal>[ndbd]</literal> section contains parameters that
-          apply to a particular data node, whereas an <literal>[NDBD
+          apply to a particular data node, whereas an <literal>[ndbd
           default]</literal> section contains parameters that apply to
           all data nodes. Suppose that all data nodes should use the
           same data memory size. To configure them all, create an
-          <literal>[ndbddefault]</literal> section that contains a
+          <literal>[ndbd default]</literal> section that contains a
           <literal>DataMemory</literal> line to specify the data memory
           size.
         </para>

@@ -3719,7 +3719,7 @@
 # The first MySQL Server can be started from any host. The second
 # can be started only on the host mysqld_5.mysql.com
 
-[ndbddefault]
+[ndbd default]
 NoOfReplicas= 2
 DataDir= /var/lib/mysql-cluster
 

@@ -4385,7 +4385,7 @@
         </indexterm>
 
         <para>
-          The <literal>[ndbd]</literal> and [ndbddefault] sections are
+          The <literal>[ndbd]</literal> and<literal>[ndbd default]</literal>sections are
           used to configure the behavior of the cluster's data nodes.
           There are many parameters which control buffer sizes, pool
           sizes, timeouts, and so forth. The only mandatory parameters

@@ -4405,7 +4405,7 @@
           <listitem>
             <para>
               The parameter <literal>NoOfReplicas</literal>, which must
-              be defined in the [ndbddefault] section, as it is common
+              be defined in the<literal>[ndbd default]</literal>section, as it is common
               to all Cluster data nodes.
             </para>
           </listitem>

@@ -4413,7 +4413,7 @@
         </itemizedlist>
 
         <para>
-          Most data node parameters are set in the <literal>[NDBD
+          Most data node parameters are set in the <literal>[ndbd
           default]</literal> section. Only those parameters explicitly
           stated as being able to set local values are allowed to be
           changed in the <literal>[ndbd]</literal> section. Where

@@ -4554,7 +4554,7 @@
 
             <para>
               This global parameter can be set only in the
-              <literal>[ndbddefault]</literal> section, and defines the
+              <literal>[ndbd default]</literal> section, and defines the
               number of replicas for each table stored in the cluster.
               This parameter also specifies the size of node groups. A
               node group is a set of nodes all storing the same

@@ -4874,7 +4874,7 @@
             <para>
               This parameter determines how much memory is allocated for
               strings such as table names, and is specified in an
-              <literal>[ndbd]</literal> or <literal>[NDBD
+              <literal>[ndbd]</literal> or <literal>[ndbd
               default]</literal> section of the
               <filename>config.ini</filename> file. A value between
               <literal>0</literal> and <literal>100</literal> inclusive

@@ -7028,7 +7028,7 @@
             <para>
               <literal>MemReportFrequency</literal> is not a required
               parameter. If used, it can be set for all cluster data
-              nodes in the <literal>[ndbddefault]</literal> section of
+              nodes in the <literal>[ndbd default]</literal> section of
               <filename>config.ini</filename>, and can also be set or
               overridden for individual data nodes in the corresponding
               <literal>[ndbd]</literal> sections of the configuration

@@ -7548,7 +7548,7 @@
 
         <para>
           It is also possible to change the default values for these
-          parameters by setting them in the <literal>[TCP
+          parameters by setting them in the <literal>[tcp
           default]</literal> section.
         </para>
 

@@ -8267,7 +8267,7 @@
         </indexterm>
 
         <indexterm>
-          <primary><literal>[NDBD_DEFAULT]</literal> (MySQL Cluster)</primary>
+          <primary><literal>[ndbd_DEFAULT]</literal> (MySQL Cluster)</primary>
         </indexterm>
 
         <para>

@@ -21531,7 +21531,7 @@
         <filename>config.ini</filename> includes the following:
         
         <programlisting>
-[ndbddefault]
+[ndbd default]
 DataDir= /data0
 </programlisting>
         

@@ -21732,7 +21732,7 @@
           <para>
             This determines the amount of space used for caching pages
             on disk, and is set in the <literal>[ndbd]</literal> or
-            <literal>[ndbddefault]</literal> section of the
+            <literal>[ndbd default]</literal> section of the
             <filename>config.ini</filename> file. It is measured in
             bytes. Each page takes up 32 KB. This means that Cluster
             Disk Data storage always uses <replaceable>N</replaceable> *

@@ -21755,7 +21755,7 @@
             buffers, disk operations (such as page requests and wait
             queues), and metadata for tablespaces, log file groups,
             <literal>UNDO</literal> files, and data files. It can be set
-            in the <literal>[ndbd]</literal> or <literal>[NDBD
+            in the <literal>[ndbd]</literal> or <literal>[ndbd
             default]</literal> section of the
             <filename>config.ini</filename> configuration file, and is
             measured in bytes.


Modified: trunk/refman-5.1/mysql-cluster-configuration.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-configuration.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/refman-5.1/mysql-cluster-configuration.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 11, Lines Added: 26, Lines Deleted: 26; 6160 bytes

@@ -210,14 +210,14 @@
 # If you don't know the hostname for your machine, use localhost.
 # The DataDir parameter also has a default value, but it is recommended to
 # set it explicitly.
-# Note: DB, API, and MGM are aliases for NDBD, MYSQLD, and NDB_MGMD
-# respectively. DB and API are deprecated and should not be used in new
-# installations.
-[ndbddefault]
+# Note: [db], [api], and [mgm] are aliases for [ndbd], [mysqld], and [ndb_mgmd],
+# respectively. [db] is deprecated and should not be used in new installations.
+
+[ndbd default]
 NoOfReplicas= 1
 
 [mysqld  default]
-[NDB_MGMD default]
+[ndb_mgmd default]
 [tcp default]
 
 [ndb_mgmd]

@@ -580,11 +580,11 @@
         and values. One deviation from the standard INI format is that
         the parameter name and value can be separated by a colon
         (<quote><literal>:</literal></quote>) as well as the equals sign
-        (<quote><literal>=</literal></quote>). Another deviation is that
-        sections are not uniquely identified by section name. Instead,
-        unique sections (such as two different nodes of the same type)
-        are identified by a unique ID specified as a parameter within
-        the section.
+        (<quote><literal>=</literal></quote>); however, the equals sign
+        is preferred. Another deviation is that sections are not
+        uniquely identified by section name. Instead, unique sections
+        (such as two different nodes of the same type) are identified by
+        a unique ID specified as a parameter within the section.
       </para>
 
       <para>

@@ -593,10 +593,10 @@
         default value section, simply add the word
         <literal>default</literal> to the section name. For example, an
         <literal>[ndbd]</literal> section contains parameters that apply
-        to a particular data node, whereas an <literal>[NDBD
+        to a particular data node, whereas an <literal>[ndbd
         default]</literal> section contains parameters that apply to all
         data nodes. Suppose that all data nodes should use the same data
-        memory size. To configure them all, create an <literal>[NDBD
+        memory size. To configure them all, create an <literal>[ndbd
         default]</literal> section that contains a
         <literal>DataMemory</literal> line to specify the data memory
         size.

@@ -617,7 +617,7 @@
 # The first MySQL Server can be started from any host. The second
 # can be started only on the host mysqld_5.mysql.com
 
-[ndbddefault]
+[ndbd default]
 NoOfReplicas= 2
 DataDir= /var/lib/mysql-cluster
 

@@ -1275,11 +1275,11 @@
       </indexterm>
 
       <para>
-        The <literal>[ndbd]</literal> and [ndbddefault] sections are
-        used to configure the behavior of the cluster's data nodes.
-        There are many parameters which control buffer sizes, pool
-        sizes, timeouts, and so forth. The only mandatory parameters
-        are:
+        The <literal>[ndbd]</literal> and<literal>[ndbd
+        default]</literal>sections are used to configure the behavior of
+        the cluster's data nodes. There are many parameters which
+        control buffer sizes, pool sizes, timeouts, and so forth. The
+        only mandatory parameters are:
       </para>
 
       <itemizedlist>

@@ -1295,15 +1295,15 @@
         <listitem>
           <para>
             The parameter <literal>NoOfReplicas</literal>, which must be
-            defined in the [ndbddefault] section, as it is common to all
-            Cluster data nodes.
+            defined in the<literal>[ndbd default]</literal>section, as
+            it is common to all Cluster data nodes.
           </para>
         </listitem>
 
       </itemizedlist>
 
       <para>
-        Most data node parameters are set in the <literal>[NDBD
+        Most data node parameters are set in the <literal>[ndbd
         default]</literal> section. Only those parameters explicitly
         stated as being able to set local values are allowed to be
         changed in the <literal>[ndbd]</literal> section. Where present,

@@ -1444,7 +1444,7 @@
           </para>
 
           <para>
-            This global parameter can be set only in the <literal>[NDBD
+            This global parameter can be set only in the <literal>[ndbd
             default]</literal> section, and defines the number of
             replicas for each table stored in the cluster. This
             parameter also specifies the size of node groups. A node

@@ -1764,7 +1764,7 @@
           <para>
             This parameter determines how much memory is allocated for
             strings such as table names, and is specified in an
-            <literal>[ndbd]</literal> or <literal>[NDBD
+            <literal>[ndbd]</literal> or <literal>[ndbd
             default]</literal> section of the
             <filename>config.ini</filename> file. A value between
             <literal>0</literal> and <literal>100</literal> inclusive is

@@ -4073,7 +4073,7 @@
           <para>
             <literal>MemReportFrequency</literal> is not a required
             parameter. If used, it can be set for all cluster data nodes
-            in the <literal>[ndbddefault]</literal> section of
+            in the <literal>[ndbd default]</literal> section of
             <filename>config.ini</filename>, and can also be set or
             overridden for individual data nodes in the corresponding
             <literal>[ndbd]</literal> sections of the configuration

@@ -4726,7 +4726,7 @@
 
       <para>
         It is also possible to change the default values for these
-        parameters by setting them in the <literal>[TCP
+        parameters by setting them in the <literal>[tcp
         default]</literal> section.
       </para>
 

@@ -5440,7 +5440,7 @@
       </indexterm>
 
       <indexterm>
-        <primary><literal>[NDBD_DEFAULT]</literal> (MySQL Cluster)</primary>
+        <primary><literal>[ndbd_DEFAULT]</literal> (MySQL Cluster)</primary>
       </indexterm>
 
       <para>


Modified: trunk/refman-5.1/mysql-cluster-disk-data.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-disk-data.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/refman-5.1/mysql-cluster-disk-data.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1485 bytes

@@ -526,7 +526,7 @@
         <filename>config.ini</filename> includes the following:
         
         <programlisting>
-[ndbddefault]
+[ndbd default]
 DataDir= /data0
 </programlisting>
         

@@ -725,7 +725,7 @@
           <para>
             This determines the amount of space used for caching pages
             on disk, and is set in the <literal>[ndbd]</literal> or
-            <literal>[ndbddefault]</literal> section of the
+            <literal>[ndbd default]</literal> section of the
             <filename>config.ini</filename> file. It is measured in
             bytes. Each page takes up 32 KB. This means that Cluster
             Disk Data storage always uses <replaceable>N</replaceable> *

@@ -748,7 +748,7 @@
             buffers, disk operations (such as page requests and wait
             queues), and metadata for tablespaces, log file groups,
             <literal>UNDO</literal> files, and data files. It can be set
-            in the <literal>[ndbd]</literal> or <literal>[NDBD
+            in the <literal>[ndbd]</literal> or <literal>[ndbd
             default]</literal> section of the
             <filename>config.ini</filename> configuration file, and is
             measured in bytes.


Modified: trunk/refman-5.1/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-multi-computer.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/refman-5.1/mysql-cluster-multi-computer.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 602 bytes

@@ -1037,7 +1037,7 @@
 
 <programlisting>
 # Options affecting ndbd processes on all data nodes:
-[ndbddefault]    
+[ndbd default]    
 NoOfReplicas=2    # Number of replicas
 DataMemory=80M    # How much memory to allocate for data storage
 IndexMemory=18M   # How much memory to allocate for index storage


Modified: trunk/refman-5.2/mysql-cluster-configuration.xml
===================================================================
--- trunk/refman-5.2/mysql-cluster-configuration.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/refman-5.2/mysql-cluster-configuration.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 11, Lines Added: 26, Lines Deleted: 26; 6160 bytes

@@ -210,14 +210,14 @@
 # If you don't know the hostname for your machine, use localhost.
 # The DataDir parameter also has a default value, but it is recommended to
 # set it explicitly.
-# Note: DB, API, and MGM are aliases for NDBD, MYSQLD, and NDB_MGMD
-# respectively. DB and API are deprecated and should not be used in new
-# installations.
-[ndbddefault]
+# Note: [db], [api], and [mgm] are aliases for [ndbd], [mysqld], and [ndb_mgmd],
+# respectively. [db] is deprecated and should not be used in new installations.
+
+[ndbd default]
 NoOfReplicas= 1
 
 [mysqld  default]
-[NDB_MGMD default]
+[ndb_mgmd default]
 [tcp default]
 
 [ndb_mgmd]

@@ -580,11 +580,11 @@
         and values. One deviation from the standard INI format is that
         the parameter name and value can be separated by a colon
         (<quote><literal>:</literal></quote>) as well as the equals sign
-        (<quote><literal>=</literal></quote>). Another deviation is that
-        sections are not uniquely identified by section name. Instead,
-        unique sections (such as two different nodes of the same type)
-        are identified by a unique ID specified as a parameter within
-        the section.
+        (<quote><literal>=</literal></quote>); however, the equals sign
+        is preferred. Another deviation is that sections are not
+        uniquely identified by section name. Instead, unique sections
+        (such as two different nodes of the same type) are identified by
+        a unique ID specified as a parameter within the section.
       </para>
 
       <para>

@@ -593,10 +593,10 @@
         default value section, simply add the word
         <literal>default</literal> to the section name. For example, an
         <literal>[ndbd]</literal> section contains parameters that apply
-        to a particular data node, whereas an <literal>[NDBD
+        to a particular data node, whereas an <literal>[ndbd
         default]</literal> section contains parameters that apply to all
         data nodes. Suppose that all data nodes should use the same data
-        memory size. To configure them all, create an <literal>[NDBD
+        memory size. To configure them all, create an <literal>[ndbd
         default]</literal> section that contains a
         <literal>DataMemory</literal> line to specify the data memory
         size.

@@ -617,7 +617,7 @@
 # The first MySQL Server can be started from any host. The second
 # can be started only on the host mysqld_5.mysql.com
 
-[ndbddefault]
+[ndbd default]
 NoOfReplicas= 2
 DataDir= /var/lib/mysql-cluster
 

@@ -1273,11 +1273,11 @@
       </indexterm>
 
       <para>
-        The <literal>[ndbd]</literal> and [ndbddefault] sections are
-        used to configure the behavior of the cluster's data nodes.
-        There are many parameters which control buffer sizes, pool
-        sizes, timeouts, and so forth. The only mandatory parameters
-        are:
+        The <literal>[ndbd]</literal> and<literal>[ndbd
+        default]</literal>sections are used to configure the behavior of
+        the cluster's data nodes. There are many parameters which
+        control buffer sizes, pool sizes, timeouts, and so forth. The
+        only mandatory parameters are:
       </para>
 
       <itemizedlist>

@@ -1293,15 +1293,15 @@
         <listitem>
           <para>
             The parameter <literal>NoOfReplicas</literal>, which must be
-            defined in the [ndbddefault] section, as it is common to
-            all Cluster data nodes.
+            defined in the<literal>[ndbd default]</literal>section, as
+            it is common to all Cluster data nodes.
           </para>
         </listitem>
 
       </itemizedlist>
 
       <para>
-        Most data node parameters are set in the <literal>[NDBD
+        Most data node parameters are set in the <literal>[ndbd
         default]</literal> section. Only those parameters explicitly
         stated as being able to set local values are allowed to be
         changed in the <literal>[ndbd]</literal> section. Where present,

@@ -1432,7 +1432,7 @@
           </para>
 
           <para>
-            This global parameter can be set only in the <literal>[NDBD
+            This global parameter can be set only in the <literal>[ndbd
             default]</literal> section, and defines the number of
             replicas for each table stored in the cluster. This
             parameter also specifies the size of node groups. A node

@@ -1752,7 +1752,7 @@
           <para>
             This parameter determines how much memory is allocated for
             strings such as table names, and is specified in an
-            <literal>[ndbd]</literal> or <literal>[NDBD
+            <literal>[ndbd]</literal> or <literal>[ndbd
             default]</literal> section of the
             <filename>config.ini</filename> file. A value between
             <literal>0</literal> and <literal>100</literal> inclusive is

@@ -4032,7 +4032,7 @@
           <para>
             <literal>MemReportFrequency</literal> is not a required
             parameter. If used, it can be set for all cluster data nodes
-            in the <literal>[ndbddefault]</literal> section of
+            in the <literal>[ndbd default]</literal> section of
             <filename>config.ini</filename>, and can also be set or
             overridden for individual data nodes in the corresponding
             <literal>[ndbd]</literal> sections of the configuration

@@ -4666,7 +4666,7 @@
 
       <para>
         It is also possible to change the default values for these
-        parameters by setting them in the <literal>[TCP
+        parameters by setting them in the <literal>[tcp
         default]</literal> section.
       </para>
 

@@ -5380,7 +5380,7 @@
       </indexterm>
 
       <indexterm>
-        <primary><literal>[NDBD_DEFAULT]</literal> (MySQL Cluster)</primary>
+        <primary><literal>[ndbd_DEFAULT]</literal> (MySQL Cluster)</primary>
       </indexterm>
 
       <para>


Modified: trunk/refman-5.2/mysql-cluster-disk-data.xml
===================================================================
--- trunk/refman-5.2/mysql-cluster-disk-data.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/refman-5.2/mysql-cluster-disk-data.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1485 bytes

@@ -520,7 +520,7 @@
         <filename>config.ini</filename> includes the following:
         
         <programlisting>
-[ndbddefault]
+[ndbd default]
 DataDir= /data0
 </programlisting>
         

@@ -719,7 +719,7 @@
           <para>
             This determines the amount of space used for caching pages
             on disk, and is set in the <literal>[ndbd]</literal> or
-            <literal>[ndbddefault]</literal> section of the
+            <literal>[ndbd default]</literal> section of the
             <filename>config.ini</filename> file. It is measured in
             bytes. Each page takes up 32 KB. This means that Cluster
             Disk Data storage always uses <replaceable>N</replaceable> *

@@ -742,7 +742,7 @@
             buffers, disk operations (such as page requests and wait
             queues), and metadata for tablespaces, log file groups,
             <literal>UNDO</literal> files, and data files. It can be set
-            in the <literal>[ndbd]</literal> or <literal>[NDBD
+            in the <literal>[ndbd]</literal> or <literal>[ndbd
             default]</literal> section of the
             <filename>config.ini</filename> configuration file, and is
             measured in bytes.


Modified: trunk/refman-5.2/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-5.2/mysql-cluster-multi-computer.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/refman-5.2/mysql-cluster-multi-computer.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 602 bytes

@@ -1013,7 +1013,7 @@
 
 <programlisting>
 # Options affecting ndbd processes on all data nodes:
-[ndbddefault]    
+[ndbd default]    
 NoOfReplicas=2    # Number of replicas
 DataMemory=80M    # How much memory to allocate for data storage
 IndexMemory=18M   # How much memory to allocate for index storage


Modified: trunk/refman-6.0/mysql-cluster-configuration.xml
===================================================================
--- trunk/refman-6.0/mysql-cluster-configuration.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/refman-6.0/mysql-cluster-configuration.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 12, Lines Added: 17, Lines Deleted: 17; 5594 bytes

@@ -210,14 +210,14 @@
 # If you don't know the hostname for your machine, use localhost.
 # The DataDir parameter also has a default value, but it is recommended to
 # set it explicitly.
-# Note: DB, API, and MGM are aliases for NDBD, MYSQLD, and NDB_MGMD
-# respectively. DB and API are deprecated and should not be used in new
-# installations.
-[ndbddefault]
+# Note: [db], [api], and [mgm] are aliases for [ndbd], [mysqld], and [ndb_mgmd],
+# respectively. [db] is deprecated and should not be used in new installations.
+
+[ndbd default]
 NoOfReplicas= 1
 
 [mysqld  default]
-[NDB_MGMD default]
+[ndb_mgmd default]
 [tcp default]
 
 [ndb_mgmd]

@@ -580,7 +580,7 @@
         and values. One deviation from the standard INI format is that
         the parameter name and value can be separated by a colon
         (<quote><literal>:</literal></quote>) as well as the equals sign
-        (<quote><literal>=</literal></quote>). Another deviation is that
+        (<quote><literal>=</literal></quote>); however, the equals sign is preferred. Another deviation is that
         sections are not uniquely identified by section name. Instead,
         unique sections (such as two different nodes of the same type)
         are identified by a unique ID specified as a parameter within

@@ -593,10 +593,10 @@
         default value section, simply add the word
         <literal>default</literal> to the section name. For example, an
         <literal>[ndbd]</literal> section contains parameters that apply
-        to a particular data node, whereas an <literal>[NDBD
+        to a particular data node, whereas an <literal>[ndbd
         default]</literal> section contains parameters that apply to all
         data nodes. Suppose that all data nodes should use the same data
-        memory size. To configure them all, create an <literal>[NDBD
+        memory size. To configure them all, create an <literal>[ndbd
         default]</literal> section that contains a
         <literal>DataMemory</literal> line to specify the data memory
         size.

@@ -617,7 +617,7 @@
 # The first MySQL Server can be started from any host. The second
 # can be started only on the host mysqld_5.mysql.com
 
-[ndbddefault]
+[ndbd default]
 NoOfReplicas= 2
 DataDir= /var/lib/mysql-cluster
 

@@ -1273,7 +1273,7 @@
       </indexterm>
 
       <para>
-        The <literal>[ndbd]</literal> and [ndbddefault] sections are
+        The <literal>[ndbd]</literal> and<literal>[ndbd default]</literal>sections are
         used to configure the behavior of the cluster's data nodes.
         There are many parameters which control buffer sizes, pool
         sizes, timeouts, and so forth. The only mandatory parameters

@@ -1293,7 +1293,7 @@
         <listitem>
           <para>
             The parameter <literal>NoOfReplicas</literal>, which must be
-            defined in the [ndbddefault] section, as it is common to all
+            defined in the<literal>[ndbd default]</literal>section, as it is common to all
             Cluster data nodes.
           </para>
         </listitem>

@@ -1301,7 +1301,7 @@
       </itemizedlist>
 
       <para>
-        Most data node parameters are set in the <literal>[NDBD
+        Most data node parameters are set in the <literal>[ndbd
         default]</literal> section. Only those parameters explicitly
         stated as being able to set local values are allowed to be
         changed in the <literal>[ndbd]</literal> section. Where present,

@@ -1432,7 +1432,7 @@
           </para>
 
           <para>
-            This global parameter can be set only in the <literal>[NDBD
+            This global parameter can be set only in the <literal>[ndbd
             default]</literal> section, and defines the number of
             replicas for each table stored in the cluster. This
             parameter also specifies the size of node groups. A node

@@ -1752,7 +1752,7 @@
           <para>
             This parameter determines how much memory is allocated for
             strings such as table names, and is specified in an
-            <literal>[ndbd]</literal> or <literal>[NDBD
+            <literal>[ndbd]</literal> or <literal>[ndbd
             default]</literal> section of the
             <filename>config.ini</filename> file. A value between
             <literal>0</literal> and <literal>100</literal> inclusive is

@@ -4032,7 +4032,7 @@
           <para>
             <literal>MemReportFrequency</literal> is not a required
             parameter. If used, it can be set for all cluster data nodes
-            in the <literal>[ndbddefault]</literal> section of
+            in the <literal>[ndbd default]</literal> section of
             <filename>config.ini</filename>, and can also be set or
             overridden for individual data nodes in the corresponding
             <literal>[ndbd]</literal> sections of the configuration

@@ -4666,7 +4666,7 @@
 
       <para>
         It is also possible to change the default values for these
-        parameters by setting them in the <literal>[TCP
+        parameters by setting them in the <literal>[tcp
         default]</literal> section.
       </para>
 

@@ -5380,7 +5380,7 @@
       </indexterm>
 
       <indexterm>
-        <primary><literal>[NDBD_DEFAULT]</literal> (MySQL Cluster)</primary>
+        <primary><literal>[ndbd_DEFAULT]</literal> (MySQL Cluster)</primary>
       </indexterm>
 
       <para>


Modified: trunk/refman-6.0/mysql-cluster-disk-data.xml
===================================================================
--- trunk/refman-6.0/mysql-cluster-disk-data.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/refman-6.0/mysql-cluster-disk-data.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1485 bytes

@@ -520,7 +520,7 @@
         <filename>config.ini</filename> includes the following:
         
         <programlisting>
-[ndbddefault]
+[ndbd default]
 DataDir= /data0
 </programlisting>
         

@@ -719,7 +719,7 @@
           <para>
             This determines the amount of space used for caching pages
             on disk, and is set in the <literal>[ndbd]</literal> or
-            <literal>[ndbddefault]</literal> section of the
+            <literal>[ndbd default]</literal> section of the
             <filename>config.ini</filename> file. It is measured in
             bytes. Each page takes up 32 KB. This means that Cluster
             Disk Data storage always uses <replaceable>N</replaceable> *

@@ -742,7 +742,7 @@
             buffers, disk operations (such as page requests and wait
             queues), and metadata for tablespaces, log file groups,
             <literal>UNDO</literal> files, and data files. It can be set
-            in the <literal>[ndbd]</literal> or <literal>[NDBD
+            in the <literal>[ndbd]</literal> or <literal>[ndbd
             default]</literal> section of the
             <filename>config.ini</filename> configuration file, and is
             measured in bytes.


Modified: trunk/refman-6.0/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-6.0/mysql-cluster-multi-computer.xml	2007-10-31 12:12:40 UTC (rev 8429)
+++ trunk/refman-6.0/mysql-cluster-multi-computer.xml	2007-10-31 12:46:46 UTC (rev 8430)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 602 bytes

@@ -1013,7 +1013,7 @@
 
 <programlisting>
 # Options affecting ndbd processes on all data nodes:
-[ndbddefault]    
+[ndbd default]    
 NoOfReplicas=2    # Number of replicas
 DataMemory=80M    # How much memory to allocate for data storage
 IndexMemory=18M   # How much memory to allocate for index storage


Thread
svn commit - mysqldoc@docsrva: r8430 - in trunk: it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-5.2 refman-6.0jon31 Oct