List:Commits« Previous MessageNext Message »
From:paul Date:January 31 2006 12:45am
Subject:svn commit - mysqldoc@docsrva: r1140 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-31 01:45:27 +0100 (Tue, 31 Jan 2006)
New Revision: 1140

Log:
 r6955@frost:  paul | 2006-01-30 17:13:57 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/installing.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.1/installing.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6954
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2719
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6955
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2719

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-01-31 00:45:07 UTC (rev 1139)
+++ trunk/refman-4.1/installing.xml	2006-01-31 00:45:27 UTC (rev 1140)
@@ -8277,7 +8277,25 @@
       </para>
 
       <para>
-        To obtain our most recent development source tree, use these
+        To obtain our most recent development source tree, first
+        download and install the BitKeeper free client if you do not
+        have it. The client can be obtained from
+        <ulink url="http://www.bitmover.com/bk-client.shar"/>.
+      </para>
+
+      <para>
+        To install the BitKeeper client on Unix, use these commands:
+      </para>
+
+<programlisting>
+shell&gt; <userinput>sh bk-client.shar</userinput>
+shell&gt; <userinput>cd bk_client-1.1</userinput>
+shell&gt; <userinput>make all</userinput>
+shell&gt; <userinput>PATH=$PWD:$PATH</userinput>
+</programlisting>
+
+      <para>
+        To install the BitKeeper client on Windows, use these
         instructions:
       </para>
 
@@ -8285,88 +8303,73 @@
 
         <listitem>
           <para>
-            Download the BitKeeper free client from
-            <ulink url="http://www.bitmover.com/bk-client.shar"/>.
+            Download and install Cygwin from
+            <ulink url="http://cygwin.com/">http://cygwin.com</ulink>.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            On Unix, install the free client like this:
+            Make sure <command>gcc</command> and <command>make</command>
+            have been installed under Cygwin. You can test this by
+            issuing <command>which gcc</command> and <command>which
+            make</command> commands. If either one is not installed, run
+            Cygwin's package manager, select <command>gcc</command>,
+            <command>make</command>, or both, and install them.
           </para>
+        </listitem>
 
-<programlisting>
-shell&gt; <userinput>sh bk-client.shar</userinput>
-shell&gt; <userinput>cd bk_client-1.1</userinput>
-shell&gt; <userinput>make all</userinput>
-shell&gt; <userinput>PATH=$PWD:$PATH</userinput>
-</programlisting>
-
+        <listitem>
           <para>
-            On Windows, install it like this:
+            Under Cygwin, execute these commands:
           </para>
 
-          <itemizedlist>
-
-            <listitem>
-              <para>
-                Download and install Cygwin from
-                <ulink url="http://cygwin.com/">http://cygwin.com</ulink>.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Make sure <command>gcc</command> and
-                <command>make</command> have been installed under
-                Cygwin. You can test this by issuing <command>which
-                gcc</command> and <command>which make</command>
-                commands. If either one is not installed, run Cygwin's
-                package manager, select <command>gcc</command>,
-                <command>make</command>, or both, and install them.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Under Cygwin, perform these steps:
-              </para>
-
 <programlisting>
 shell&gt; <userinput>sh bk-client.shar</userinput>
 shell&gt; <userinput>cd bk_client-1.1</userinput>
 </programlisting>
 
-              <para>
-                Then edit the <filename>Makefile</filename> and change
-                the line that reads <literal>$(CC) $(CFLAGS) -o sfio -lz
-                sfio.c</literal> to this:
-              </para>
+          <para>
+            Then edit the <filename>Makefile</filename> and change the
+            line that reads <literal>$(CC) $(CFLAGS) -o sfio -lz
+            sfio.c</literal> to this:
+          </para>
 
 <programlisting>
 $(CC) $(CFLAGS) -o sfio sfio.c -lz
 </programlisting>
 
-              <para>
-                Now run the <command>make</command> command and set the
-                path:
-              </para>
+          <para>
+            Now run the <command>make</command> command and set the
+            path:
+          </para>
 
 <programlisting>
 shell&gt; <userinput>make all</userinput>
 shell&gt; <userinput>PATH=$PWD:$PATH</userinput>
 </programlisting>
-            </listitem>
-
-          </itemizedlist>
         </listitem>
 
+      </orderedlist>
+
+      <para>
+        The BitKeeper free client is shipped with its source code. The
+        only documentation available for the free client is the source
+        code itself.
+      </para>
+
+      <para>
+        After you have installed the BitKeeper client, you can assess
+        the MySQL development source tree:
+      </para>
+
+      <orderedlist>
+
         <listitem>
           <para>
-            After the BitKeeper free client has been installed, first go
-            to the directory you want to work from, and then use one of
-            the following commands to make a local copy of the MySQL
-            version branch of your choice:
+            Change location to the directory you want to work from, and
+            then use one of the following commands to make a local copy
+            of the MySQL version branch of your choice:
           </para>
 
           <para>
@@ -8621,14 +8624,6 @@
           </para>
         </listitem>
 
