summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-03-16 19:20:37 -0400
committerGlenn Morris <rgm@gnu.org>2012-03-16 19:20:37 -0400
commit66ecdc9e08549b2b978c619ad697da45e048aa54 (patch)
treec51eb6272feb5a594cdf8866d2beedacfd1e7dd5
parentef00465f1a55af29272e67b55a5f3584e9c8e9e2 (diff)
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)
-rw-r--r--doc/emacs/ChangeLog6
-rw-r--r--doc/emacs/help.texi3
-rw-r--r--doc/emacs/mule.texi6
-rw-r--r--etc/ChangeLog5
-rw-r--r--etc/HELLO3
5 files changed, 18 insertions, 5 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 8657859a34..2d03bae1a1 100644
--- 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 05a3e54632..84da0a9a68 100644
--- 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 aebff1e463..aeaec2c502 100644
--- 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 da9b8c180c..94a9ae6ed4 100644
--- 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 3bb1fad315..d6857235f6 100644
--- 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: ,A!(BHola!, Gr,A|_(B Gott, Hyv,Add(B p,Ad(Biv,Add(B, Tere ,Au(Bhtust, Bon,Cu(Bu
@@ -46,7 +48,6 @@ Lao ((1>RJRERG(B) (1JP:R-4U(B / (1"mcKib*!4U(B
Malayalam ($,1@N@R@O@^@S@"(B) $,1@H@N@X@m@5@^@P@"(B
Maltese (il-Malti) Bon,Cu(Bu / Sa,C11(Ba
Mathematics $,1x (B p $,1x((B world $,1s"(B hello p $,2!a(B
-Nederlands, Vlaams Hallo / Dag
Norwegian (norsk) Hei / God dag
Oriya ($,1:s;\;?:f(B) $,1;6;A;#;?;,;G(B
Polish (j,Bj(Bzyk polski) Dzie,Bq(B dobry! / Cze,B6f(B!