summary refs log tree commit diff
path: root/locale
diff options
context:
space:
mode:
Diffstat (limited to 'locale')
-rw-r--r--locale/iso-3166.def2
-rw-r--r--locale/programs/locale.c3
-rw-r--r--locale/programs/localedef.c3
3 files changed, 5 insertions, 3 deletions
diff --git a/locale/iso-3166.def b/locale/iso-3166.def
index c7f8258f08..f87f15bf59 100644
--- a/locale/iso-3166.def
+++ b/locale/iso-3166.def
@@ -193,6 +193,7 @@ DEFINE_COUNTRY_CODE ("SAN MARINO", SM, SMR, 674)
 DEFINE_COUNTRY_CODE ("SAO TOME AND PRINCIPE", ST, STP, 678)
 DEFINE_COUNTRY_CODE ("SAUDI ARABIA", SA, SAU, 682)
 DEFINE_COUNTRY_CODE ("SENEGAL", SN, SEN, 686)
+DEFINE_COUNTRY_CODE ("SERBIA AND MONTENEGRO", CS, SCG, 891)
 DEFINE_COUNTRY_CODE ("SEYCHELLES", SC, SYC, 690)
 DEFINE_COUNTRY_CODE ("SIERRA LEONE", SL, SLE, 694)
 DEFINE_COUNTRY_CODE ("SINGAPORE", SG, SGP, 702)
@@ -240,6 +241,5 @@ DEFINE_COUNTRY_CODE ("VIRGIN ISLANDS, U.S.", VI, VIR, 850)
 DEFINE_COUNTRY_CODE ("WALLIS AND FUTUNA", WF, WLF, 876)
 DEFINE_COUNTRY_CODE ("WESTERN SAHARA", EH, ESH, 732)
 DEFINE_COUNTRY_CODE ("YEMEN", YE, YEM, 887)
-DEFINE_COUNTRY_CODE ("YUGOSLAVIA", YU, YUG, 891)
 DEFINE_COUNTRY_CODE ("ZAMBIA", ZM, ZMB, 894)
 DEFINE_COUNTRY_CODE ("ZIMBABWE", ZW, ZWE, 716)
diff --git a/locale/programs/locale.c b/locale/programs/locale.c
index 92be8e231a..dede36d256 100644
--- a/locale/programs/locale.c
+++ b/locale/programs/locale.c
@@ -277,7 +277,8 @@ more_help (int key, const char *text, void *input)
     case ARGP_KEY_HELP_EXTRA:
       /* We print some extra information.  */
       return xstrdup (gettext ("\
-Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"));
+For bug reporting instructions, please see:\n\
+<http://www.gnu.org/software/libc/bugs.html>.\n"));
     default:
       break;
     }
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index b38ce6c53e..1c01272e2a 100644
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -370,7 +370,8 @@ System's directory for character maps : %s\n\
                        locale path    : %s\n\
 %s"),
 		CHARMAP_PATH, REPERTOIREMAP_PATH, LOCALE_PATH, gettext ("\
-Report bugs using the `glibcbug' script to <bugs@gnu.org>.\n"));
+For bug reporting instructions, please see:\n\
+<http://www.gnu.org/software/libc/bugs.html>.\n"));
       return cp;
     default:
       break;