-        <listitem>
-          <para>
-            The BitKeeper free client is shipped with its source code.
-            The only documentation available for the free client is the
-            source code itself.
-          </para>
-        </listitem>
-
       </orderedlist>
 
       <para>

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-01-31 00:45:07 UTC (rev 1139)
+++ trunk/refman-5.0/installing.xml	2006-01-31 00:45:27 UTC (rev 1140)
@@ -8182,7 +8182,25 @@
       </para>
 
       <para>
-        To obtain our most recent development source tree, use these
+        To obtain our most recent development source tree, first
+        download and install the BitKeeper free client if you do not
+        have it. The client can be obtained from
+        <ulink url="http://www.bitmover.com/bk-client.shar"/>.
+      </para>
+
+      <para>
+        To install the BitKeeper client on Unix, use these commands:
+      </para>
+
+<programlisting>
+shell&gt; <userinput>sh bk-client.shar</userinput>
+shell&gt; <userinput>cd bk_client-1.1</userinput>
+shell&gt; <userinput>make all</userinput>
+shell&gt; <userinput>PATH=$PWD:$PATH</userinput>
+</programlisting>
+
+      <para>
+        To install the BitKeeper client on Windows, use these
         instructions:
       </para>
 
@@ -8190,88 +8208,73 @@
 
         <listitem>
           <para>
-            Download the BitKeeper free client from
-            <ulink url="http://www.bitmover.com/bk-client.shar"/>.
+            Download and install Cygwin from
+            <ulink url="http://cygwin.com/">http://cygwin.com</ulink>.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            On Unix, install the free client like this:
+            Make sure <command>gcc</command> and <command>make</command>
+            have been installed under Cygwin. You can test this by
+            issuing <command>which gcc</command> and <command>which
+            make</command> commands. If either one is not installed, run
+            Cygwin's package manager, select <command>gcc</command>,
+            <command>make</command>, or both, and install them.
           </para>
+        </listitem>
 
-<programlisting>
-shell&gt; <userinput>sh bk-client.shar</userinput>
-shell&gt; <userinput>cd bk_client-1.1</userinput>
-shell&gt; <userinput>make all</userinput>
-shell&gt; <userinput>PATH=$PWD:$PATH</userinput>
-</programlisting>
-
+        <listitem>
           <para>
-            On Windows, install it like this:
+            Under Cygwin, execute these commands:
           </para>
 
-          <itemizedlist>
-
-            <listitem>
-              <para>
-                Download and install Cygwin from
-                <ulink url="http://cygwin.com/">http://cygwin.com</ulink>.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Make sure <command>gcc</command> and
-                <command>make</command> have been installed under
-                Cygwin. You can test this by issuing <command>which
-                gcc</command> and <command>which make</command>
-                commands. If either one is not installed, run Cygwin's
-                package manager, select <command>gcc</command>,
-                <command>make</command>, or both, and install them.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Under Cygwin, perform these steps:
-              </para>
-
 <programlisting>
 shell&gt; <userinput>sh bk-client.shar</userinput>
 shell&gt; <userinput>cd bk_client-1.1</userinput>
 </programlisting>
 
-              <para>
-                Then edit the <filename>Makefile</filename> and change
-                the line that reads <literal>$(CC) $(CFLAGS) -o sfio -lz
-                sfio.c</literal> to this:
-              </para>
+          <para>
+            Then edit the <filename>Makefile</filename> and change the
+            line that reads <literal>$(CC) $(CFLAGS) -o sfio -lz
+            sfio.c</literal> to this:
+          </para>
 
 <programlisting>
 $(CC) $(CFLAGS) -o sfio sfio.c -lz
 </programlisting>
 
-              <para>
-                Now run the <command>make</command> command and set the
-                path:
-              </para>
+          <para>
+            Now run the <command>make</command> command and set the
+            path:
+          </para>
 
 <programlisting>
 shell&gt; <userinput>make all</userinput>
 shell&gt; <userinput>PATH=$PWD:$PATH</userinput>
 </programlisting>
-            </listitem>
-
-          </itemizedlist>
         </listitem>
 
+      </orderedlist>
+
+      <para>
+        The BitKeeper free client is shipped with its source code. The
+        only documentation available for the free client is the source
+        code itself.
+      </para>
+
+      <para>
+        After you have installed the BitKeeper client, you can assess
+        the MySQL development source tree:
+      </para>
+
+      <orderedlist>
+
         <listitem>
           <para>
-            After the BitKeeper free client has been installed, first go
-            to the directory you want to work from, and then use the
-            following command to make a local copy of the MySQL
-            &current-series; branch:
+            Change location to the directory you want to work from, and
+            then use the following command to make a local copy of the
+            MySQL &current-series; branch:
           </para>
 
 <programlisting>
@@ -8497,14 +8500,6 @@
           </para>
         </listitem>
 
