List:Commits« Previous MessageNext Message »
From:jon Date:June 12 2008 3:52pm
Subject:svn commit - mysqldoc@docsrva: r10938 - in trunk: it/refman-5.1 it/refman-common pt/refman-5.1 pt/refman-common refman-4.1 refman-5.0 refman-5.1 refma...
View as plain text  
Author: jstephens
Date: 2008-06-12 17:52:54 +0200 (Thu, 12 Jun 2008)
New Revision: 10938

Log:

Fixes to Cluster multi-computer and configuration sections

  Fixed version references

  Removed references to BK

  Harmonised between RefMan versions

  Removed or revised some version-specific info

  Fixed URL entities in translation dirs

  Fixed various typos and other small issues





Modified:
   trunk/it/refman-5.1/mysql-cluster-configuration.xml
   trunk/it/refman-5.1/mysql-cluster-multi-computer.xml
   trunk/it/refman-5.1/mysql-cluster-news-core.xml
   trunk/it/refman-common/urls.ent
   trunk/pt/refman-5.1/mysql-cluster-configuration.xml
   trunk/pt/refman-5.1/mysql-cluster-multi-computer.xml
   trunk/pt/refman-5.1/mysql-cluster-news-core.xml
   trunk/pt/refman-common/urls.ent
   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-changelog-TEMPLATE.xml
   trunk/refman-5.1/mysql-cluster-configuration.xml
   trunk/refman-5.1/mysql-cluster-multi-computer.xml
   trunk/refman-5.1/mysql-cluster-news-core.xml
   trunk/refman-6.0/mysql-cluster-configuration.xml


Modified: trunk/it/refman-5.1/mysql-cluster-configuration.xml
===================================================================
--- trunk/it/refman-5.1/mysql-cluster-configuration.xml	2008-06-12 11:38:47 UTC (rev 10937)
+++ trunk/it/refman-5.1/mysql-cluster-configuration.xml	2008-06-12 15:52:54 UTC (rev 10938)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 791 bytes

@@ -67,8 +67,8 @@
     </para>
 
     <para>
-      If you choose to build from a source tarball or the MySQL
-      &current-series; BitKeeper tree, be sure to use the
+      If you choose to build from a source tarball or one of the MySQL
+      Cluster public development trees, be sure to use the
       <option>--with-ndbcluster</option> option when running
       <command>configure</command>. You can also use the
       <command>BUILD/compile-pentium-max</command> build script. Note


Modified: trunk/it/refman-5.1/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/it/refman-5.1/mysql-cluster-multi-computer.xml	2008-06-12 11:38:47 UTC (rev 10937)
+++ trunk/it/refman-5.1/mysql-cluster-multi-computer.xml	2008-06-12 15:52:54 UTC (rev 10938)
Changed blocks: 21, Lines Added: 61, Lines Deleted: 67; 11850 bytes

@@ -60,7 +60,8 @@
     <title>Basic assumptions</title>
 
     <para>
-      This How-To makes the following assumptions:
+      This <citetitle>How-To</citetitle> makes the following
+      assumptions:
     </para>
 
   </formalpara>

@@ -69,9 +70,9 @@
 
     <listitem>
       <para>
-        The cluster setup has four nodes, each on a separate host, and
-        each with a fixed network address on a typical Ethernet as shown
-        here:
+        The cluster is to be set up with four nodes, each on a separate
+        host, and each with a fixed network address on a typical
+        Ethernet network as shown here:
       </para>
 
       <informaltable>

@@ -127,19 +128,16 @@
       </indexterm>
 
       <para>
-        In the interest of simplicity (and reliability), this How-To
-        uses only numeric IP addresses. However, if DNS resolution is
-        available on your network, it is possible to use hostnames in
-        lieu of IP addresses in configuring Cluster. Alternatively, you
-        can use the <filename>/etc/hosts</filename> file or your
-        operating system's equivalent for providing a means to do host
-        lookup if such is available.
+        In the interest of simplicity (and reliability), this
+        <citetitle>How-To</citetitle> uses only numeric IP addresses.
+        However, if DNS resolution is available on your network, it is
+        possible to use hostnames in lieu of IP addresses in configuring
+        Cluster. Alternatively, you can use the
+        <filename>/etc/hosts</filename> file or your operating system's
+        equivalent for providing a means to do host lookup if such is
+        available.
       </para>
 
-      <remark role="NOTE">
-        [js] Candidate for Troubleshooting Guide?
-      </remark>
-
       <note>
         <para>
           A common problem when trying to use hostnames for Cluster

@@ -163,8 +161,8 @@
 127.0.0.1   ndb2.cluster ndb2 localhost.localdomain localhost
 </programlisting>
 
-          SuSE Linux (including OpenSuSE) places these entries in the
-          machines' <filename>/etc/hosts</filename> files:
+          SUSE Linux (including OpenSUSE) places these entries in the
+          machines&apos; <filename>/etc/hosts</filename> files:
 
 <programlisting>
 #  ndb1 <filename>/etc/hosts</filename>:

@@ -285,10 +283,10 @@
       One of the strengths of MySQL Cluster is that it can be run on
       commodity hardware and has no unusual requirements in this regard,
       other than for large amounts of RAM, due to the fact that all live
-      data storage is done in memory. (Note that this is not the case
-      with Disk Data tables &mdash; see
+      data storage is done in memory. (It is possible to reduce this
+      requirement using Disk Data tables &mdash; see
       <xref linkend="mysql-cluster-disk-data"/>, for more information
-      about these.) Naturally, multiple and faster CPUs will enhance
+      about these.) Naturally, multiple and faster CPUs can enhance
       performance. Memory requirements for other Cluster processes are
       relatively small.
     </para>

@@ -303,21 +301,23 @@
       applications, or configuration to support MySQL Cluster. For
       supported operating systems, a standard installation should be
       sufficient. The MySQL software requirements are simple: all that
-      is needed is a production release of MySQL &current-series; to
-      have Cluster support. It is not necessary to compile MySQL
-      yourself merely to be able to use Cluster. In this How-To, we
-      assume that you are using the server binary appropriate to your
-      operating system, available via the MySQL software downloads page
-      at <ulink url="&base-url-downloads;"/>.
+      is needed is a production release of MySQL
+      &mysql-cluster-current-6.2; or &mysql-cluster-current-6.3; to have
+      Cluster support. It is not necessary to compile MySQL yourself
+      merely to be able to use Cluster. In this
+      <citetitle>How-To</citetitle>, we assume that you are using the
+      server binary appropriate to your platform, available via the
+      MySQL Cluster software downloads page at
+      <ulink url="&base-url-cluster-downloads;"/>.
     </para>
 
     <para>
-      For inter-node communication, Cluster supports TCP/IP networking
-      in any standard topology, and the minimum expected for each host
-      is a standard 100 Mbps Ethernet card, plus a switch, hub, or
-      router to provide network connectivity for the cluster as a whole.
-      We strongly recommend that a MySQL Cluster be run on its own
-      subnet which is not shared with non-Cluster machines for the
+      For communication between nodes, Cluster supports TCP/IP
+      networking in any standard topology, and the minimum expected for
+      each host is a standard 100 Mbps Ethernet card, plus a switch,
+      hub, or router to provide network connectivity for the cluster as
+      a whole. We strongly recommend that a MySQL Cluster be run on its
+      own subnet which is not shared with non-Cluster machines for the
       following reasons:
     </para>
 

@@ -404,7 +404,7 @@
     </indexterm>
 
     <para>
-      Each MySQL Cluster host computer running SQL nodes must have
+      Each MySQL Cluster host computer running an SQL node must have
       installed on it a MySQL binary. For management nodes and data
       nodes, it is not necessary to install the MySQL server binary, but
       management nodes require the management server daemon

@@ -417,18 +417,19 @@
 
     <para>
       MySQL AB provides precompiled binaries that support Cluster, and
-      there is generally no need to compile these yourself. (However, we
+      there is generally no need to compile these yourself. However, we
       also include information relating to installing a MySQL Cluster
-      after building MySQL from source.) For setting up a cluster using
-      MySQL's binaries, the first step in the installation process for
-      each cluster host is to download the file
-      <filename>mysql-&current-version;-pc-linux-gnu-i686.tar.gz</filename>
-      from the <ulink url="&base-url-downloads;">MySQL downloads
+      after building MySQL from source. For setting up a cluster using
+      MySQL&apos;s binaries, the first step in the installation process
+      for each cluster host is to download the file
+      <filename>mysql-&mysql-cluster-current-6.2;-linux-i686-glibc23.tar.gz</filename>
+      from the <ulink url="&base-url-cluster-downloads;">MySQL downloads
       area</ulink>. We assume that you have placed it in each machine's
       <filename>/var/tmp</filename> directory. (If you do require a
       custom binary, see <xref linkend="installing-source-tree"/>.)
     </para>
 
