Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html
ChangeSet
1.3024 05/07/14 14:29:41 paul@stripped +9 -0
Simplify <ulink>.
refman/client-side-scripts.xml
1.4 05/07/14 14:29:22 paul@stripped +2 -3
refman/charset.xml
1.7 05/07/14 14:29:21 paul@stripped +6 -6
refman-5.0/credits.xml
1.4 05/07/14 14:29:01 paul@stripped +7 -8
Sync.
refman-5.0/client-side-scripts.xml
1.3 05/07/14 14:29:01 paul@stripped +1 -2
Sync.
refman-5.0/charset.xml
1.8 05/07/14 14:29:01 paul@stripped +142 -111
Sync.
refman-4.1/credits.xml
1.4 05/07/14 14:29:01 paul@stripped +7 -8
Sync.
refman-4.1/client-side-scripts.xml
1.3 05/07/14 14:29:01 paul@stripped +1 -2
Sync.
refman-4.1/charset.xml
1.5 05/07/14 14:29:01 paul@stripped +6 -6
Sync.
refman/charset.xml
1.6 05/07/14 14:25:44 paul@stripped +3 -3
Simplify <ulink>.
refman/client-side-scripts.xml
1.3 05/07/14 14:25:38 paul@stripped +2 -2
Simplify <ulink>.
refman/credits.xml
1.4 05/07/14 14:25:22 paul@stripped +7 -8
Simplify <ulink>.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: paul
# Host: kite-hub.kitebird.com
# Root: /src/extern/MySQL/bk/mysqldoc
--- 1.4/refman-4.1/charset.xml 2005-06-22 11:56:55 -05:00
+++ 1.5/refman-4.1/charset.xml 2005-07-14 14:29:01 -05:00
@@ -2242,9 +2242,9 @@
<para>
It is important to note that the ``MySQL 4.0 character set'' contains
both character set and collation information in one single entity.
- Beginning in MySQL 4.1, character sets and collations are separate entities.
- Though each collation corresponds to a particular character set, the two are
- not bundled together.
+ Beginning in MySQL 4.1, character sets and collations are separate
+ entities. Though each collation corresponds to a particular character
+ set, the two are not bundled together.
</para>
<para>
@@ -3130,9 +3130,9 @@
<para>
The <literal>utf8_unicode_ci</literal> collation is implemented
according to the Unicode Collation Algorithm (UCA) described at
- <ulink url="http://www.unicode.org/reports/tr10/">http://www.unicode.org/reports/tr10/</ulink>.
- The collation uses the version-4.0.0 UCA weight keys:
- <ulink url="http://www.unicode.org/Public/UCA/4.0.0/allkeys-4.0.0.txt">http://www.unicode.org/Public/UCA/4.0.0/allkeys-4.0.0.txt</ulink>.
+ <ulink url="http://www.unicode.org/reports/tr10/"/>. The collation
+ uses the version-4.0.0 UCA weight keys:
+ <ulink url="http://www.unicode.org/Public/UCA/4.0.0/allkeys-4.0.0.txt"/>.
(The following discussion uses <literal>utf8_unicode_ci</literal>,
but it is also true for <literal>ucs2_unicode_ci</literal>.)
</para>
--- 1.2/refman-4.1/client-side-scripts.xml 2005-07-14 14:01:43 -05:00
+++ 1.3/refman-4.1/client-side-scripts.xml 2005-07-14 14:29:01 -05:00
@@ -4057,8 +4057,7 @@
<para>
<command>mysqlcc</command> is deprecated and it is recommended that
users choose the new MySQL Administrator and MySQL Query Browser,
- found at
- <ulink url="http://dev.mysql.com/downloads/">http://dev.mysql.com/downloads/</ulink>.
+ found at <ulink url="http://dev.mysql.com/downloads/"/>.
</para>
<!-- @command{mysqlcc} is not included with MySQL distributions, but can be downloaded -->
--- 1.3/refman-4.1/credits.xml 2005-07-08 10:50:42 -05:00
+++ 1.4/refman-4.1/credits.xml 2005-07-14 14:29:01 -05:00
@@ -920,8 +920,7 @@
</para>
<para>
- For helping us acquire
- <ulink url="http://www.mysql.com/">http://www.mysql.com/</ulink>.
+ For helping us acquire <ulink url="http://www.mysql.com/"/>.
</para></listitem>
<listitem><para>
@@ -1186,8 +1185,8 @@
</para>
<para>
- <ulink url="http://www.pspl.co.in/konark/">http://www.pspl.co.in/konark/</ulink>.
- Help with the Win64 port of the MySQL server.
+ <ulink url="http://www.pspl.co.in/konark/"/>. Help with the Win64
+ port of the MySQL server.
</para></listitem>
<listitem><para>
@@ -1459,9 +1458,9 @@
<para>
First translator of the MySQL Reference Manual into simplified
Chinese in early 2000 on which the Big5 and HK coded
- (<ulink url="http://mysql.hitstar.com/">http://mysql.hitstar.com/</ulink>)
- versions were based. <ulink url="http://linuxdb.yeah.net">Personal
- home page at linuxdb.yeah.net</ulink>.
+ (<ulink url="http://mysql.hitstar.com/"/>) versions were based.
+ <ulink url="http://linuxdb.yeah.net">Personal home page at
+ linuxdb.yeah.net</ulink>.
</para></listitem>
<listitem><para>
@@ -1721,7 +1720,7 @@
We can't list every possible package here because the list would then
be way to hard to maintain. For other packages, please refer to the
software portal at
- <ulink url="http://solutions.mysql.com/software/">http://solutions.mysql.com/software/</ulink>.
+ <ulink url="http://solutions.mysql.com/software/"/>.
</para>
<itemizedlist>
--- 1.7/refman-5.0/charset.xml 2005-07-13 20:57:15 -05:00
+++ 1.8/refman-5.0/charset.xml 2005-07-14 14:29:01 -05:00
@@ -74,7 +74,7 @@
<para>
Character set support currently is included in the
- <literal>MyISAM</literal>, <literal>MEMORY</literal>, and
+ <literal>MyISAM</literal>, <literal>MEMORY</literal>, and
<literal>InnoDB</literal> storage engines.
</para>
@@ -162,11 +162,11 @@
</itemizedlist>
<para>
- In these respects, not only is MySQL 5.0 far more flexible than
- earlier versions of MySQL, it also is far ahead of other DBMSs.
- However, to use these features effectively, you need to know what
- character sets and collations are available, how to change the
- defaults, and how they effect the behaviour of string operators and
+ In these respects, not only is MySQL 5.0 far more flexible than
+ earlier versions of MySQL, it also is far ahead of other DBMSs.
+ However, to use these features effectively, you need to know what
+ character sets and collations are available, how to change the
+ defaults, and how they effect the behaviour of string operators and
functions.
</para>
@@ -211,7 +211,7 @@
</programlisting>
<para>
- (For a complete listing, see <xref linkend="charset-charsets"/>.)
+ (For a complete listing, see <xref linkend="charset-charsets"/>.)
</para>
<para>
@@ -228,7 +228,7 @@
</para>
<!-- NOTE: Please do not cut this list. -->
-
+
<programlisting>
mysql> SHOW COLLATION LIKE 'latin1%';
+---------------------+---------+----+---------+----------+---------+
@@ -255,40 +255,76 @@
<colspec colwidth="60*"/>
<tbody>
<row>
- <entry><emphasis role="bold">Collation</emphasis></entry>
- <entry><emphasis role="bold">Meaning</emphasis></entry>
+ <entry>
+ <emphasis role="bold">Collation</emphasis>
+ </entry>
+ <entry>
+ <emphasis role="bold">Meaning</emphasis>
+ </entry>
</row>
<row>
- <entry><literal>latin1_german1_ci</literal></entry>
- <entry>German DIN-1</entry>
+ <entry>
+ <literal>latin1_german1_ci</literal>
+ </entry>
+ <entry>
+ German DIN-1
+ </entry>
</row>
<row>
- <entry><literal>latin1_swedish_ci</literal></entry>
- <entry>Swedish/Finnish</entry>
+ <entry>
+ <literal>latin1_swedish_ci</literal>
+ </entry>
+ <entry>
+ Swedish/Finnish
+ </entry>
</row>
<row>
- <entry><literal>latin1_danish_ci</literal></entry>
- <entry>Danish/Norwegian</entry>
+ <entry>
+ <literal>latin1_danish_ci</literal>
+ </entry>
+ <entry>
+ Danish/Norwegian
+ </entry>
</row>
<row>
- <entry><literal>latin1_german2_ci</literal></entry>
- <entry>German DIN-2</entry>
+ <entry>
+ <literal>latin1_german2_ci</literal>
+ </entry>
+ <entry>
+ German DIN-2
+ </entry>
</row>
<row>
- <entry><literal>latin1_bin</literal></entry>
- <entry>Binary according to <literal>latin1</literal> encoding</entry>
+ <entry>
+ <literal>latin1_bin</literal>
+ </entry>
+ <entry>
+ Binary according to <literal>latin1</literal> encoding
+ </entry>
</row>
<row>
- <entry><literal>latin1_general_ci</literal></entry>
- <entry>Multilingual (Western European)</entry>
+ <entry>
+ <literal>latin1_general_ci</literal>
+ </entry>
+ <entry>
+ Multilingual (Western European)
+ </entry>
</row>
<row>
- <entry><literal>latin1_general_cs</literal></entry>
- <entry>Multilingual (ISO Western European), case sensitive</entry>
+ <entry>
+ <literal>latin1_general_cs</literal>
+ </entry>
+ <entry>
+ Multilingual (ISO Western European), case sensitive
+ </entry>
</row>
<row>
- <entry><literal>latin1_spanish_ci</literal></entry>
- <entry>Modern Spanish</entry>
+ <entry>
+ <literal>latin1_spanish_ci</literal>
+ </entry>
+ <entry>
+ Modern Spanish
+ </entry>
</row>
</tbody>
</tgroup>
@@ -535,7 +571,7 @@
</programlisting>
<para>
- MySQL chooses the table character set and collation in the following
+ MySQL chooses the table character set and collation in the following
manner:
</para>
@@ -600,7 +636,7 @@
</programlisting>
<para>
- MySQL chooses the column character set and collation in the
+ MySQL chooses the column character set and collation in the
following manner:
</para>
@@ -615,14 +651,14 @@
</para></listitem>
<listitem><para>
- If <literal>CHARACTER SET <replaceable>X</replaceable></literal>
- was specified without <literal>COLLATE</literal>, then character
- set <replaceable>X</replaceable> and its default collation are
+ If <literal>CHARACTER SET <replaceable>X</replaceable></literal>
+ was specified without <literal>COLLATE</literal>, then character
+ set <replaceable>X</replaceable> and its default collation are
used.
</para></listitem>
<listitem><para>
- Otherwise, the table character set and collation are used.
+ Otherwise, the table character set and collation are used.
</para></listitem>
</itemizedlist>
@@ -979,12 +1015,12 @@
<para>
The <literal>_<replaceable>charset_name</replaceable></literal>
expression is formally called an <emphasis>introducer</emphasis>. It
- tells the parser, ``the string that is about to follow uses
- character set <replaceable>X</replaceable>.'' Because this has confused
- people in the past, we emphasize that an introducer does not cause
- any conversion; it is strictly a signal that does not change the
- string's value. An introducer is also legal before standard hex
- literal and numeric hex literal notation
+ tells the parser, ``the string that is about to follow uses
+ character set <replaceable>X</replaceable>.'' Because this has
+ confused people in the past, we emphasize that an introducer does
+ not cause any conversion; it is strictly a signal that does not
+ change the string's value. An introducer is also legal before
+ standard hex literal and numeric hex literal notation
(<literal>x'<replaceable>literal</replaceable>'</literal> and
<literal>0x<replaceable>nnnn</replaceable></literal>), and before
<literal>?</literal> (parameter substitution when using prepared
@@ -1018,7 +1054,7 @@
If <replaceable>_X</replaceable> is specified but
<literal>COLLATE</literal> is not specified, then character set
<replaceable>X</replaceable> and its default collation are used.
- </para></listitem>
+ </para></listitem>
<listitem><para>
Otherwise, the character set and collation given by the
@@ -1132,15 +1168,15 @@
<listitem><para>
With <literal>WHERE</literal>:
- </para>
-
- <programlisting>
+ </para>
+
+<programlisting>
SELECT *
FROM t1
WHERE _latin1 'Müller' COLLATE latin1_german2_ci = k;
</programlisting>
-
- <programlisting>
+
+<programlisting>
SELECT *
FROM t1
WHERE k LIKE _latin1 'Müller' COLLATE latin1_german2_ci;
@@ -1184,13 +1220,14 @@
<para>
The <literal>BINARY</literal> operator is a shorthand for a
- <literal>COLLATE</literal> clause. <literal>BINARY '<replaceable>x</replaceable>'</literal> is
- equivalent to <literal>'<replaceable>x</replaceable>' COLLATE
- <replaceable>y</replaceable></literal>, where
- <replaceable>y</replaceable> is the name of the binary collation for the
- character set of '<replaceable>x</replaceable>'. Every character set has a
- binary collation. For example, the binary collation for the
- <literal>latin1</literal> character set is
+ <literal>COLLATE</literal> clause. <literal>BINARY
+ '<replaceable>x</replaceable>'</literal> is equivalent to
+ <literal>'<replaceable>x</replaceable>' COLLATE
+ <replaceable>y</replaceable></literal>, where
+ <replaceable>y</replaceable> is the name of the binary collation for
+ the character set of '<replaceable>x</replaceable>'. Every character
+ set has a binary collation. For example, the binary collation for
+ the <literal>latin1</literal> character set is
<literal>latin1_bin</literal>, so if the column <literal>a</literal>
is of character set <literal>latin1</literal>, the following two
statements have the same effect:
@@ -1237,9 +1274,9 @@
<para>
Standard SQL resolves such questions using what used to be called
- ``coercibility'' rules. Basically, this means: Since both
- <literal>x</literal> and <literal>'Y'</literal> have collations,
- whose collation takes precedence? This can be difficult to resolve,
+ ``coercibility'' rules. Basically, this means: Since both
+ <literal>x</literal> and <literal>'Y'</literal> have collations,
+ whose collation takes precedence? This can be difficult to resolve,
but the following rules take care of most situations:
</para>
@@ -1277,8 +1314,8 @@
</itemizedlist>
<para>
- The preceding coercibility values are current as of MySQL 5.0.3. See
- the note later in this section for additional version-related
+ The preceding coercibility values are current as of MySQL 5.0.3. See
+ the note later in this section for additional version-related
information.
</para>
@@ -1483,7 +1520,7 @@
The table is an example that shows what the effect would be if we
used different collations in an <literal>ORDER BY</literal> clause.
The character that causes the different sort orders in this example
- is the U with two dots over it (<literal>ü</literal>), which
+ is the U with two dots over it (<literal>ü</literal>), which
the Germans call "U-umlaut".
</para>
@@ -1491,14 +1528,13 @@
<listitem><para>
The first column shows the result of the <literal>SELECT</literal>
- using the Swedish/Finnish collating rule, which says that
- U-umlaut sorts with Y.
+ using the Swedish/Finnish collating rule, which says that U-umlaut
+ sorts with Y.
</para></listitem>
<listitem><para>
The second column shows the result of the <literal>SELECT</literal>
- using the German DIN-1 rule, which says that U-umlaut sorts with
- U.
+ using the German DIN-1 rule, which says that U-umlaut sorts with U.
</para></listitem>
<listitem><para>
@@ -1508,7 +1544,7 @@
</para></listitem>
</itemizedlist>
-
+
</section>
</section>
@@ -1548,7 +1584,7 @@
<literal>SUBSTRING()</literal>, <literal>TRIM()</literal>,
<literal>UCASE()</literal>, and <literal>UPPER()</literal>. (Also
note: The <literal>REPLACE()</literal> function, unlike all other
- functions, always ignores the collation of the string input and
+ functions, always ignores the collation of the string input and
performs a case-insensitive comparison.)
</para>
@@ -1561,21 +1597,20 @@
<itemizedlist>
<listitem><para>
- If an explicit <literal>COLLATE
- <replaceable>X</replaceable></literal> occurs, then use
+ If an explicit <literal>COLLATE
+ <replaceable>X</replaceable></literal> occurs, then use
<replaceable>X</replaceable>.
</para></listitem>
<listitem><para>
- If explicit <literal>COLLATE
- <replaceable>X</replaceable></literal> and <literal>COLLATE
- <replaceable>Y</replaceable></literal> occur, then raise an
- error.
+ If explicit <literal>COLLATE <replaceable>X</replaceable></literal>
+ and <literal>COLLATE <replaceable>Y</replaceable></literal> occur,
+ then raise an error.
</para></listitem>
<listitem><para>
- Otherwise, if all collations are <replaceable>X</replaceable>,
- then use <replaceable>X</replaceable>.
+ Otherwise, if all collations are <replaceable>X</replaceable>, then
+ use <replaceable>X</replaceable>.
</para></listitem>
<listitem><para>
@@ -1586,11 +1621,11 @@
<para>
For example, with <literal>CASE ... WHEN a THEN b WHEN b THEN c
- COLLATE <replaceable>X</replaceable> END</literal>, the resulting
- collation is <replaceable>X</replaceable>. The same applies for
- <literal>CASE</literal>, <literal>UNION</literal>,
- <literal>||</literal>, <literal>CONCAT()</literal>,
- <literal>ELT()</literal>, <literal>GREATEST()</literal>,
+ COLLATE <replaceable>X</replaceable> END</literal>, the resulting
+ collation is <replaceable>X</replaceable>. The same applies for
+ <literal>CASE</literal>, <literal>UNION</literal>,
+ <literal>||</literal>, <literal>CONCAT()</literal>,
+ <literal>ELT()</literal>, <literal>GREATEST()</literal>,
<literal>IF()</literal>, and <literal>LEAST()</literal>.
</para>
@@ -1710,16 +1745,16 @@
<title id='title-charset-show'>&title-charset-show;</title>
<para>
- Several <literal>SHOW</literal> statements provide additional
- character set information. These include <literal>SHOW CHARACTER
- SET</literal>, <literal>SHOW COLLATION</literal>, <literal>SHOW
- CREATE DATABASE</literal>, <literal>SHOW CREATE TABLE</literal>
- and <literal>SHOW COLUMNS</literal>.
+ Several <literal>SHOW</literal> statements provide additional
+ character set information. These include <literal>SHOW CHARACTER
+ SET</literal>, <literal>SHOW COLLATION</literal>, <literal>SHOW
+ CREATE DATABASE</literal>, <literal>SHOW CREATE TABLE</literal> and
+ <literal>SHOW COLUMNS</literal>.
</para>
<para>
The <literal>SHOW CHARACTER SET</literal> command shows all
- available character sets. It takes an optional
+ available character sets. It takes an optional
<literal>LIKE</literal> clause that indicates which character set
names to match. For example:
</para>
@@ -1881,7 +1916,7 @@
</para>
<para>
- Currently, UCS-2 cannot yet be used as a client character set, which
+ Currently, UCS-2 cannot yet be used as a client character set, which
means that <literal>SET NAMES 'ucs2'</literal> does not work.
</para>
@@ -2011,16 +2046,16 @@
If you want the server to pass metadata results back in a non-UTF8
character set, then use <literal>SET NAMES</literal> to force the
server to perform character set conversion (see
- <xref linkend="charset-connection"/>), or else cause the client to
- perform the conversion. It is more efficient to have the client
- perform the conversion, but this option is not always available for
+ <xref linkend="charset-connection"/>), or else cause the client to
+ perform the conversion. It is more efficient to have the client
+ perform the conversion, but this option is not always available for
all clients.
</para>
<para>
- If you are using (for example) the <literal>USER()</literal>
- function for comparison or assignment within a single statement,
- don't worry. MySQL performs some automatic conversion for you.
+ If you are using (for example) the <literal>USER()</literal> function
+ for comparison or assignment within a single statement, don't worry.
+ MySQL performs some automatic conversion for you.
</para>
<programlisting>
@@ -2094,8 +2129,8 @@
<title id='title-charset-national'>&title-charset-national;</title>
<para>
- ANSI SQL defines <literal>NCHAR</literal> or <literal>NATIONAL
- CHAR</literal> as a way to indicate that a <literal>CHAR</literal>
+ ANSI SQL defines <literal>NCHAR</literal> or <literal>NATIONAL
+ CHAR</literal> as a way to indicate that a <literal>CHAR</literal>
column should use some predefined character set. MySQL 5.0 uses
<literal>utf8</literal> as this predefined character set. For
example, these column type declarations are equivalent:
@@ -2139,7 +2174,7 @@
<para>
MySQL supports 70+ collations for 30+ character sets. The character
sets and their default collations are displayed by the <literal>SHOW
- CHARACTER SET</literal> statement:
+ CHARACTER SET</literal> statement:
</para>
<programlisting>
@@ -2226,9 +2261,7 @@
| ucs2_roman_ci | ucs2 | 143 | | Yes | 8 |
| ucs2_persian_ci | ucs2 | 144 | | Yes | 8 |
+--------------------+---------+-----+---------+----------+---------+
-</programlisting>
-
- </listitem>
+</programlisting></listitem>
<listitem><para>
<literal>utf8</literal> (UTF-8 Unicode) collations:
@@ -2259,9 +2292,7 @@
| utf8_roman_ci | utf8 | 207 | | Yes | 8 |
| utf8_persian_ci | utf8 | 208 | | Yes | 8 |
+--------------------+---------+-----+---------+----------+---------+
-</programlisting>
-
- </listitem>
+</programlisting></listitem>
</itemizedlist>
@@ -2272,9 +2303,9 @@
<para>
The <literal>utf8_unicode_ci</literal> collation is implemented
according to the Unicode Collation Algorithm (UCA) described at
- <ulink url="http://www.unicode.org/reports/tr10/">http://www.unicode.org/reports/tr10/</ulink>.
- The collation uses the version-4.0.0 UCA weight keys:
- <ulink url="http://www.unicode.org/Public/UCA/4.0.0/allkeys-4.0.0.txt">http://www.unicode.org/Public/UCA/4.0.0/allkeys-4.0.0.txt</ulink>.
+ <ulink url="http://www.unicode.org/reports/tr10/"/>. The collation
+ uses the version-4.0.0 UCA weight keys:
+ <ulink url="http://www.unicode.org/Public/UCA/4.0.0/allkeys-4.0.0.txt"/>.
(The following discussion uses <literal>utf8_unicode_ci</literal>,
but it is also true for <literal>ucs2_unicode_ci</literal>.)
</para>
@@ -2290,14 +2321,14 @@
<para>
The most significant feature in <literal>utf8_unicode_ci</literal>
is that it supports expansions, that is, when one character compares
- as equal to combinations of other characters. For example, in German
+ as equal to combinations of other characters. For example, in German
and some other languages '<literal>ß</literal>' is equal to
'<literal>ss</literal>'.
</para>
<para>
<literal>utf8_general_ci</literal> is a legacy collation that does
- not support expansions. It can make only one-to-one comparisons
+ not support expansions. It can make only one-to-one comparisons
between characters. This means that comparisons for the
<literal>utf8_general_ci</literal> collation are faster, but
slightly less correct, than comparisons for
@@ -2343,10 +2374,10 @@
</para>
<para>
- <literal>utf8_general_ci</literal> is also satisfactory for both
- German and French, except that '<literal>ß</literal>' is equal to
+ <literal>utf8_general_ci</literal> is also satisfactory for both
+ German and French, except that '<literal>ß</literal>' is equal to
'<literal>s</literal>', and not to '<literal>ss</literal>'. If this
- is acceptable for your application, then you should use
+ is acceptable for your application, then you should use
<literal>utf8_general_ci</literal> because it is faster. Otherwise,
use <literal>utf8_unicode_ci</literal> because it is more accurate.
</para>
@@ -2498,16 +2529,16 @@
<literal>latin1</literal> is the default character set. The
<literal>latin1_swedish_ci</literal> collation is the default that
probably is used by the majority of MySQL customers. While it is
- frequently said that it is based on the Swedish/Finnish collation
+ frequently said that it is based on the Swedish/Finnish collation
rules, there are Swedes and Finns who disagree with this statement.
</para>
<para>
The <literal>latin1_german1_ci</literal> and
<literal>latin1_german2_ci</literal> collations are based on the
- DIN-1 and DIN-2 standards, where DIN stands for <emphasis>Deutsches
- Institut für Normung</emphasis> (the German equivalent of ANSI).
- DIN-1 is called the dictionary collation and DIN-2 is called the
+ DIN-1 and DIN-2 standards, where DIN stands for <emphasis>Deutsches
+ Institut für Normung</emphasis> (the German equivalent of ANSI).
+ DIN-1 is called the dictionary collation and DIN-2 is called the
phone book collation.
</para>
@@ -2584,7 +2615,7 @@
<title id='title-charset-ce-sets'>&title-charset-ce-sets;</title>
<para>
- We also provide some support for character sets used in the Czech
+ We also provide some support for character sets used in the Czech
Republic, Slovakia, Hungary, Romania, Slovenia, Croatia, and Poland.
</para>
--- 1.2/refman-5.0/client-side-scripts.xml 2005-07-14 14:01:43 -05:00
+++ 1.3/refman-5.0/client-side-scripts.xml 2005-07-14 14:29:01 -05:00
@@ -4057,8 +4057,7 @@
<para>
<command>mysqlcc</command> is deprecated and it is recommended that
users choose the new MySQL Administrator and MySQL Query Browser,
- found at
- <ulink url="http://dev.mysql.com/downloads/">http://dev.mysql.com/downloads/</ulink>.
+ found at <ulink url="http://dev.mysql.com/downloads/"/>.
</para>
<!-- @command{mysqlcc} is not included with MySQL distributions, but can be downloaded -->
--- 1.3/refman-5.0/credits.xml 2005-07-08 10:50:43 -05:00
+++ 1.4/refman-5.0/credits.xml 2005-07-14 14:29:01 -05:00
@@ -920,8 +920,7 @@
</para>
<para>
- For helping us acquire
- <ulink url="http://www.mysql.com/">http://www.mysql.com/</ulink>.
+ For helping us acquire <ulink url="http://www.mysql.com/"/>.
</para></listitem>
<listitem><para>
@@ -1186,8 +1185,8 @@
</para>
<para>
- <ulink url="http://www.pspl.co.in/konark/">http://www.pspl.co.in/konark/</ulink>.
- Help with the Win64 port of the MySQL server.
+ <ulink url="http://www.pspl.co.in/konark/"/>. Help with the Win64
+ port of the MySQL server.
</para></listitem>
<listitem><para>
@@ -1459,9 +1458,9 @@
<para>
First translator of the MySQL Reference Manual into simplified
Chinese in early 2000 on which the Big5 and HK coded
- (<ulink url="http://mysql.hitstar.com/">http://mysql.hitstar.com/</ulink>)
- versions were based. <ulink url="http://linuxdb.yeah.net">Personal
- home page at linuxdb.yeah.net</ulink>.
+ (<ulink url="http://mysql.hitstar.com/"/>) versions were based.
+ <ulink url="http://linuxdb.yeah.net">Personal home page at
+ linuxdb.yeah.net</ulink>.
</para></listitem>
<listitem><para>
@@ -1721,7 +1720,7 @@
We can't list every possible package here because the list would then
be way to hard to maintain. For other packages, please refer to the
software portal at
- <ulink url="http://solutions.mysql.com/software/">http://solutions.mysql.com/software/</ulink>.
+ <ulink url="http://solutions.mysql.com/software/"/>.
</para>
<itemizedlist>
--- 1.5/refman/charset.xml 2005-06-22 11:56:07 -05:00
+++ 1.7/refman/charset.xml 2005-07-14 14:29:21 -05:00
@@ -2242,9 +2242,9 @@
<para>
It is important to note that the ``MySQL 4.0 character set'' contains
both character set and collation information in one single entity.
- Beginning in MySQL 4.1, character sets and collations are separate entities.
- Though each collation corresponds to a particular character set, the two are
- not bundled together.
+ Beginning in MySQL 4.1, character sets and collations are separate
+ entities. Though each collation corresponds to a particular character
+ set, the two are not bundled together.
</para>
<para>
@@ -3130,9 +3130,9 @@
<para>
The <literal>utf8_unicode_ci</literal> collation is implemented
according to the Unicode Collation Algorithm (UCA) described at
- <ulink url="http://www.unicode.org/reports/tr10/">http://www.unicode.org/reports/tr10/</ulink>.
- The collation uses the version-4.0.0 UCA weight keys:
- <ulink url="http://www.unicode.org/Public/UCA/4.0.0/allkeys-4.0.0.txt">http://www.unicode.org/Public/UCA/4.0.0/allkeys-4.0.0.txt</ulink>.
+ <ulink url="http://www.unicode.org/reports/tr10/"/>. The collation
+ uses the version-4.0.0 UCA weight keys:
+ <ulink url="http://www.unicode.org/Public/UCA/4.0.0/allkeys-4.0.0.txt"/>.
(The following discussion uses <literal>utf8_unicode_ci</literal>,
but it is also true for <literal>ucs2_unicode_ci</literal>.)
</para>
--- 1.2/refman/client-side-scripts.xml 2005-07-14 14:01:43 -05:00
+++ 1.4/refman/client-side-scripts.xml 2005-07-14 14:29:22 -05:00
@@ -4057,8 +4057,7 @@
<para>
<command>mysqlcc</command> is deprecated and it is recommended that
users choose the new MySQL Administrator and MySQL Query Browser,
- found at
- <ulink url="http://dev.mysql.com/downloads/">http://dev.mysql.com/downloads/</ulink>.
+ found at <ulink url="http://dev.mysql.com/downloads/"/>.
</para>
<!-- @command{mysqlcc} is not included with MySQL distributions, but can be downloaded -->
--- 1.3/refman/credits.xml 2005-07-08 10:50:44 -05:00
+++ 1.4/refman/credits.xml 2005-07-14 14:25:22 -05:00
@@ -920,8 +920,7 @@
</para>
<para>
- For helping us acquire
- <ulink url="http://www.mysql.com/">http://www.mysql.com/</ulink>.
+ For helping us acquire <ulink url="http://www.mysql.com/"/>.
</para></listitem>
<listitem><para>
@@ -1186,8 +1185,8 @@
</para>
<para>
- <ulink url="http://www.pspl.co.in/konark/">http://www.pspl.co.in/konark/</ulink>.
- Help with the Win64 port of the MySQL server.
+ <ulink url="http://www.pspl.co.in/konark/"/>. Help with the Win64
+ port of the MySQL server.
</para></listitem>
<listitem><para>
@@ -1459,9 +1458,9 @@
<para>
First translator of the MySQL Reference Manual into simplified
Chinese in early 2000 on which the Big5 and HK coded
- (<ulink url="http://mysql.hitstar.com/">http://mysql.hitstar.com/</ulink>)
- versions were based. <ulink url="http://linuxdb.yeah.net">Personal
- home page at linuxdb.yeah.net</ulink>.
+ (<ulink url="http://mysql.hitstar.com/"/>) versions were based.
+ <ulink url="http://linuxdb.yeah.net">Personal home page at
+ linuxdb.yeah.net</ulink>.
</para></listitem>
<listitem><para>
@@ -1721,7 +1720,7 @@
We can't list every possible package here because the list would then
be way to hard to maintain. For other packages, please refer to the
software portal at
- <ulink url="http://solutions.mysql.com/software/">http://solutions.mysql.com/software/</ulink>.
+ <ulink url="http://solutions.mysql.com/software/"/>.
</para>
<itemizedlist>
| Thread |
|---|
| • bk commit - mysqldoc@docsrva tree (paul:1.3024) | paul | 14 Jul |
