Small fixes related to etc/HELLO

* doc/emacs/help.texi (Language Help):
* doc/emacs/mule.texi (International Chars):
etc/HELLO is for character demonstration.

* etc/HELLO: Say that this is not a comprehensive list.
Remove "duplicate" entry.  (Bug#11024)

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 8657859a3481d023258124c19fdc8380e64efdf7..2d03bae1a1bd7025867a19a1186a09581665b444 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-16  Glenn Morris  <rgm@gnu.org>
+
+       * help.texi (Language Help):
+       * mule.texi (International Chars):
+       etc/HELLO is for character demonstration.
+
 2012-03-15  Dani Moncayo  <dmoncayo@gmail.com>  (tiny change)
 
        * dired.texi (Shell Commands in Dired): Fix typo.

diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index 05a3e546322e4a8288acb73de4df68dcf3d6e6f7..84da0a9a68128c4ea02a4f528bbb5d9fba35352a 100644 (file)
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -464,7 +464,8 @@ listing the associated character sets, coding systems, and input
 methods, as well as some sample text for that language environment.
 
   The command @kbd{C-h h} (@code{view-hello-file}) displays the file
-@file{etc/HELLO}, which shows how to say ``hello'' in many languages.
+@file{etc/HELLO}, which demonstrates various character sets by showing
+how to say ``hello'' in many languages.
 
   The command @kbd{C-h I} (@code{describe-input-method}) describes an
 input method---either a specified input method, or by default the

diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index aebff1e463a1e4418c0562e6316f36ab4e5acc53..aeaec2c502e0f5292e5404a3896e17d330a974ef 100644 (file)
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1997, 1999-2012  Free Software Foundation, Inc.
+@c Copyright (C) 1997, 1999-2012 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node International, Modes, Frames, Top
 @chapter International Character Set Support
@@ -137,8 +137,8 @@ writing files, and when exchanging data with subprocesses.
 @cindex undisplayable characters
 @cindex @samp{?} in display
   The command @kbd{C-h h} (@code{view-hello-file}) displays the file
-@file{etc/HELLO}, which shows how to say ``hello'' in many languages.
-This illustrates various scripts.  If some characters can't be
+@file{etc/HELLO}, which illustrates various scripts by showing
+how to say ``hello'' in many languages.  If some characters can't be
 displayed on your terminal, they appear as @samp{?} or as hollow boxes
 (@pxref{Undisplayable Characters}).
 

diff --git a/etc/ChangeLog b/etc/ChangeLog
index da9b8c180c482ba75dd024b79b4838d0f07e9f48..94a9ae6ed4d7d47b8919aeed5fd440110214b54d 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-16  Glenn Morris  <rgm@gnu.org>
+
+       * HELLO: Say that this is not a comprehensive list.
+       Remove "duplicate" entry.  (Bug#11024)
+
 2012-02-20  Paul Eggert  <eggert@cs.ucla.edu>
 
        * emacs-buffer.gdb ($valmask): Don't assume EMACS_INT fits in 'long'.

diff --git a/etc/HELLO b/etc/HELLO
index 3bb1fad31539244fff98e59a7486ee7cc4f5302c..d6857235f6855bfaa400987efae602a0ded2ac06 100644 (file)
--- a/etc/HELLO
+++ b/etc/HELLO
@@ -1,4 +1,6 @@
 This is a list of ways to say hello in various languages.
+It is not intended to be comprehensive, but to demonstrate
+some of the character sets that Emacs supports.
 
 Non-ASCII examples:
   Europe: \e,A!\e(BHola!, Gr\e,A|_\e(B Gott, Hyv\e,Add\e(B p\e,Ad\e(Biv\e,Add\e(B, Tere \e,Au\e(Bhtust, Bon\e,Cu\e(Bu
@@ -46,7 +48,6 @@ Lao (\e(1>RJRERG\e(B)   \e(1JP:R-4U\e(B / \e(1"mcKib*!4U\e(B
 Malayalam (\e$,1@N@R@O@^@S@"\e(B)        \e$,1@H@N@X@m@5@^@P@"\e(B
 Maltese (il-Malti)     Bon\e,Cu\e(Bu / Sa\e,C11\e(Ba
 Mathematics    \e$,1x \e(B p \e$,1x(\e(B world \e$,1s"\e(B hello p  \e$,2!a\e(B
-Nederlands, Vlaams     Hallo / Dag
 Norwegian (norsk)      Hei / God dag
 Oriya (\e$,1:s;\;?:f\e(B)        \e$,1;6;A;#;?;,;G\e(B
 Polish  (j\e,Bj\e(Bzyk polski)   Dzie\e,Bq\e(B dobry! / Cze\e,B6f\e(B!