+<!--
     <para>
       RPMs are also available for both 32-bit and 64-bit Linux
       platforms. For a MySQL Cluster, three RPMs are required:

@@ -503,6 +504,7 @@
       After installing from RPM, you still need to configure the cluster
       as discussed in <xref linkend="mysql-cluster-multi-config"/>.
     </para>
+-->
 
     <note>
       <para>

@@ -564,8 +566,8 @@
 
 <programlisting>
 shell&gt; <userinput>cd /var/tmp</userinput>
-shell&gt; <userinput>tar -C /usr/local -xzvf mysql-&current-version;-pc-linux-gnu-i686.tar.gz</userinput>
-shell&gt; <userinput>ln -s /usr/local/mysql-&current-version;-pc-linux-gnu-i686 /usr/local/mysql</userinput>
+shell&gt; <userinput>tar -C /usr/local -xzvf mysql-&mysql-cluster-current-6.2;-linux-i686-glibc23.tar.gz</userinput>
+shell&gt; <userinput>ln -s /usr/local/mysql-&mysql-cluster-current-6.2;-linux-i686-glibc23.tar.gz /usr/local/mysql</userinput>
 </programlisting>
           </listitem>
 

@@ -640,7 +642,8 @@
 
     </formalpara>
 
-    <formalpara>
+<!--
+      <formalpara>
 
       <title>SQL node installation &mdash; RPM files</title>
 

@@ -669,6 +672,7 @@
       </para>
 
     </formalpara>
+-->
 
     <formalpara>
 

@@ -698,6 +702,7 @@
 
     </formalpara>
 
+<!--
     <formalpara>
 
       <title>Data node installation &mdash; RPM Files</title>

@@ -720,6 +725,7 @@
       </para>
 
     </formalpara>
+-->
 
     <formalpara>
 

@@ -778,8 +784,8 @@
 
 <programlisting>
 shell&gt; <userinput>cd /var/tmp</userinput>
-shell&gt; <userinput>tar -zxvf mysql-&current-version;-pc-linux-gnu-i686.tar.gz</userinput>
-shell&gt; <userinput>cd mysql-&current-version;-pc-linux-gnu-i686</userinput>
+shell&gt; <userinput>tar -zxvf mysql-&mysql-cluster-current-6.2;-linux-i686-glibc23.tar.gz</userinput>
+shell&gt; <userinput>cd mysql-&mysql-cluster-current-6.2;-linux-i686-glibc23</userinput>
 shell&gt; <userinput>cp /bin/ndb_mgm* /usr/local/bin</userinput>
 </programlisting>
 

@@ -807,6 +813,7 @@
       </orderedlist>
     </para>
 
+<!--
     <formalpara>
 
       <title>Management node installation &mdash; RPM file</title>

@@ -851,6 +858,7 @@
       (<command>ndb_mgm</command>) to the <filename>/usr/bin</filename>
       directory.
     </para>
+-->
 
     <formalpara>
 

@@ -1026,11 +1034,10 @@
 
 # TCP/IP options:
 [tcp default]     
-portnumber=2202   # This the default; however, you can use any
-                               # port that is free for all the hosts in the cluster
-                               # Note: It is recommended that you do not specify the 
-                               # portnumber at all and allow the default value to be 
-                               # used instead
+portnumber=2202   # This the default; however, you can use any port that is free 
+                  # for all the hosts in the cluster
+                  # Note: It is recommended that you do not specify the port 
+                  # number at all and allow the default value to be used instead
 
 # Management process options:
 [ndb_mgmd]                      

@@ -1186,14 +1193,14 @@
 Cluster Configuration
 ---------------------
 [ndbd(NDB)]     2 node(s)
-id=2    @192.168.0.30  (Version: &current-version;, Nodegroup: 0, Master)
-id=3    @192.168.0.40  (Version: &current-version;, Nodegroup: 0)
+id=2    @192.168.0.30  (Version: &mysql-cluster-current-6.2;, Nodegroup: 0, Master)
+id=3    @192.168.0.40  (Version: &mysql-cluster-current-6.2;, Nodegroup: 0)
 
 [ndb_mgmd(MGM)] 1 node(s)
-id=1    @192.168.0.10  (Version: &current-version;)
+id=1    @192.168.0.10  (Version: &mysql-cluster-current-6.2;)
 
 [mysqld(SQL)]   1 node(s)
-id=4   (Version: &current-version;)
+id=4   (Version: &mysql-cluster-current-6.2;)
 </programlisting>
 
     <note>

@@ -1399,19 +1406,6 @@
     </para>
 
     <para>
-      It is important to note that <literal>NDBCLUSTER</literal> in
-      MySQL &current-series; does not support autodiscovery of
-      databases. (See <xref linkend="mysql-cluster-limitations"/>.) This
-      means that, once the <literal>world</literal> database and its
-      tables have been created on one data node, you need to issue the
-      <literal>CREATE DATABASE world</literal> statement (or you may use
-      <literal>CREATE SCHEMA world</literal> instead), followed by
-      <literal>FLUSH TABLES</literal> on each SQL node in the cluster.
-      This causes the node to recognize the database and read its table
-      definitions.
-    </para>
-
-    <para>
       Running <literal>SELECT</literal> queries on the SQL node is no
       different from running them on any other instance of a MySQL
       server. To run queries from the command line, you first need to

@@ -1424,7 +1418,7 @@
 shell&gt; <userinput>mysql -u root -p</userinput>
 Enter password:
 Welcome to the MySQL monitor.  Commands end with ; or \g.
-Your MySQL connection id is 1 to server version: &current-version;
+Your MySQL connection id is 1 to server version: &mysql-cluster-current-6.2;
 
 Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
 


Modified: trunk/it/refman-5.1/mysql-cluster-news-core.xml
===================================================================
--- trunk/it/refman-5.1/mysql-cluster-news-core.xml	2008-06-12 11:38:47 UTC (rev 10937)
+++ trunk/it/refman-5.1/mysql-cluster-news-core.xml	2008-06-12 15:52:54 UTC (rev 10938)
Changed blocks: 25, Lines Added: 26, Lines Deleted: 74; 11537 bytes

@@ -1437,9 +1437,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1481,9 +1479,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1525,9 +1521,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1569,9 +1563,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1613,9 +1605,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1657,9 +1647,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1701,9 +1689,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1745,9 +1731,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1789,9 +1773,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1833,9 +1815,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1877,9 +1857,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1921,9 +1899,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1965,9 +1941,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2009,9 +1983,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2053,9 +2025,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2097,9 +2067,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2141,9 +2109,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2185,9 +2151,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2229,9 +2193,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2273,9 +2235,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2317,9 +2277,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2361,9 +2319,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2405,9 +2361,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2436,8 +2390,8 @@
       <title condition="dynamic:changelog:vertitle" role="5.1.14-ndb-6.1.0:mysqld:all"/>
 
       <para role="release-level">
-        This is the first MySQL Cluster NDB 6.1 release,
-        incorporatingnew features and bugfiuxes made for the
+        This is the first MySQL Cluster NDB 6.1 release, incorporating
+        new features and bugfixes made for the
         <literal>NDBCLUSTER</literal> storage engine made since
         branching from MySQL 5.1.14 standard (see
         <xref linkend="news-5-1-14"/>).

@@ -2452,9 +2406,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>


Modified: trunk/it/refman-common/urls.ent
===================================================================
--- trunk/it/refman-common/urls.ent	2008-06-12 11:38:47 UTC (rev 10937)
+++ trunk/it/refman-common/urls.ent	2008-06-12 15:52:54 UTC (rev 10938)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 1; 998 bytes

@@ -9,7 +9,11 @@
 <!ENTITY base-url-forum-list "http://forums.mysql.com/list.php">
 <!ENTITY base-url-uploads "ftp://ftp.mysql.com/pub/mysql/upload/">
 <!ENTITY base-url-enterprise "http://www.mysql.com/products/enterprise/">
-<!ENTITY base-url-cge-files "ftp://ftp.mysql.com/pub/mysql/download/cluster_telco/">
 <!ENTITY base-url-collation-charts "http://www.collation-charts.org/">
 <!ENTITY base-url-collation-charts-mysql "http://www.collation-charts.org/mysql60/by-charset.html">
 
