Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-77

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 504-513)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: .cvsignore: Add `lock'.

 * gnus--rel--5.10  (patch 99-103)

   - Update from CVS

2 files changed, 9 insertions, 6 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 80e01003faa..cddc109c39b 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-05  Kenichi Handa  <handa@m17n.org>
+
+        * NEWS: Fix the entry describing code-pages.
+
 2005-07-28  Juanma Barranquero  <lekktu@gmail.com>
 
         * .cvsignore: Add `icons' (for in-place installs).
diff --git a/etc/NEWS b/etc/NEWS
index f98e24a8e5e..c374f9ab7d1 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1201,12 +1201,11 @@ in CNS encoding; it accepts both Big 5 and CNS as input; on saving,
 Big 5 is then converted to CNS.
 
 ---
-*** Many new coding systems are available by loading the `code-pages'
-library.  These include complete versions of most of those in
-codepage.el, based on Unicode mappings.  `codepage-setup' is now
-obsolete and is used only in the MS-DOS port of Emacs.  windows-1252
-and windows-1251 are preloaded since the former is so common and the
-latter is used by GNU locales.
+*** Many new coding systems are available in the `code-pages' library.
+These include complete versions of most of those in codepage.el, based
+on Unicode mappings.  `codepage-setup' is now obsolete and is used
+only in the MS-DOS port of Emacs.  All coding systems defined in
+`code-pages' are auto-loaded.
 
 ---
 *** New variable `utf-translate-cjk-unicode-range' controls which