Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

Docs/manual.texi:
  Auto merged

Docs/manual.texi

@@ -20484,13 +20484,13 @@ strings before doing the comparison:
 ß  ->  ss
 @end example
 
-All accented characters, except @code{'é'} and @code{É} are converted to
-their un-accented counterpart.  All letters are converted to uppercase.
+All accented characters, are converted to their un-accented uppercase
+counterpart.  All letters are converted to uppercase.
 
 When comparing strings with @code{LIKE} the one -> two character mapping
 is not done. All letters are converted to uppercase. Accent are removed
-from all letters except: @code{Ü}, @code{ü}, @code{É}, @code{é}, @code{Ö},
-@code{ö}, @code{Ä} and @code{ä}.
+from all letters except: @code{Ü}, @code{ü}, @code{Ö}, @code{ö},
+@code{Ä} and @code{ä}.
 
 
 @node Languages, Adding character set, Character sets, Localization

strings/ctype-latin1_de.c

@@ -100,7 +100,7 @@ uchar to_upper_latin1_de[] = {
  * characters to their non-accented equivalents.  Note: in this
  * table, 'ä' is mapped to 'A', 'ÿ' is mapped to 'Y', etc. - all
  * accented characters except the following are treated the same way.
- * Ü, ü, É, é, Ö, ö, Ä, ä
+ * Ü, ü, Ö, ö, Ä, ä
  */
 
 uchar sort_order_latin1_de[] = {
@@ -116,9 +116,9 @@ uchar sort_order_latin1_de[] = {
   144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,
   160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,
   176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,
-   65, 65, 65, 65,196, 65, 92, 67, 69,201, 69, 69, 73, 73, 73, 73,
+   65, 65, 65, 65,196, 65, 92, 67, 69, 69, 69, 69, 73, 73, 73, 73,
    68, 78, 79, 79, 79, 79,214,215,216, 85, 85, 85,220, 89,222,223,
-   65, 65, 65, 65,196, 65, 92, 67, 69,201, 69, 69, 73, 73, 73, 73,
+   65, 65, 65, 65,196, 65, 92, 67, 69, 69, 69, 69, 73, 73, 73, 73,
    68, 78, 79, 79, 79, 79,214,247,216, 85, 85, 85,220, 89,222, 89
 };