+<!-- MySQL Cluster  -->
+<!ENTITY base-url-cluster-downloads "http://dev.mysql.com/downloads/cluster">
+<!ENTITY base-url-cluster-products "http://www.mysql.com/products/cluster/">
+<!ENTITY base-url-cluster-files "ftp://ftp.mysql.com/pub/mysql/download/cluster_telco/">
+


Modified: trunk/pt/refman-5.1/mysql-cluster-configuration.xml
===================================================================
--- trunk/pt/refman-5.1/mysql-cluster-configuration.xml	2008-06-12 11:38:47 UTC (rev 10937)
+++ trunk/pt/refman-5.1/mysql-cluster-configuration.xml	2008-06-12 15:52:54 UTC (rev 10938)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 791 bytes

@@ -67,8 +67,8 @@
     </para>
 
     <para>
-      If you choose to build from a source tarball or the MySQL
-      &current-series; BitKeeper tree, be sure to use the
+      If you choose to build from a source tarball or one of the MySQL
+      Cluster public development trees, be sure to use the
       <option>--with-ndbcluster</option> option when running
       <command>configure</command>. You can also use the
       <command>BUILD/compile-pentium-max</command> build script. Note


Modified: trunk/pt/refman-5.1/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/pt/refman-5.1/mysql-cluster-multi-computer.xml	2008-06-12 11:38:47 UTC (rev 10937)
+++ trunk/pt/refman-5.1/mysql-cluster-multi-computer.xml	2008-06-12 15:52:54 UTC (rev 10938)
Changed blocks: 22, Lines Added: 63, Lines Deleted: 69; 12363 bytes

@@ -60,7 +60,8 @@
     <title>Basic assumptions</title>
 
     <para>
-      This How-To makes the following assumptions:
+      This <citetitle>How-To</citetitle> makes the following
+      assumptions:
     </para>
 
   </formalpara>

@@ -69,9 +70,9 @@
 
     <listitem>
       <para>
-        The cluster setup has four nodes, each on a separate host, and
-        each with a fixed network address on a typical Ethernet as shown
-        here:
+        The cluster is to be set up with four nodes, each on a separate
+        host, and each with a fixed network address on a typical
+        Ethernet network as shown here:
       </para>
 
       <informaltable>

@@ -127,19 +128,16 @@
       </indexterm>
 
       <para>
-        In the interest of simplicity (and reliability), this How-To
-        uses only numeric IP addresses. However, if DNS resolution is
-        available on your network, it is possible to use hostnames in
-        lieu of IP addresses in configuring Cluster. Alternatively, you
-        can use the <filename>/etc/hosts</filename> file or your
-        operating system's equivalent for providing a means to do host
-        lookup if such is available.
+        In the interest of simplicity (and reliability), this
+        <citetitle>How-To</citetitle> uses only numeric IP addresses.
+        However, if DNS resolution is available on your network, it is
+        possible to use hostnames in lieu of IP addresses in configuring
+        Cluster. Alternatively, you can use the
+        <filename>/etc/hosts</filename> file or your operating
+        system&apos;s equivalent for providing a means to do host lookup
+        if such is available.
       </para>
 
-      <remark role="NOTE">
-        [js] Candidate for Troubleshooting Guide?
-      </remark>
-
       <note>
         <para>
           A common problem when trying to use hostnames for Cluster

@@ -163,8 +161,8 @@
 127.0.0.1   ndb2.cluster ndb2 localhost.localdomain localhost
 </programlisting>
 
-          SuSE Linux (including OpenSuSE) places these entries in the
-          machines' <filename>/etc/hosts</filename> files:
+          SUSE Linux (including OpenSUSE) places these entries in the
+          machines&apos; <filename>/etc/hosts</filename> files:
 
 <programlisting>
 #  ndb1 <filename>/etc/hosts</filename>:

@@ -285,10 +283,10 @@
       One of the strengths of MySQL Cluster is that it can be run on
       commodity hardware and has no unusual requirements in this regard,
       other than for large amounts of RAM, due to the fact that all live
-      data storage is done in memory. (Note that this is not the case
-      with Disk Data tables &mdash; see
+      data storage is done in memory. (It is possible to reduce this
+      requirement using Disk Data tables &mdash; see
       <xref linkend="mysql-cluster-disk-data"/>, for more information
-      about these.) Naturally, multiple and faster CPUs will enhance
+      about these.) Naturally, multiple and faster CPUs can enhance
       performance. Memory requirements for other Cluster processes are
       relatively small.
     </para>

@@ -303,21 +301,23 @@
       applications, or configuration to support MySQL Cluster. For
       supported operating systems, a standard installation should be
       sufficient. The MySQL software requirements are simple: all that
-      is needed is a production release of MySQL &current-series; to
-      have Cluster support. It is not necessary to compile MySQL
-      yourself merely to be able to use Cluster. In this How-To, we
-      assume that you are using the server binary appropriate to your
-      operating system, available via the MySQL software downloads page
-      at <ulink url="&base-url-downloads;"/>.
+      is needed is a production release of MySQL
+      &mysql-cluster-current-6.2; or &mysql-cluster-current-6.3; to have
+      Cluster support. It is not necessary to compile MySQL yourself
+      merely to be able to use Cluster. In this
+      <citetitle>How-To</citetitle>, we assume that you are using the
+      server binary appropriate to your platform, available via the
+      MySQL Cluster software downloads page at
+      <ulink url="&base-url-cluster-downloads;"/>.
     </para>
 
     <para>
-      For inter-node communication, Cluster supports TCP/IP networking
-      in any standard topology, and the minimum expected for each host
-      is a standard 100 Mbps Ethernet card, plus a switch, hub, or
-      router to provide network connectivity for the cluster as a whole.
-      We strongly recommend that a MySQL Cluster be run on its own
-      subnet which is not shared with non-Cluster machines for the
+      For communication between nodes, Cluster supports TCP/IP
+      networking in any standard topology, and the minimum expected for
+      each host is a standard 100 Mbps Ethernet card, plus a switch,
+      hub, or router to provide network connectivity for the cluster as
+      a whole. We strongly recommend that a MySQL Cluster be run on its
+      own subnet which is not shared with non-Cluster machines for the
       following reasons:
     </para>
 

@@ -404,7 +404,7 @@
     </indexterm>
 
     <para>
-      Each MySQL Cluster host computer running SQL nodes must have
+      Each MySQL Cluster host computer running an SQL node must have
       installed on it a MySQL binary. For management nodes and data
       nodes, it is not necessary to install the MySQL server binary, but
       management nodes require the management server daemon

@@ -417,18 +417,19 @@
 
     <para>
       MySQL AB provides precompiled binaries that support Cluster, and
-      there is generally no need to compile these yourself. (However, we
+      there is generally no need to compile these yourself. However, we
       also include information relating to installing a MySQL Cluster
-      after building MySQL from source.) For setting up a cluster using
-      MySQL's binaries, the first step in the installation process for
-      each cluster host is to download the file
-      <filename>mysql-&current-version;-pc-linux-gnu-i686.tar.gz</filename>
-      from the <ulink url="&base-url-downloads;">MySQL downloads
+      after building MySQL from source. For setting up a cluster using
+      MySQL&apos;s binaries, the first step in the installation process
+      for each cluster host is to download the file
+      <filename>mysql-&mysql-cluster-current-6.2;-linux-i686-glibc23.tar.gz</filename>
+      from the <ulink url="&base-url-cluster-downloads;">MySQL downloads
       area</ulink>. We assume that you have placed it in each machine's
       <filename>/var/tmp</filename> directory. (If you do require a
       custom binary, see <xref linkend="installing-source-tree"/>.)
     </para>
 
+<!--
     <para>
       RPMs are also available for both 32-bit and 64-bit Linux
       platforms. For a MySQL Cluster, three RPMs are required:

@@ -503,6 +504,7 @@
       After installing from RPM, you still need to configure the cluster
       as discussed in <xref linkend="mysql-cluster-multi-config"/>.
     </para>
+-->
 
     <note>
       <para>

@@ -564,8 +566,8 @@
 
 <programlisting>
 shell&gt; <userinput>cd /var/tmp</userinput>
