nightmorph    06/09/10 21:11:22

  Modified:             mysql-upgrading.xml
  Log:
  numerous fixes for bug 147078

Revision  Changes    Path
1.14                 xml/htdocs/doc/en/mysql-upgrading.xml

file : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml?rev=1.14&view=markup
plain: 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml?rev=1.14&content-type=text/plain
diff : 
http://sources.gentoo.org/viewcvs.py/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml?r1=1.13&r2=1.14

Index: mysql-upgrading.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mysql-upgrading.xml 10 Sep 2006 01:57:15 -0000      1.13
+++ mysql-upgrading.xml 10 Sep 2006 21:11:22 -0000      1.14
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding="UTF-8"?>
 <!DOCTYPE guide SYSTEM "/dtd/guide.dtd">
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml,v 1.13 
2006/09/10 01:57:15 rane Exp $ -->
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/mysql-upgrading.xml,v 1.14 
2006/09/10 21:11:22 nightmorph Exp $ -->
 
 <guide link="/doc/en/mysql-upgrading.xml">
 <title>Upgrade guide to MySQL 4.* or 5.0.*</title>
@@ -14,16 +14,16 @@
 
 <abstract>
 The MySQL herd is proud to announce that MySQL 5.0 will soon be found in
-Gentoo's stable tree. This document describes how to upgrade from MySQL 4.* to
-5.0.*
+Gentoo's stable tree. This document describes how to upgrade to MySQL 4.* and
+to 5.0.*.
 </abstract>
 
 <!-- The content of this document is licensed under the CC-BY-SA license -->
 <!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
 <license/>
 
-<version>1.10</version>
-<date>2006-09-09</date>
+<version>1.11</version>
+<date>2006-09-10</date>
 
 <chapter>
 <title>Straight upgrade, suggested for 4.1 =&gt; 5.0 migration</title>
@@ -31,11 +31,11 @@
 <body>
 
 <p>
-The myisam storage engine in 4.1 version was already mature enough to allow a
+The myisam storage engine in version 4.1 was already mature enough to allow a
 direct upgrade to the next major version of MySQL.
 </p>
 
-<pre caption="Straight upgrade">
+<pre caption="Straight upgrade from 4.1 to 5.0.*">
 # <i>quickpkg dev-db/mysql</i>
 # <i>alias MYSQL="mysql --user=root 
--password=</i><comment>'your_password'</comment><i>"</i>
 # <i>DATADIR=$(MYSQL --batch --raw --silent --skip-column-names \</i>
@@ -149,11 +149,11 @@
 <note>
 Now two different backups should exist: the SQL one, which is portable between
 various versions of MySQL, and the other one that will allow you to quickly
-restore your database. This is covered later in this doc in more detail.
+restore your database. This is covered later in this document in more detail.
 </note>
 
 <p>
-After you got rid of your old MySQL installation, you can now install the new
+After you get rid of your old MySQL installation, you can now install the new
 version. Note that <c>revdep-rebuild</c> is necessary for rebuilding packages
 linking against MySQL.
 </p>
@@ -187,16 +187,16 @@
 </impo>
 
 <impo>
-The default character set in gentoo mysql 4.1 and above is <c>utf8</c>. If the
-data contain <e>non</e>-ASCII characters, you may want to preserve the default
+The default character set in MySQL 4.1 and above is <c>utf8</c>. If the data
+contain <e>non</e>-ASCII characters, you may want to preserve the default
 character set of the database replacing all occurrences of <c>utf8</c> with
-<c>latin1</c> into the <path>/etc/mysql/my.cnf</path> config file. More
+<c>latin1</c> in the <path>/etc/mysql/my.cnf</path> config file. More
 information can be found <uri link="#On_charset_conversion">Charset
-conversion</uri> charapter.
+conversion</uri> chapter.
 </impo>
 
 <impo>
-The administrative <c>mysql</c> database that containins user names, passwords
+The administrative <c>mysql</c> database that contains user names, passwords
 amongst other things is and <b>must</b> be in encoded in utf8.
 </impo>
 
@@ -268,7 +268,7 @@
 <body>
 
 <p>
-This charapter is not intended to be an exhaustive guide on how to do such
+This chapter is not intended to be an exhaustive guide on how to do such
 conversions, rather a short list of hints on which the reader can elaborate.
 </p>
 
@@ -285,8 +285,8 @@
 <body>
 
 <p>
-Every utf-8 char is considered 3 bytes long within an index. Indexes in MySQL
-can be up to 1000 bytes long (767 bytes for InnoDB tables). Note that the
+Every utf-8 character is considered 3 bytes long within an index. Indexes in
+MySQL can be up to 1000 bytes long (767 bytes for InnoDB tables). Note that the
 limits are measured in bytes, whereas the length of a column is interpreted as
 number of characters.
 </p>
@@ -353,7 +353,7 @@
 Working in a utf-8 environment, with utf-8 editors and tools help too:
 </p>
 
-<pre caption="Shell evironment variables">
+<pre caption="Shell environment variables">
 LC_ALL=en_US.UTF-8
 LANG=en_US.UTF-8
 export LC_ALL LANG
@@ -409,7 +409,7 @@
 <body>
 
 <p>
-To use utf-8 with apache, you need to adjust the folowing variables in
+To use utf-8 with apache, you need to adjust the following variables in
 <path>httpd.conf</path>: AddDefaultCharset, CharsetDefault, CharsetSourceEnc.
 If your source html files aren't encoded in utf-8, they <b>must</b> be
 converted with <c>iconv</c> or <c>recode</c>.



-- 
[email protected] mailing list

Reply via email to