aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-03-16 19:20:37 -0400
committerGlenn Morris2012-03-16 19:20:37 -0400
commit66ecdc9e08549b2b978c619ad697da45e048aa54 (patch)
treec51eb6272feb5a594cdf8866d2beedacfd1e7dd5
parentef00465f1a55af29272e67b55a5f3584e9c8e9e2 (diff)
downloademacs-66ecdc9e08549b2b978c619ad697da45e048aa54.tar.gz
emacs-66ecdc9e08549b2b978c619ad697da45e048aa54.zip
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 8657859a348..2d03bae1a1b 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,9 @@
12012-03-16 Glenn Morris <rgm@gnu.org>
2
3 * help.texi (Language Help):
4 * mule.texi (International Chars):
5 etc/HELLO is for character demonstration.
6
12012-03-15 Dani Moncayo <dmoncayo@gmail.com> (tiny change) 72012-03-15 Dani Moncayo <dmoncayo@gmail.com> (tiny change)
2 8
3 * dired.texi (Shell Commands in Dired): Fix typo. 9 * dired.texi (Shell Commands in Dired): Fix typo.
diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi
index 05a3e546322..84da0a9a681 100644
--- a/doc/emacs/help.texi
+++ b/doc/emacs/help.texi
@@ -464,7 +464,8 @@ listing the associated character sets, coding systems, and input
464methods, as well as some sample text for that language environment. 464methods, as well as some sample text for that language environment.
465 465
466 The command @kbd{C-h h} (@code{view-hello-file}) displays the file 466 The command @kbd{C-h h} (@code{view-hello-file}) displays the file
467@file{etc/HELLO}, which shows how to say ``hello'' in many languages. 467@file{etc/HELLO}, which demonstrates various character sets by showing
468how to say ``hello'' in many languages.
468 469
469 The command @kbd{C-h I} (@code{describe-input-method}) describes an 470 The command @kbd{C-h I} (@code{describe-input-method}) describes an
470input method---either a specified input method, or by default the 471input method---either a specified input method, or by default the
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index aebff1e463a..aeaec2c502e 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -1,5 +1,5 @@
1@c This is part of the Emacs manual. 1@c This is part of the Emacs manual.
2@c Copyright (C) 1997, 1999-2012 Free Software Foundation, Inc. 2@c Copyright (C) 1997, 1999-2012 Free Software Foundation, Inc.
3@c See file emacs.texi for copying conditions. 3@c See file emacs.texi for copying conditions.
4@node International, Modes, Frames, Top 4@node International, Modes, Frames, Top
5@chapter International Character Set Support 5@chapter International Character Set Support
@@ -137,8 +137,8 @@ writing files, and when exchanging data with subprocesses.
137@cindex undisplayable characters 137@cindex undisplayable characters
138@cindex @samp{?} in display 138@cindex @samp{?} in display
139 The command @kbd{C-h h} (@code{view-hello-file}) displays the file 139 The command @kbd{C-h h} (@code{view-hello-file}) displays the file
140@file{etc/HELLO}, which shows how to say ``hello'' in many languages. 140@file{etc/HELLO}, which illustrates various scripts by showing
141This illustrates various scripts. If some characters can't be 141how to say ``hello'' in many languages. If some characters can't be
142displayed on your terminal, they appear as @samp{?} or as hollow boxes 142displayed on your terminal, they appear as @samp{?} or as hollow boxes
143(@pxref{Undisplayable Characters}). 143(@pxref{Undisplayable Characters}).
144 144
diff --git a/etc/ChangeLog b/etc/ChangeLog
index da9b8c180c4..94a9ae6ed4d 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
12012-03-16 Glenn Morris <rgm@gnu.org>
2
3 * HELLO: Say that this is not a comprehensive list.
4 Remove "duplicate" entry. (Bug#11024)
5
12012-02-20 Paul Eggert <eggert@cs.ucla.edu> 62012-02-20 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * emacs-buffer.gdb ($valmask): Don't assume EMACS_INT fits in 'long'. 8 * emacs-buffer.gdb ($valmask): Don't assume EMACS_INT fits in 'long'.
diff --git a/etc/HELLO b/etc/HELLO
index 3bb1fad3153..d6857235f68 100644
--- a/etc/HELLO
+++ b/etc/HELLO
@@ -1,4 +1,6 @@
1This is a list of ways to say hello in various languages. 1This is a list of ways to say hello in various languages.
2It is not intended to be comprehensive, but to demonstrate
3some of the character sets that Emacs supports.
2 4
3Non-ASCII examples: 5Non-ASCII examples:
4 Europe: ,A!(BHola!, Gr,A|_(B Gott, Hyv,Add(B p,Ad(Biv,Add(B, Tere ,Au(Bhtust, Bon,Cu(Bu 6 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
46Malayalam ($,1@N@R@O@^@S@"(B) $,1@H@N@X@m@5@^@P@"(B 48Malayalam ($,1@N@R@O@^@S@"(B) $,1@H@N@X@m@5@^@P@"(B
47Maltese (il-Malti) Bon,Cu(Bu / Sa,C11(Ba 49Maltese (il-Malti) Bon,Cu(Bu / Sa,C11(Ba
48Mathematics $,1x (B p $,1x((B world $,1s"(B hello p $,2!a(B 50Mathematics $,1x (B p $,1x((B world $,1s"(B hello p $,2!a(B
49Nederlands, Vlaams Hallo / Dag
50Norwegian (norsk) Hei / God dag 51Norwegian (norsk) Hei / God dag
51Oriya ($,1:s;\;?:f(B) $,1;6;A;#;?;,;G(B 52Oriya ($,1:s;\;?:f(B) $,1;6;A;#;?;,;G(B
52Polish (j,Bj(Bzyk polski) Dzie,Bq(B dobry! / Cze,B6f(B! 53Polish (j,Bj(Bzyk polski) Dzie,Bq(B dobry! / Cze,B6f(B!