-shell&gt; <userinput>tar -C /usr/local -xzvf mysql-&current-version;-pc-linux-gnu-i686.tar.gz</userinput>
-shell&gt; <userinput>ln -s /usr/local/mysql-&current-version;-pc-linux-gnu-i686 /usr/local/mysql</userinput>
+shell&gt; <userinput>tar -C /usr/local -xzvf mysql-&mysql-cluster-current-6.2;-linux-i686-glibc23.tar.gz</userinput>
+shell&gt; <userinput>ln -s /usr/local/mysql-&mysql-cluster-current-6.2;-linux-i686-glibc23.tar.gz /usr/local/mysql</userinput>
 </programlisting>
           </listitem>
 

@@ -640,7 +642,8 @@
 
     </formalpara>
 
-    <formalpara>
+<!--
+      <formalpara>
 
       <title>SQL node installation &mdash; RPM files</title>
 

@@ -669,6 +672,7 @@
       </para>
 
     </formalpara>
+-->
 
     <formalpara>
 

@@ -698,6 +702,7 @@
 
     </formalpara>
 
+<!--
     <formalpara>
 
       <title>Data node installation &mdash; RPM Files</title>

@@ -720,6 +725,7 @@
       </para>
 
     </formalpara>
+-->
 
     <formalpara>
 

@@ -778,8 +784,8 @@
 
 <programlisting>
 shell&gt; <userinput>cd /var/tmp</userinput>
-shell&gt; <userinput>tar -zxvf mysql-&current-version;-pc-linux-gnu-i686.tar.gz</userinput>
-shell&gt; <userinput>cd mysql-&current-version;-pc-linux-gnu-i686</userinput>
+shell&gt; <userinput>tar -zxvf mysql-&mysql-cluster-current-6.2;-linux-i686-glibc23.tar.gz</userinput>
+shell&gt; <userinput>cd mysql-&mysql-cluster-current-6.2;-linux-i686-glibc23</userinput>
 shell&gt; <userinput>cp /bin/ndb_mgm* /usr/local/bin</userinput>
 </programlisting>
 

@@ -807,6 +813,7 @@
       </orderedlist>
     </para>
 
+<!--
     <formalpara>
 
       <title>Management node installation &mdash; RPM file</title>

@@ -851,6 +858,7 @@
       (<command>ndb_mgm</command>) to the <filename>/usr/bin</filename>
       directory.
     </para>
+-->
 
     <formalpara>
 

@@ -1026,11 +1034,10 @@
 
 # TCP/IP options:
 [tcp default]     
-portnumber=2202   # This the default; however, you can use any
-                               # port that is free for all the hosts in the cluster
-                               # Note: It is recommended that you do not specify the 
-                               # portnumber at all and allow the default value to be 
-                               # used instead
+portnumber=2202   # This the default; however, you can use any port that is free 
+                  # for all the hosts in the cluster
+                  # Note: It is recommended that you do not specify the port 
+                  # number at all and allow the default value to be used instead
 
 # Management process options:
 [ndb_mgmd]                      

@@ -1186,14 +1193,14 @@
 Cluster Configuration
 ---------------------
 [ndbd(NDB)]     2 node(s)
-id=2    @192.168.0.30  (Version: &current-version;, Nodegroup: 0, Master)
-id=3    @192.168.0.40  (Version: &current-version;, Nodegroup: 0)
+id=2    @192.168.0.30  (Version: &mysql-cluster-current-6.2;, Nodegroup: 0, Master)
+id=3    @192.168.0.40  (Version: &mysql-cluster-current-6.2;, Nodegroup: 0)
 
 [ndb_mgmd(MGM)] 1 node(s)
-id=1    @192.168.0.10  (Version: &current-version;)
+id=1    @192.168.0.10  (Version: &mysql-cluster-current-6.2;)
 
 [mysqld(SQL)]   1 node(s)
-id=4   (Version: &current-version;)
+id=4   (Version: &mysql-cluster-current-6.2;)
 </programlisting>
 
     <note>

@@ -1399,19 +1406,6 @@
     </para>
 
     <para>
-      It is important to note that <literal>NDBCLUSTER</literal> in
-      MySQL &current-series; does not support autodiscovery of
-      databases. (See <xref linkend="mysql-cluster-limitations"/>.) This
-      means that, once the <literal>world</literal> database and its
-      tables have been created on one data node, you need to issue the
-      <literal>CREATE DATABASE world</literal> statement (or you may use
-      <literal>CREATE SCHEMA world</literal> instead), followed by
-      <literal>FLUSH TABLES</literal> on each SQL node in the cluster.
-      This causes the node to recognize the database and read its table
-      definitions.
-    </para>
-
-    <para>
       Running <literal>SELECT</literal> queries on the SQL node is no
       different from running them on any other instance of a MySQL
       server. To run queries from the command line, you first need to

@@ -1424,7 +1418,7 @@
 shell&gt; <userinput>mysql -u root -p</userinput>
 Enter password:
 Welcome to the MySQL monitor.  Commands end with ; or \g.
-Your MySQL connection id is 1 to server version: &current-version;
+Your MySQL connection id is 1 to server version: &mysql-cluster-current-6.2;
 
 Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
 

@@ -1432,8 +1426,8 @@
 </programlisting>
 
     <para>
-      We simply use the MySQL server's <literal>root</literal> account
-      and assume that you have followed the standard security
+      We simply use the MySQL server&apos;s <literal>root</literal>
+      account and assume that you have followed the standard security
       precautions for installing a MySQL server, including setting a
       strong <literal>root</literal> password. For more information, see
       <xref linkend="default-privileges"/>.


Modified: trunk/pt/refman-5.1/mysql-cluster-news-core.xml
===================================================================
--- trunk/pt/refman-5.1/mysql-cluster-news-core.xml	2008-06-12 11:38:47 UTC (rev 10937)
+++ trunk/pt/refman-5.1/mysql-cluster-news-core.xml	2008-06-12 15:52:54 UTC (rev 10938)
Changed blocks: 25, Lines Added: 26, Lines Deleted: 74; 11537 bytes

@@ -1437,9 +1437,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1481,9 +1479,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1525,9 +1521,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1569,9 +1563,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1613,9 +1605,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1657,9 +1647,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1701,9 +1689,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1745,9 +1731,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1789,9 +1773,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1833,9 +1815,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1877,9 +1857,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1921,9 +1899,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1965,9 +1941,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2009,9 +1983,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2053,9 +2025,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2097,9 +2067,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2141,9 +2109,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2185,9 +2151,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2229,9 +2193,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2273,9 +2235,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2317,9 +2277,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2361,9 +2319,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2405,9 +2361,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2436,8 +2390,8 @@
       <title condition="dynamic:changelog:vertitle" role="5.1.14-ndb-6.1.0:mysqld:all"/>
 
       <para role="release-level">
-        This is the first MySQL Cluster NDB 6.1 release,
-        incorporatingnew features and bugfiuxes made for the
+        This is the first MySQL Cluster NDB 6.1 release, incorporating
+        new features and bugfixes made for the
         <literal>NDBCLUSTER</literal> storage engine made since
         branching from MySQL 5.1.14 standard (see
         <xref linkend="news-5-1-14"/>).

@@ -2452,9 +2406,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>


Modified: trunk/pt/refman-common/urls.ent
===================================================================
--- trunk/pt/refman-common/urls.ent	2008-06-12 11:38:47 UTC (rev 10937)
+++ trunk/pt/refman-common/urls.ent	2008-06-12 15:52:54 UTC (rev 10938)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 1; 997 bytes

@@ -9,7 +9,10 @@
 <!ENTITY base-url-forum-list "http://forums.mysql.com/list.php">
 <!ENTITY base-url-uploads "ftp://ftp.mysql.com/pub/mysql/upload/">
 <!ENTITY base-url-enterprise "http://www.mysql.com/products/enterprise/">
-<!ENTITY base-url-cge-files "ftp://ftp.mysql.com/pub/mysql/download/cluster_telco/">
 <!ENTITY base-url-collation-charts "http://www.collation-charts.org/">
 <!ENTITY base-url-collation-charts-mysql "http://www.collation-charts.org/mysql60/by-charset.html">
 
+<!-- MySQL Cluster  -->
+<!ENTITY base-url-cluster-downloads "http://dev.mysql.com/downloads/cluster">
+<!ENTITY base-url-cluster-products "http://www.mysql.com/products/cluster/">
+<!ENTITY base-url-cluster-files "ftp://ftp.mysql.com/pub/mysql/download/cluster_telco/">


Modified: trunk/refman-4.1/mysql-cluster-configuration.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-configuration.xml	2008-06-12 11:38:47 UTC (rev 10937)
+++ trunk/refman-4.1/mysql-cluster-configuration.xml	2008-06-12 15:52:54 UTC (rev 10938)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 782 bytes