-        <listitem>
-          <para>
-            The BitKeeper free client is shipped with its source code.
-            The only documentation available for the free client is the
-            source code itself.
-          </para>
-        </listitem>
-
       </orderedlist>
 
       <para>

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-01-31 00:45:07 UTC (rev 1139)
+++ trunk/refman-5.1/installing.xml	2006-01-31 00:45:27 UTC (rev 1140)
@@ -8177,7 +8177,25 @@
       </para>
 
       <para>
-        To obtain our most recent development source tree, use these
+        To obtain our most recent development source tree, first
+        download and install the BitKeeper free client if you do not
+        have it. The client can be obtained from
+        <ulink url="http://www.bitmover.com/bk-client.shar"/>.
+      </para>
+
+      <para>
+        To install the BitKeeper client on Unix, use these commands:
+      </para>
+
+<programlisting>
+shell&gt; <userinput>sh bk-client.shar</userinput>
+shell&gt; <userinput>cd bk_client-1.1</userinput>
+shell&gt; <userinput>make all</userinput>
+shell&gt; <userinput>PATH=$PWD:$PATH</userinput>
+</programlisting>
+
+      <para>
+        To install the BitKeeper client on Windows, use these
         instructions:
       </para>
 
@@ -8185,88 +8203,73 @@
 
         <listitem>
           <para>
-            Download the BitKeeper free client from
-            <ulink url="http://www.bitmover.com/bk-client.shar"/>.
+            Download and install Cygwin from
+            <ulink url="http://cygwin.com/">http://cygwin.com</ulink>.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            On Unix, install the free client like this:
+            Make sure <command>gcc</command> and <command>make</command>
+            have been installed under Cygwin. You can test this by
+            issuing <command>which gcc</command> and <command>which
+            make</command> commands. If either one is not installed, run
+            Cygwin's package manager, select <command>gcc</command>,
+            <command>make</command>, or both, and install them.
           </para>
+        </listitem>
 
-<programlisting>
-shell&gt; <userinput>sh bk-client.shar</userinput>
-shell&gt; <userinput>cd bk_client-1.1</userinput>
-shell&gt; <userinput>make all</userinput>
-shell&gt; <userinput>PATH=$PWD:$PATH</userinput>
-</programlisting>
-
+        <listitem>
           <para>
-            On Windows, install it like this:
+            Under Cygwin, execute these commands:
           </para>
 
-          <itemizedlist>
-
-            <listitem>
-              <para>
-                Download and install Cygwin from
-                <ulink url="http://cygwin.com/">http://cygwin.com</ulink>.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Make sure <command>gcc</command> and
-                <command>make</command> have been installed under
-                Cygwin. You can test this by issuing <command>which
-                gcc</command> and <command>which make</command>
-                commands. If either one is not installed, run Cygwin's
-                package manager, select <command>gcc</command>,
-                <command>make</command>, or both, and install them.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                Under Cygwin, perform these steps:
-              </para>
-
 <programlisting>
 shell&gt; <userinput>sh bk-client.shar</userinput>
 shell&gt; <userinput>cd bk_client-1.1</userinput>
 </programlisting>
 
-              <para>
-                Then edit the <filename>Makefile</filename> and change
-                the line that reads <literal>$(CC) $(CFLAGS) -o sfio -lz
-                sfio.c</literal> to this:
-              </para>
+          <para>
+            Then edit the <filename>Makefile</filename> and change the
+            line that reads <literal>$(CC) $(CFLAGS) -o sfio -lz
+            sfio.c</literal> to this:
+          </para>
 
 <programlisting>
 $(CC) $(CFLAGS) -o sfio sfio.c -lz
 </programlisting>
 
-              <para>
-                Now run the <command>make</command> command and set the
-                path:
-              </para>
+          <para>
+            Now run the <command>make</command> command and set the
+            path:
+          </para>
 
 <programlisting>
 shell&gt; <userinput>make all</userinput>
 shell&gt; <userinput>PATH=$PWD:$PATH</userinput>
 </programlisting>
-            </listitem>
-
-          </itemizedlist>
         </listitem>
 
+      </orderedlist>
+
+      <para>
+        The BitKeeper free client is shipped with its source code. The
+        only documentation available for the free client is the source
+        code itself.
+      </para>
+
+      <para>
+        After you have installed the BitKeeper client, you can assess
+        the MySQL development source tree:
+      </para>
+
+      <orderedlist>
+
         <listitem>
           <para>
-            After the BitKeeper free client has been installed, first go
-            to the directory you want to work from, and then use the
-            following command to make a local copy of the MySQL
-            &current-series; branch:
+            Change location to the directory you want to work from, and
+            then use the following command to make a local copy of the
+            MySQL &current-series; branch:
           </para>
 
 <programlisting>
@@ -8502,14 +8505,6 @@
           </para>
         </listitem>
 
-        <listitem>
-          <para>
-            The BitKeeper free client is shipped with its source code.
-            The only documentation available for the free client is the
-            source code itself.
-          </para>
-        </listitem>
-
       </orderedlist>
 
       <para>

Thread
svn commit - mysqldoc@docsrva: r1140 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul31 Jan