svn commit - mysqldoc@docsrva: r4361 - trunk/gui-common

[plavin]

Author: plavin
Date: 2007-01-02 23:13:07 +0100 (Tue, 02 Jan 2007)
New Revision: 4361

Log:
Minor changes to new chapter

Modified:
   trunk/gui-common/chapter-upgrade-all.xml
   trunk/gui-common/installation-all.xml


Modified: trunk/gui-common/chapter-upgrade-all.xml
===================================================================
--- trunk/gui-common/chapter-upgrade-all.xml	2007-01-02 20:44:04 UTC (rev 4360)
+++ trunk/gui-common/chapter-upgrade-all.xml	2007-01-02 22:13:07 UTC (rev 4361)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 4; 990 bytes

@@ -38,7 +38,7 @@
 
   <section>
 
-    <title>Upgrading Under Linux</title>
+    <title>Upgrading &ndash; Linux</title>
 
     <section>
 

@@ -75,8 +75,7 @@
       </para>
 
 <programlisting>
-shell&gt; rpm -Uvh mysql-administrator-<replaceable>version</replaceable>.rpm \
-  <filename>mysql-gui-tools-<replaceable>version</replaceable>.rpm</filename>
+shell&gt; rpm -Uvh mysql-administrator-<replaceable>version</replaceable>.rpm mysql-gui-tools-<replaceable>version</replaceable>.rpm
     </programlisting>
 
       <note>

@@ -101,7 +100,7 @@
 
   <section>
 
-    <title>Upgrading Under Mac OS X</title>
+    <title>Upgrading &ndash; Mac OS X</title>
 
     <para>
       Find the directory where you installed &gui_tools;, and remove the


Modified: trunk/gui-common/installation-all.xml
===================================================================
--- trunk/gui-common/installation-all.xml	2007-01-02 20:44:04 UTC (rev 4360)
+++ trunk/gui-common/installation-all.xml	2007-01-02 22:13:07 UTC (rev 4361)
Changed blocks: 3, Lines Added: 2, Lines Deleted: 6; 1122 bytes

@@ -275,7 +275,7 @@
       </para>
       
       <programlisting>
-shell&gt; rpm -iv mysql-*.rpm
+shell&gt; rpm -ivh mysql-*.rpm
 </programlisting>
       
       <para>

@@ -283,10 +283,6 @@
         <xref linkend="rpm-upgrade" />.
       </para>
       
-      <programlisting>
-shell&gt; rpm -Uv mysql-*.rpm
-</programlisting>
-      
       <para>
         If you install the RPM files individually, you must install the
         <filename>mysql-gui-tools-<replaceable>version</replaceable>.rpm</filename>

@@ -300,7 +296,7 @@
       </para>
       
       <programlisting>
-shell&gt; rpm -iv mysql-gui-tools<replaceable>version</replaceable>.rpm mysql-administrator<replaceable>version</replaceable>.rpm 
+shell&gt; rpm -ivh mysql-gui-tools<replaceable>version</replaceable>.rpm mysql-administrator<replaceable>version</replaceable>.rpm 
 </programlisting>
         
       <para>