@@ -67,8 +67,8 @@
     </para>
 
     <para>
-      If you choose to build from a source tarball or the MySQL
-      &current-series; BitKeeper tree, be sure to use the
+      If you choose to build from a source tarball or one of the MySQL
+      Cluster public development trees, be sure to use the
       <option>--with-ndbcluster</option> option when running
       <command>configure</command>. You can also use the
       <command>BUILD/compile-pentium-max</command> build script. Note


Modified: trunk/refman-4.1/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-multi-computer.xml	2008-06-12 11:38:47 UTC (rev 10937)
+++ trunk/refman-4.1/mysql-cluster-multi-computer.xml	2008-06-12 15:52:54 UTC (rev 10938)
Changed blocks: 11, Lines Added: 45, Lines Deleted: 45; 8988 bytes

@@ -60,7 +60,8 @@
     <title>Basic assumptions</title>
 
     <para>
-      This How-To makes the following assumptions:
+      This <citetitle>How-To</citetitle> makes the following
+      assumptions:
     </para>
 
   </formalpara>

@@ -69,9 +70,9 @@
 
     <listitem>
       <para>
-        The cluster setup has four nodes, each on a separate host, and
-        each with a fixed network address on a typical Ethernet as shown
-        here:
+        The cluster is to be set up with four nodes, each on a separate
+        host, and each with a fixed network address on a typical
+        Ethernet network as shown here:
       </para>
 
       <informaltable>

@@ -127,19 +128,16 @@
       </indexterm>
 
       <para>
-        In the interest of simplicity (and reliability), this How-To
-        uses only numeric IP addresses. However, if DNS resolution is
-        available on your network, it is possible to use hostnames in
-        lieu of IP addresses in configuring Cluster. Alternatively, you
-        can use the <filename>/etc/hosts</filename> file or your
-        operating system's equivalent for providing a means to do host
-        lookup if such is available.
+        In the interest of simplicity (and reliability), this
+        <citetitle>How-To</citetitle> uses only numeric IP addresses.
+        However, if DNS resolution is available on your network, it is
+        possible to use hostnames in lieu of IP addresses in configuring
+        Cluster. Alternatively, you can use the
+        <filename>/etc/hosts</filename> file or your operating
+        system&apos;s equivalent for providing a means to do host lookup
+        if such is available.
       </para>
 
-      <remark role="NOTE">
-        [js] Candidate for Troubleshooting Guide?
-      </remark>
-
       <note>
         <para>
           A common problem when trying to use hostnames for Cluster

@@ -163,8 +161,8 @@
 127.0.0.1   ndb2.cluster ndb2 localhost.localdomain localhost
 </programlisting>
 
-          SuSE Linux (including OpenSuSE) places these entries in the
-          machines' <filename>/etc/hosts</filename> files:
+          SUSE Linux (including OpenSUSE) places these entries in the
+          machines&apos; <filename>/etc/hosts</filename> files:
 
 <programlisting>
 #  ndb1 <filename>/etc/hosts</filename>:

@@ -285,10 +283,10 @@
       One of the strengths of MySQL Cluster is that it can be run on
       commodity hardware and has no unusual requirements in this regard,
       other than for large amounts of RAM, due to the fact that all live
-      data storage is done in memory. (Note that this is not the case
-      with Disk Data tables, which are implemented in MySQL 5.1;
-      however, we do not intend to backport this feature to MySQL
-      &current-series;.) Naturally, multiple and faster CPUs will
+      data storage is done in memory. (It is possible to reduce this
+      requirement using Disk Data tables, which were implemented in
+      MySQL 5.1; however, we do not intend to backport this feature to
+      MySQL &current-series;.) Naturally, multiple and faster CPUs will
       enhance performance. Memory requirements for other Cluster
       processes are relatively small.
     </para>

@@ -307,19 +305,19 @@
       must use the <literal>-max</literal> version of MySQL to have
       Cluster support. (See <xref linkend="mysqld-max"/>.) It is not
       necessary to compile MySQL yourself merely to be able to use
-      Cluster. In this How-To, we assume that you are using the
-      <literal>-max</literal> binary appropriate to your operating
-      system, available via the MySQL software downloads page at
+      Cluster. In this <citetitle>How-To</citetitle>, we assume that you
+      are using the server binary appropriate to your platform,
+      available via the MySQL software downloads page at
       <ulink url="&base-url-downloads;"/>.
     </para>
 
     <para>
-      For inter-node communication, Cluster supports TCP/IP networking
-      in any standard topology, and the minimum expected for each host
-      is a standard 100 Mbps Ethernet card, plus a switch, hub, or
-      router to provide network connectivity for the cluster as a whole.
-      We strongly recommend that a MySQL Cluster be run on its own
-      subnet which is not shared with non-Cluster machines for the
+      For communication between nodes, Cluster supports TCP/IP
+      networking in any standard topology, and the minimum expected for
+      each host is a standard 100 Mbps Ethernet card, plus a switch,
+      hub, or router to provide network connectivity for the cluster as
+      a whole. We strongly recommend that a MySQL Cluster be run on its
+      own subnet which is not shared with non-Cluster machines for the
       following reasons:
     </para>
 

@@ -336,7 +334,7 @@
             transmissions within a MySQL Cluster is to run your Cluster
             on a protected network. If you intend to use MySQL Cluster
             for Web applications, the cluster should definitely reside
-            behind your firewall and not in your network's
+            behind your firewall and not in your network&apos;s
             De-Militarized Zone
             (<ulink url="http://compnetworking.about.com/cs/networksecurity/g/bldef_dmz.htm">DMZ</ulink>)
             or elsewhere.

@@ -406,23 +404,24 @@
     </indexterm>
 
     <para>
-      Each MySQL Cluster host computer running data or SQL nodes must
-      have installed on it a MySQL-max binary. For management nodes, it
-      is not necessary to install the MySQL server binary, but you do
-      have to install the management server daemon
-      (<command>ndb_mgmd</command>). It is also a good idea to install
-      the management client (<command>ndb_mgm</command>) on the
+      Each MySQL Cluster host computer running an SQL node must have
+      installed on it a MySQL binary. For management nodes and data
+      nodes, it is not necessary to install the MySQL server binary, but
+      management nodes require the management server daemon
+      (<command>ndb_mgmd</command>) and data nodes require the data node
+      daemon (<command>ndbd</command>). It is also a good idea to
+      install the management client (<command>ndb_mgm</command>) on the
       management server host. This section covers the steps necessary to
       install the correct binaries for each type of Cluster node.
     </para>
 
     <para>
       MySQL AB provides precompiled binaries that support Cluster, and
-      there is generally no need to compile these yourself. (However, we
+      there is generally no need to compile these yourself. However, we
       also include information relating to installing a MySQL Cluster
-      after building MySQL from source.) For setting up a cluster using
-      MySQL's binaries, the first step in the installation process for
-      each cluster host is to download the file
+      after building MySQL from source. For setting up a cluster using
+      MySQL&apos;s binaries, the first step in the installation process
+      for each cluster host is to download the file
       <filename>mysql-max-&current-version;-pc-linux-gnu-i686.tar.gz</filename>
       from the <ulink url="&base-url-downloads;">MySQL downloads
       area</ulink>. We assume that you have placed it in each machine's

@@ -685,7 +684,8 @@
       <title>SQL node installation &mdash; building from source</title>
 
       <para>
