svn commit - mysqldoc@docsrva: r6329 - in trunk: . refman-4.1 refman-5.0 refman-5.1

[paul]

Author: paul
Date: 2007-05-04 16:21:37 +0200 (Fri, 04 May 2007)
New Revision: 6329

Log:
 r19978@frost:  paul | 2007-05-04 09:19:23 -0500
 Clarify that RPM-install section is for Linux distributions that use RPM.
 Other Linuxes can use .tar.gz files.
 Some markup fixes.


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

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:24443
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:19943
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:17229
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:24443
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:19978
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:17229


Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2007-05-04 12:47:30 UTC (rev 6328)
+++ trunk/refman-4.1/installing.xml	2007-05-04 14:21:37 UTC (rev 6329)
Changed blocks: 6, Lines Added: 20, Lines Deleted: 12; 3273 bytes

@@ -1160,7 +1160,7 @@
           In addition to the binaries provided in platform-specific
           package formats, we offer binary distributions for a number of
           platforms in the form of compressed <command>tar</command>
-          files (<literal>.tar.gz</literal> files). See
+          files (<filename>.tar.gz</filename> files). See
           <xref linkend="quick-standard-installation"/>.
         </para>
 

@@ -1957,9 +1957,9 @@
         <para>
           <emphasis role="bold">Note</emphasis>: Make sure to verify the
           checksum of the <emphasis>archive file</emphasis> (for
-          example, the <literal>.zip</literal> or
-          <literal>.tar.gz</literal> file) and not of the files that are
-          contained inside of the archive.
+          example, the <filename>.zip</filename> or
+          <filename>.tar.gz</filename> file) and not of the files that
+          are contained inside of the archive.
         </para>
 
         <para>

@@ -5700,7 +5700,7 @@
 
   <section id="linux-rpm">
 
-    <title>Installing MySQL on Linux</title>
+    <title>Installing MySQL from RPM Packages on Linux</title>
 
     <indexterm>
       <primary>RPM file</primary>

@@ -5716,14 +5716,21 @@
     </indexterm>
 
     <para>
-      The recommended way to install MySQL on Linux is by using the RPM
-      packages. The MySQL RPMs are currently built on a SuSE Linux 7.3
-      system, but should work on most versions of Linux that support
-      <command>rpm</command> and use <literal>glibc</literal>. To
obtain
-      RPM packages, see <xref linkend="getting-mysql"/>.
+      The recommended way to install MySQL on RPM-based Linux
+      distributions is by using the RPM packages. The MySQL RPMs are
+      currently built on a SuSE Linux 7.3 system, but should work on
+      most versions of Linux that support <command>rpm</command> and use
+      <literal>glibc</literal>. To obtain RPM packages, see
+      <xref linkend="getting-mysql"/>.
     </para>
 
     <para>
+      For non-RPM Linux distributions, you can install MySQL using a
+      <filename>.tar.gz</filename> package. See
+      <xref linkend="installing-binary"/>.
+    </para>
+
+    <para>
       MySQL AB does provide some platform-specific RPMs; the difference
       between a platform-specific RPM and a generic RPM is that a
       platform-specific RPM is built on the targeted platform and is

@@ -6711,7 +6718,8 @@
 
   <section id="installing-binary">
 
-    <title>Installing MySQL on Other Unix-Like Systems</title>
+    <title>Installing MySQL from <filename>tar.gz</filename> Packages
on Other
+      Unix-Like Systems</title>
 
     <indexterm>
       <primary>installing</primary>

@@ -6727,7 +6735,7 @@
       This section covers the installation of MySQL binary distributions
       that are provided for various platforms in the form of compressed
       <command>tar</command> files (files with a
-      <literal>.tar.gz</literal> extension). See
+      <filename>.tar.gz</filename> extension). See
       <xref linkend="mysql-binaries"/>, for a detailed list.
     </para>
 


Modified: trunk/refman-5.0/installing-cs.xml
===================================================================
--- trunk/refman-5.0/installing-cs.xml	2007-05-04 12:47:30 UTC (rev 6328)
+++ trunk/refman-5.0/installing-cs.xml	2007-05-04 14:21:37 UTC (rev 6329)
Changed blocks: 6, Lines Added: 20, Lines Deleted: 11; 3255 bytes

@@ -1106,7 +1106,7 @@
         In addition to the binaries provided in platform-specific
         package formats, we offer binary distributions for a number of
         platforms in the form of compressed <command>tar</command> files
-        (<literal>.tar.gz</literal> files). See
+        (<filename>.tar.gz</filename> files). See
         <xref linkend="quick-standard-installation"/>.
       </para>
 

@@ -1904,8 +1904,9 @@
       <para>
         <emphasis role="bold">Note</emphasis>: Make sure to verify the
         checksum of the <emphasis>archive file</emphasis> (for example,
-        the <literal>.zip</literal> or <literal>.tar.gz</literal>
file)
-        and not of the files that are contained inside of the archive.
+        the <filename>.zip</filename> or
<filename>.tar.gz</filename>
+        file) and not of the files that are contained inside of the
+        archive.
       </para>
 
       <para>

@@ -4699,7 +4700,7 @@
 
   <section id="linux-rpm" role="cses">
 
