about summary refs log tree commit diff
path: root/localedata
diff options
context:
space:
mode:
Diffstat (limited to 'localedata')
-rw-r--r--localedata/ChangeLog3
-rw-r--r--localedata/charmaps/ISO-8859-152
2 files changed, 3 insertions, 2 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index f45e52faa7..d4ffc86e40 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,5 +1,8 @@
 2000-05-04  Ulrich Drepper  <drepper@redhat.com>
 
+	* charmaps/ISO-8859-15: Remove incorrect definitions of <So> and <OR>.
+	Reported by Gaël Quéri <gqueri@mail.dotcom.fr> [PR libc/1718].
+
 	* tst-fmon.c (main): Print the locale name as well in the error
 	message.
 
diff --git a/localedata/charmaps/ISO-8859-15 b/localedata/charmaps/ISO-8859-15
index 937aaa0a02..2d1778ab01 100644
--- a/localedata/charmaps/ISO-8859-15
+++ b/localedata/charmaps/ISO-8859-15
@@ -261,7 +261,6 @@ CHARMAP
 <Y->                   /xA5     <U00A5> YEN SIGN
 <Ye>                   /xA5     <U00A5> YEN SIGN
 <S<>                   /xA6     <U0160> LATIN CAPITAL LETTER S WITH CARON
-<So>                   /xA7     <U00A7> SECTION SIGN
 <SE>                   /xA7     <U00A7> SECTION SIGN
 <s<>                   /xA8     <U0161> LATIN SMALL LETTER S WITH CARON
 <Co>                   /xA9     <U00A9> COPYRIGHT SIGN
@@ -271,7 +270,6 @@ CHARMAP
 <7!>                   /xAC     <U00AC> NOT SIGN
 <-->                   /xAD     <U00AD> SOFT HYPHEN
 <Rg>                   /xAE     <U00AE> REGISTERED SIGN
-<OR>                   /xAE     <U00AE> REGISTERED SIGN
 <'m>                   /xAF     <U00AF> MACRON
 <DG>                   /xB0     <U00B0> DEGREE SIGN
 <+->                   /xB1     <U00B1> PLUS-MINUS SIGN