-        If you compile MySQL with clustering support (using the
+        If you compile MySQL with clustering support (for example, by
+        using the
         <command>BUILD/compile-<replaceable>platform_name</replaceable>-max</command>
         script appropriate to your platform), and perform the default
         installation (using <command>make install</command> as the root

@@ -1036,7 +1036,7 @@
 # TCP/IP options:
 [tcp default]     
 portnumber=2202   # This the default; however, you can use any
-                  # port that is free for all the hosts in cluster
+                  # port that is free for all the hosts in the cluster
                   # Note: It is recommended beginning with MySQL 5.0 that
                   # you do not specify the portnumber at all and simply allow
                   # the default value to be used instead

@@ -1444,8 +1444,8 @@
 </programlisting>
 
     <para>
-      We simply use the MySQL server's <literal>root</literal> account
-      and assume that you have followed the standard security
+      We simply use the MySQL server&apos;s <literal>root</literal>
+      account and assume that you have followed the standard security
       precautions for installing a MySQL server, including setting a
       strong <literal>root</literal> password. For more information, see
       <xref linkend="default-privileges"/>.


Modified: trunk/refman-5.0/mysql-cluster-configuration.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-configuration.xml	2008-06-12 11:38:47 UTC (rev 10937)
+++ trunk/refman-5.0/mysql-cluster-configuration.xml	2008-06-12 15:52:54 UTC (rev 10938)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 782 bytes

@@ -67,8 +67,8 @@
     </para>
 
     <para>
-      If you choose to build from a source tarball or the MySQL
-      &current-series; BitKeeper tree, be sure to use the
+      If you choose to build from a source tarball or one of the MySQL
+      Cluster public development trees, be sure to use the
       <option>--with-ndbcluster</option> option when running
       <command>configure</command>. You can also use the
       <command>BUILD/compile-pentium-max</command> build script. Note


Modified: trunk/refman-5.0/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-multi-computer.xml	2008-06-12 11:38:47 UTC (rev 10937)
+++ trunk/refman-5.0/mysql-cluster-multi-computer.xml	2008-06-12 15:52:54 UTC (rev 10938)
Changed blocks: 11, Lines Added: 39, Lines Deleted: 40; 7926 bytes

@@ -60,7 +60,8 @@
     <title>Basic assumptions</title>
 
     <para>
-      This How-To makes the following assumptions:
+      This <citetitle>How-To</citetitle> makes the following
+      assumptions:
     </para>
 
   </formalpara>

@@ -69,9 +70,9 @@
 
     <listitem>
       <para>
-        The cluster setup has four nodes, each on a separate host, and
-        each with a fixed network address on a typical Ethernet as shown
-        here:
+        The cluster is to be set up with four nodes, each on a separate
+        host, and each with a fixed network address on a typical
+        Ethernet network as shown here:
       </para>
 
       <informaltable>

@@ -127,19 +128,16 @@
       </indexterm>
 
       <para>
-        In the interest of simplicity (and reliability), this How-To
-        uses only numeric IP addresses. However, if DNS resolution is
-        available on your network, it is possible to use hostnames in
-        lieu of IP addresses in configuring Cluster. Alternatively, you
-        can use the <filename>/etc/hosts</filename> file or your
-        operating system's equivalent for providing a means to do host
-        lookup if such is available.
+        In the interest of simplicity (and reliability), this
+        <citetitle>How-To</citetitle> uses only numeric IP addresses.
+        However, if DNS resolution is available on your network, it is
+        possible to use hostnames in lieu of IP addresses in configuring
+        Cluster. Alternatively, you can use the
+        <filename>/etc/hosts</filename> file or your operating
+        system&apos;s equivalent for providing a means to do host lookup
+        if such is available.
       </para>
 
-      <remark role="NOTE">
-        [js] Candidate for Troubleshooting Guide?
-      </remark>
-
       <note>
         <para>
           A common problem when trying to use hostnames for Cluster

@@ -163,8 +161,8 @@
 127.0.0.1   ndb2.cluster ndb2 localhost.localdomain localhost
 </programlisting>
 
-          SuSE Linux (including OpenSuSE) places these entries in the
-          machines' <filename>/etc/hosts</filename> files:
+          SUSE Linux (including OpenSUSE) places these entries in the
+          machines&apos; <filename>/etc/hosts</filename> files:
 
 <programlisting>
 #  ndb1 <filename>/etc/hosts</filename>:

@@ -285,10 +283,10 @@
       One of the strengths of MySQL Cluster is that it can be run on
       commodity hardware and has no unusual requirements in this regard,
       other than for large amounts of RAM, due to the fact that all live
-      data storage is done in memory. (Note that this is not the case
-      with Disk Data tables, which are implemented in MySQL 5.1;
-      however, we do not intend to backport this feature to MySQL
-      &current-series;.) Naturally, multiple and faster CPUs will
+      data storage is done in memory. (It is possible to reduce this
+      requirement using Disk Data tables, which were implemented in
+      MySQL 5.1; however, we do not intend to backport this feature to
+      MySQL &current-series;.) Naturally, multiple and faster CPUs will
       enhance performance. Memory requirements for other Cluster
       processes are relatively small.
     </para>

@@ -305,19 +303,20 @@
       sufficient. The MySQL software requirements are simple: all that
       is needed is a production release of MySQL &current-series; to
       have Cluster support. It is not necessary to compile MySQL
-      yourself merely to be able to use Cluster. In this How-To, we
-      assume that you are using the server binary appropriate to your
-      operating system, available via the MySQL software downloads page
-      at <ulink url="&base-url-downloads;"/>.
+      yourself merely to be able to use Cluster. In this
+      <citetitle>How-To</citetitle>, we assume that you are using the
+      server binary appropriate to your platform, available via the
+      MySQL software downloads page at
+      <ulink url="&base-url-downloads;"/>.
     </para>
 
     <para>
-      For inter-node communication, Cluster supports TCP/IP networking
-      in any standard topology, and the minimum expected for each host
-      is a standard 100 Mbps Ethernet card, plus a switch, hub, or
-      router to provide network connectivity for the cluster as a whole.
-      We strongly recommend that a MySQL Cluster be run on its own
-      subnet which is not shared with non-Cluster machines for the
+      For communication between nodes, Cluster supports TCP/IP
+      networking in any standard topology, and the minimum expected for
+      each host is a standard 100 Mbps Ethernet card, plus a switch,
+      hub, or router to provide network connectivity for the cluster as
+      a whole. We strongly recommend that a MySQL Cluster be run on its
+      own subnet which is not shared with non-Cluster machines for the
       following reasons:
     </para>
 

@@ -334,7 +333,7 @@
             transmissions within a MySQL Cluster is to run your Cluster
             on a protected network. If you intend to use MySQL Cluster
             for Web applications, the cluster should definitely reside
-            behind your firewall and not in your network's
+            behind your firewall and not in your network&apos;s
             De-Militarized Zone
             (<ulink url="http://compnetworking.about.com/cs/networksecurity/g/bldef_dmz.htm">DMZ</ulink>)
             or elsewhere.

@@ -404,7 +403,7 @@
     </indexterm>
 
     <para>
-      Each MySQL Cluster host computer running SQL nodes must have
+      Each MySQL Cluster host computer running an SQL node must have
       installed on it a MySQL binary. For management nodes and data
       nodes, it is not necessary to install the MySQL server binary, but
       management nodes require the management server daemon

@@ -417,11 +416,11 @@
 
     <para>
       MySQL AB provides precompiled binaries that support Cluster, and
-      there is generally no need to compile these yourself. (However, we
+      there is generally no need to compile these yourself. However, we
       also include information relating to installing a MySQL Cluster
-      after building MySQL from source.) For setting up a cluster using
-      MySQL's binaries, the first step in the installation process for
-      each cluster host is to download the file
+      after building MySQL from source. For setting up a cluster using
+      MySQL&apos;s binaries, the first step in the installation process
+      for each cluster host is to download the file
       <filename>mysql-&current-version;-pc-linux-gnu-i686.tar.gz</filename>
       from the <ulink url="&base-url-downloads;">MySQL downloads
       area</ulink>. We assume that you have placed it in each machine's

@@ -1027,7 +1026,7 @@
 # TCP/IP options:
 [tcp default]     
 portnumber=2202   # This the default; however, you can use any
-                  # port that is free for all the hosts in cluster
+                  # port that is free for all the hosts in the cluster
                   # Note: It is recommended beginning with MySQL 5.0 that
                   # you do not specify the portnumber at all and simply allow
                   # the default value to be used instead

@@ -1432,8 +1431,8 @@
 </programlisting>
 
     <para>
-      We simply use the MySQL server's <literal>root</literal> account
-      and assume that you have followed the standard security
+      We simply use the MySQL server&apos;s <literal>root</literal>
+      account and assume that you have followed the standard security
       precautions for installing a MySQL server, including setting a
       strong <literal>root</literal> password. For more information, see
       <xref linkend="default-privileges"/>.


Modified: trunk/refman-5.1/mysql-cluster-changelog-TEMPLATE.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-changelog-TEMPLATE.xml	2008-06-12 11:38:47 UTC (rev 10937)
+++ trunk/refman-5.1/mysql-cluster-changelog-TEMPLATE.xml	2008-06-12 15:52:54 UTC (rev 10938)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 3; 831 bytes

@@ -37,9 +37,7 @@
       MySQL Cluster NDB 6.1 (formerly known as <quote>MySQL Cluster
       Carrier Grade Edition 6.1.x</quote>) is no longer being developed
       or maintained; if you are using a MySQL Cluster NDB 6.1 release,
-      you should consider upgrading to MySQL Cluster NDB 6.2 or 6.3. If
-      you require source code for this series, you can obtain it from
-      <ulink url="http://mysql.bkbits.net/"/>.
+      you should consider upgrading to MySQL Cluster NDB 6.2 or 6.3.
     </para>
 
   </formalpara>


Modified: trunk/refman-5.1/mysql-cluster-configuration.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-configuration.xml	2008-06-12 11:38:47 UTC (rev 10937)
+++ trunk/refman-5.1/mysql-cluster-configuration.xml	2008-06-12 15:52:54 UTC (rev 10938)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 782 bytes

@@ -67,8 +67,8 @@
     </para>
 
     <para>
-      If you choose to build from a source tarball or the MySQL
-      &current-series; BitKeeper tree, be sure to use the
+      If you choose to build from a source tarball or one of the MySQL
+      Cluster public development trees, be sure to use the
       <option>--with-ndbcluster</option> option when running
       <command>configure</command>. You can also use the
       <command>BUILD/compile-pentium-max</command> build script. Note


Modified: trunk/refman-5.1/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-multi-computer.xml	2008-06-12 11:38:47 UTC (rev 10937)
+++ trunk/refman-5.1/mysql-cluster-multi-computer.xml	2008-06-12 15:52:54 UTC (rev 10938)
Changed blocks: 23, Lines Added: 64, Lines Deleted: 70; 12874 bytes

@@ -60,7 +60,8 @@
     <title>Basic assumptions</title>
 
     <para>
-      This How-To makes the following assumptions:
+      This <citetitle>How-To</citetitle> makes the following
+      assumptions:
     </para>
 
   </formalpara>

@@ -69,9 +70,9 @@
 
     <listitem>
       <para>
-        The cluster setup has four nodes, each on a separate host, and
-        each with a fixed network address on a typical Ethernet as shown
-        here:
+        The cluster is to be set up with four nodes, each on a separate
+        host, and each with a fixed network address on a typical
+        Ethernet network as shown here:
       </para>
 
       <informaltable>

@@ -127,19 +128,16 @@
       </indexterm>
 
       <para>
-        In the interest of simplicity (and reliability), this How-To
-        uses only numeric IP addresses. However, if DNS resolution is
-        available on your network, it is possible to use hostnames in
-        lieu of IP addresses in configuring Cluster. Alternatively, you
-        can use the <filename>/etc/hosts</filename> file or your
-        operating system's equivalent for providing a means to do host
-        lookup if such is available.
+        In the interest of simplicity (and reliability), this
+        <citetitle>How-To</citetitle> uses only numeric IP addresses.
+        However, if DNS resolution is available on your network, it is
+        possible to use hostnames in lieu of IP addresses in configuring
+        Cluster. Alternatively, you can use the
+        <filename>/etc/hosts</filename> file or your operating
+        system&apos;s equivalent for providing a means to do host lookup
+        if such is available.
       </para>
 
-      <remark role="NOTE">
-        [js] Candidate for Troubleshooting Guide?
-      </remark>
-
       <note>
         <para>
           A common problem when trying to use hostnames for Cluster

@@ -163,8 +161,8 @@
 127.0.0.1   ndb2.cluster ndb2 localhost.localdomain localhost
 </programlisting>
 
-          SuSE Linux (including OpenSuSE) places these entries in the
-          machines' <filename>/etc/hosts</filename> files:
+          SUSE Linux (including OpenSUSE) places these entries in the
+          machines&apos; <filename>/etc/hosts</filename> files:
 
 <programlisting>
 #  ndb1 <filename>/etc/hosts</filename>:

@@ -285,10 +283,10 @@
       One of the strengths of MySQL Cluster is that it can be run on
       commodity hardware and has no unusual requirements in this regard,
       other than for large amounts of RAM, due to the fact that all live
-      data storage is done in memory. (Note that this is not the case
-      with Disk Data tables &mdash; see
+      data storage is done in memory. (It is possible to reduce this
+      requirement using Disk Data tables &mdash; see
       <xref linkend="mysql-cluster-disk-data"/>, for more information
-      about these.) Naturally, multiple and faster CPUs will enhance
+      about these.) Naturally, multiple and faster CPUs can enhance
       performance. Memory requirements for other Cluster processes are
       relatively small.
     </para>

@@ -303,21 +301,23 @@
       applications, or configuration to support MySQL Cluster. For
       supported operating systems, a standard installation should be
       sufficient. The MySQL software requirements are simple: all that
-      is needed is a production release of MySQL &current-series; to
-      have Cluster support. It is not necessary to compile MySQL
-      yourself merely to be able to use Cluster. In this How-To, we
-      assume that you are using the server binary appropriate to your
-      operating system, available via the MySQL software downloads page
-      at <ulink url="&base-url-downloads;"/>.
+      is needed is a production release of MySQL
+      &mysql-cluster-current-6.2; or &mysql-cluster-current-6.3; to have
+      Cluster support. It is not necessary to compile MySQL yourself
+      merely to be able to use Cluster. In this
+      <citetitle>How-To</citetitle>, we assume that you are using the
+      server binary appropriate to your platform, available via the
+      MySQL Cluster software downloads page at
+      <ulink url="&base-url-cluster-downloads;"/>.
     </para>
 
     <para>
-      For inter-node communication, Cluster supports TCP/IP networking
-      in any standard topology, and the minimum expected for each host
-      is a standard 100 Mbps Ethernet card, plus a switch, hub, or
-      router to provide network connectivity for the cluster as a whole.
-      We strongly recommend that a MySQL Cluster be run on its own
-      subnet which is not shared with non-Cluster machines for the
+      For communication between nodes, Cluster supports TCP/IP
+      networking in any standard topology, and the minimum expected for
+      each host is a standard 100 Mbps Ethernet card, plus a switch,
+      hub, or router to provide network connectivity for the cluster as
+      a whole. We strongly recommend that a MySQL Cluster be run on its
+      own subnet which is not shared with non-Cluster machines for the
       following reasons:
     </para>
 

@@ -334,7 +334,7 @@
             transmissions within a MySQL Cluster is to run your Cluster
             on a protected network. If you intend to use MySQL Cluster
             for Web applications, the cluster should definitely reside
-            behind your firewall and not in your network's
+            behind your firewall and not in your network&apos;s
             De-Militarized Zone
             (<ulink url="http://compnetworking.about.com/cs/networksecurity/g/bldef_dmz.htm">DMZ</ulink>)
             or elsewhere.

@@ -404,7 +404,7 @@
     </indexterm>
 
     <para>
-      Each MySQL Cluster host computer running SQL nodes must have
+      Each MySQL Cluster host computer running an SQL node must have
       installed on it a MySQL binary. For management nodes and data
       nodes, it is not necessary to install the MySQL server binary, but
       management nodes require the management server daemon

@@ -417,18 +417,19 @@
 
     <para>
       MySQL AB provides precompiled binaries that support Cluster, and
-      there is generally no need to compile these yourself. (However, we
+      there is generally no need to compile these yourself. However, we
       also include information relating to installing a MySQL Cluster
-      after building MySQL from source.) For setting up a cluster using
-      MySQL's binaries, the first step in the installation process for
-      each cluster host is to download the file
-      <filename>mysql-&current-version;-pc-linux-gnu-i686.tar.gz</filename>
-      from the <ulink url="&base-url-downloads;">MySQL downloads
+      after building MySQL from source. For setting up a cluster using
+      MySQL&apos;s binaries, the first step in the installation process
+      for each cluster host is to download the file
+      <filename>mysql-&mysql-cluster-current-6.2;-linux-i686-glibc23.tar.gz</filename>
+      from the <ulink url="&base-url-cluster-downloads;">MySQL downloads
       area</ulink>. We assume that you have placed it in each machine's
       <filename>/var/tmp</filename> directory. (If you do require a
       custom binary, see <xref linkend="installing-source-tree"/>.)
     </para>
 
+<!--
     <para>
       RPMs are also available for both 32-bit and 64-bit Linux
       platforms. For a MySQL Cluster, three RPMs are required:

@@ -503,6 +504,7 @@
       After installing from RPM, you still need to configure the cluster
       as discussed in <xref linkend="mysql-cluster-multi-config"/>.
     </para>
+-->
 
     <note>
       <para>

@@ -564,8 +566,8 @@
 
 <programlisting>
 shell&gt; <userinput>cd /var/tmp</userinput>
-shell&gt; <userinput>tar -C /usr/local -xzvf mysql-&current-version;-pc-linux-gnu-i686.tar.gz</userinput>
-shell&gt; <userinput>ln -s /usr/local/mysql-&current-version;-pc-linux-gnu-i686 /usr/local/mysql</userinput>
+shell&gt; <userinput>tar -C /usr/local -xzvf mysql-&mysql-cluster-current-6.2;-linux-i686-glibc23.tar.gz</userinput>
+shell&gt; <userinput>ln -s /usr/local/mysql-&mysql-cluster-current-6.2;-linux-i686-glibc23.tar.gz /usr/local/mysql</userinput>
 </programlisting>
           </listitem>
 

@@ -640,7 +642,8 @@
 
     </formalpara>
 
-    <formalpara>
+<!--
+      <formalpara>
 
       <title>SQL node installation &mdash; RPM files</title>
 

@@ -669,6 +672,7 @@
       </para>
 
     </formalpara>
+-->
 
     <formalpara>
 

@@ -698,6 +702,7 @@
 
     </formalpara>
 
+<!--
     <formalpara>
 
       <title>Data node installation &mdash; RPM Files</title>

@@ -720,6 +725,7 @@
       </para>
 
     </formalpara>
+-->
 
     <formalpara>
 

@@ -778,8 +784,8 @@
 
 <programlisting>
 shell&gt; <userinput>cd /var/tmp</userinput>
-shell&gt; <userinput>tar -zxvf mysql-&current-version;-pc-linux-gnu-i686.tar.gz</userinput>
-shell&gt; <userinput>cd mysql-&current-version;-pc-linux-gnu-i686</userinput>
+shell&gt; <userinput>tar -zxvf mysql-&mysql-cluster-current-6.2;-linux-i686-glibc23.tar.gz</userinput>
+shell&gt; <userinput>cd mysql-&mysql-cluster-current-6.2;-linux-i686-glibc23</userinput>
 shell&gt; <userinput>cp /bin/ndb_mgm* /usr/local/bin</userinput>
 </programlisting>
 

@@ -807,6 +813,7 @@
       </orderedlist>
     </para>
 
+<!--
     <formalpara>
 
       <title>Management node installation &mdash; RPM file</title>

@@ -851,6 +858,7 @@
       (<command>ndb_mgm</command>) to the <filename>/usr/bin</filename>
       directory.
     </para>
+-->
 
     <formalpara>
 

@@ -1026,11 +1034,10 @@
 
 # TCP/IP options:
 [tcp default]     
-portnumber=2202   # This the default; however, you can use any
-                               # port that is free for all the hosts in the cluster
-                               # Note: It is recommended that you do not specify the 
-                               # portnumber at all and allow the default value to be 
-                               # used instead
+portnumber=2202   # This the default; however, you can use any port that is free 
+                  # for all the hosts in the cluster
+                  # Note: It is recommended that you do not specify the port 
+                  # number at all and allow the default value to be used instead
 
 # Management process options:
 [ndb_mgmd]                      

@@ -1186,14 +1193,14 @@
 Cluster Configuration
 ---------------------
 [ndbd(NDB)]     2 node(s)
-id=2    @192.168.0.30  (Version: &current-version;, Nodegroup: 0, Master)
-id=3    @192.168.0.40  (Version: &current-version;, Nodegroup: 0)
+id=2    @192.168.0.30  (Version: &mysql-cluster-current-6.2;, Nodegroup: 0, Master)
+id=3    @192.168.0.40  (Version: &mysql-cluster-current-6.2;, Nodegroup: 0)
 
 [ndb_mgmd(MGM)] 1 node(s)
-id=1    @192.168.0.10  (Version: &current-version;)
+id=1    @192.168.0.10  (Version: &mysql-cluster-current-6.2;)
 
 [mysqld(SQL)]   1 node(s)
-id=4   (Version: &current-version;)
+id=4   (Version: &mysql-cluster-current-6.2;)
 </programlisting>
 
     <note>

@@ -1399,19 +1406,6 @@
     </para>
 
     <para>
-      It is important to note that <literal>NDBCLUSTER</literal> in
-      MySQL &current-series; does not support autodiscovery of
-      databases. (See <xref linkend="mysql-cluster-limitations"/>.) This
-      means that, once the <literal>world</literal> database and its
-      tables have been created on one data node, you need to issue the
-      <literal>CREATE DATABASE world</literal> statement (or you may use
-      <literal>CREATE SCHEMA world</literal> instead), followed by
-      <literal>FLUSH TABLES</literal> on each SQL node in the cluster.
-      This causes the node to recognize the database and read its table
-      definitions.
-    </para>
-
-    <para>
       Running <literal>SELECT</literal> queries on the SQL node is no
       different from running them on any other instance of a MySQL
       server. To run queries from the command line, you first need to

@@ -1424,7 +1418,7 @@
 shell&gt; <userinput>mysql -u root -p</userinput>
 Enter password:
 Welcome to the MySQL monitor.  Commands end with ; or \g.
-Your MySQL connection id is 1 to server version: &current-version;
+Your MySQL connection id is 1 to server version: &mysql-cluster-current-6.2;
 
 Type 'help;' or '\h' for help. Type '\c' to clear the buffer.
 

@@ -1432,8 +1426,8 @@
 </programlisting>
 
     <para>
-      We simply use the MySQL server's <literal>root</literal> account
-      and assume that you have followed the standard security
+      We simply use the MySQL server&apos;s <literal>root</literal>
+      account and assume that you have followed the standard security
       precautions for installing a MySQL server, including setting a
       strong <literal>root</literal> password. For more information, see
       <xref linkend="default-privileges"/>.


Modified: trunk/refman-5.1/mysql-cluster-news-core.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-news-core.xml	2008-06-12 11:38:47 UTC (rev 10937)
+++ trunk/refman-5.1/mysql-cluster-news-core.xml	2008-06-12 15:52:54 UTC (rev 10938)
Changed blocks: 25, Lines Added: 26, Lines Deleted: 74; 11528 bytes

@@ -1437,9 +1437,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1481,9 +1479,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1525,9 +1521,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1569,9 +1563,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1613,9 +1605,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1657,9 +1647,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1701,9 +1689,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1745,9 +1731,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1789,9 +1773,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1833,9 +1815,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1877,9 +1857,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1921,9 +1899,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -1965,9 +1941,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2009,9 +1983,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2053,9 +2025,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2097,9 +2067,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2141,9 +2109,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2185,9 +2151,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2229,9 +2193,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2273,9 +2235,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2317,9 +2277,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2361,9 +2319,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2405,9 +2361,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>

@@ -2436,8 +2390,8 @@
       <title condition="dynamic:changelog:vertitle" role="5.1.14-ndb-6.1.0:mysqld:all"/>
 
       <para role="release-level">
-        This is the first MySQL Cluster NDB 6.1 release,
-        incorporatingnew features and bugfiuxes made for the
+        This is the first MySQL Cluster NDB 6.1 release, incorporating
+        new features and bugfixes made for the
         <literal>NDBCLUSTER</literal> storage engine made since
         branching from MySQL 5.1.14 standard (see
         <xref linkend="news-5-1-14"/>).

@@ -2452,9 +2406,7 @@
           Carrier Grade Edition 6.1.x</quote>) is no longer being
           developed or maintained; if you are using a MySQL Cluster NDB
           6.1 release, you should consider upgrading to MySQL Cluster
-          NDB 6.2 or 6.3. If you require source code for this series,
-          you can obtain it from
-          <ulink url="http://mysql.bkbits.net/"/>.
+          NDB 6.2 or 6.3.
         </para>
 
       </formalpara>


Modified: trunk/refman-6.0/mysql-cluster-configuration.xml
===================================================================
--- trunk/refman-6.0/mysql-cluster-configuration.xml	2008-06-12 11:38:47 UTC (rev 10937)
+++ trunk/refman-6.0/mysql-cluster-configuration.xml	2008-06-12 15:52:54 UTC (rev 10938)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 782 bytes

@@ -67,8 +67,8 @@
     </para>
 
     <para>
-      If you choose to build from a source tarball or the MySQL
-      &current-series; BitKeeper tree, be sure to use the
+      If you choose to build from a source tarball or one of the MySQL
+      Cluster public development trees, be sure to use the
       <option>--with-ndbcluster</option> option when running
       <command>configure</command>. You can also use the
       <command>BUILD/compile-pentium-max</command> build script. Note


Thread
svn commit - mysqldoc@docsrva: r10938 - in trunk: it/refman-5.1 it/refman-common pt/refman-5.1 pt/refman-common refman-4.1 refman-5.0 refman-5.1 refma...jon12 Jun