-    <title>Installing MySQL on Linux</title>
+    <title>Installing MySQL from RPM Packages on Linux</title>
 
     <indexterm>
       <primary>RPM file</primary>

@@ -4724,14 +4725,21 @@
     </remark>
 
     <para>
-      The recommended way to install MySQL on Linux is by using the RPM
-      packages. The MySQL RPMs are currently built on a SuSE Linux 7.3
-      system, but should work on most versions of Linux that support
-      <command>rpm</command> and use <literal>glibc</literal>. To
obtain
-      RPM packages, see <xref linkend="getting-mysql"/>.
+      The recommended way to install MySQL on RPM-based Linux
+      distributions is by using the RPM packages. The MySQL RPMs are
+      currently built on a SuSE Linux 7.3 system, but should work on
+      most versions of Linux that support <command>rpm</command> and use
+      <literal>glibc</literal>. To obtain RPM packages, see
+      <xref linkend="getting-mysql"/>.
     </para>
 
     <para>
+      For non-RPM Linux distributions, you can install MySQL using a
+      <filename>.tar.gz</filename> package. See
+      <xref linkend="installing-binary"/>.
+    </para>
+
+    <para>
       MySQL AB does provide some platform-specific RPMs; the difference
       between a platform-specific RPM and a generic RPM is that a
       platform-specific RPM is built on the targeted platform and is

@@ -5730,7 +5738,8 @@
 
   <section id="installing-binary" role="cs">
 
-    <title>Installing MySQL on Other Unix-Like Systems</title>
+    <title>Installing MySQL from <filename>tar.gz</filename> Packages
on Other
+      Unix-Like Systems</title>
     &cs-only;
     <indexterm>
       <primary>installing</primary>

@@ -5746,7 +5755,7 @@
       This section covers the installation of MySQL binary distributions
       that are provided for various platforms in the form of compressed
       <command>tar</command> files (files with a
-      <literal>.tar.gz</literal> extension). See
+      <filename>.tar.gz</filename> extension). See
       <xref linkend="mysql-binaries"/>, for a detailed list.
     </para>
 


Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2007-05-04 12:47:30 UTC (rev 6328)
+++ trunk/refman-5.1/installing.xml	2007-05-04 14:21:37 UTC (rev 6329)
Changed blocks: 6, Lines Added: 20, Lines Deleted: 12; 3270 bytes

@@ -1195,7 +1195,7 @@
           In addition to the binaries provided in platform-specific
           package formats, we offer binary distributions for a number of
           platforms in the form of compressed <command>tar</command>
-          files (<literal>.tar.gz</literal> files). See
+          files (<filename>.tar.gz</filename> files). See
           <xref linkend="quick-standard-installation"/>.
         </para>
 

@@ -1997,9 +1997,9 @@
         <para>
           <emphasis role="bold">Note</emphasis>: Make sure to verify the
           checksum of the <emphasis>archive file</emphasis> (for
-          example, the <literal>.zip</literal> or
-          <literal>.tar.gz</literal> file) and not of the files that are
-          contained inside of the archive.
+          example, the <filename>.zip</filename> or
+          <filename>.tar.gz</filename> file) and not of the files that
+          are contained inside of the archive.
         </para>
 
         <para>

@@ -5486,7 +5486,7 @@
 
   <section id="linux-rpm">
 
-    <title>Installing MySQL on Linux</title>
+    <title>Installing MySQL from RPM Packages on Linux</title>
 
     <indexterm>
       <primary>RPM file</primary>

@@ -5511,14 +5511,21 @@
     </remark>
 
     <para>
-      The recommended way to install MySQL on Linux is by using the RPM
-      packages. The MySQL RPMs are currently built on a SuSE Linux 7.3
-      system, but should work on most versions of Linux that support
-      <command>rpm</command> and use <literal>glibc</literal>. To
obtain
-      RPM packages, see <xref linkend="getting-mysql"/>.
+      The recommended way to install MySQL on RPM-based Linux
+      distributions is by using the RPM packages. The MySQL RPMs are
+      currently built on a SuSE Linux 7.3 system, but should work on
+      most versions of Linux that support <command>rpm</command> and use
+      <literal>glibc</literal>. To obtain RPM packages, see
+      <xref linkend="getting-mysql"/>.
     </para>
 
     <para>
+      For non-RPM Linux distributions, you can install MySQL using a
+      <filename>.tar.gz</filename> package. See
+      <xref linkend="installing-binary"/>.
+    </para>
+
+    <para>
       MySQL AB does provide some platform-specific RPMs; the difference
       between a platform-specific RPM and a generic RPM is that a
       platform-specific RPM is built on the targeted platform and is

@@ -6506,7 +6513,8 @@
 
   <section id="installing-binary">
 
-    <title>Installing MySQL on Other Unix-Like Systems</title>
+    <title>Installing MySQL from <filename>tar.gz</filename> Packages
on Other
+      Unix-Like Systems</title>
 
     <indexterm>
       <primary>installing</primary>

@@ -6522,7 +6530,7 @@
       This section covers the installation of MySQL binary distributions
       that are provided for various platforms in the form of compressed
       <command>tar</command> files (files with a
-      <literal>.tar.gz</literal> extension). See
+      <filename>.tar.gz</filename> extension). See
       <xref linkend="mysql-binaries"/>, for a detailed list.
     </para>