Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 615-621)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 197-199)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-166

3 files changed, 68 insertions, 29 deletions

diff --git a/leim/MISC-DIC/README b/leim/MISC-DIC/README
index fbc061801aa..95efbd4d27b 100644
--- a/leim/MISC-DIC/README
+++ b/leim/MISC-DIC/README
@@ -1,46 +1,27 @@
 The source and copyright status of dictionary files in this directory
-are categorised into these three.
+are categorised into these three groups.
 
 (1) cangjie-table.b5
     cangjie-table.cns
 
-These are verbatim copies of what distributed by the author Christian
-Wittern himself.  Each file contains a copyright notice.
+They are verbatim copies of those distributed by the author Christian
+Wittern himself.  Each file contains a license notice.
 
 (2) CTLau.html
     CTLau-b5.html
 
-These are verbatim copies of what distributed at the authors home page
-<umunhum.stanford.edu/~lee/chicomp/> Each file contains a copyright
-notice.
+They are verbatim copies of those distributed at the author's home
+page <umunhum.stanford.edu/~lee/chicomp/>. Each file contains a
+license notice.
 
 (3) pinyin.map
     ziranma.cin
 
-These are verbatim copies of what distributed with a free packaged
+They are copies of those distributed with a free package
 called CCE at:
         http://ftp.debian.org/debian/dists/potato/main
                 /source/utils/cce_0.36.orig.tar.gz
 
-As those files themselves don't contain copyright notices, the
-copyright notice of the package itself should cover them.
-
-============================================================
-            Copyright (C) 1999, Rui He, herui@cs.duke.edu
-
-
-                 CCE(Console Chinese Environment) 0.32
-
-CCE is free software; you can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the Free Software
-Foundation; either version 1, or (at your option) any later version.
-
-CCE is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-details.
-
-You should have received a copy of the GNU General Public License along with
-CCE; see the file COPYING.  If not, write to the Free Software Foundation,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.")
-============================================================
+As the original files don't contain copyright and license notices, a
+proper notice is extracted from the file Copyright and added at the
+head of each file.
diff --git a/leim/MISC-DIC/pinyin.map b/leim/MISC-DIC/pinyin.map
index ff6b1a79728..47078e50282 100644
--- a/leim/MISC-DIC/pinyin.map
+++ b/leim/MISC-DIC/pinyin.map
@@ -1,3 +1,32 @@
+% Header added for Emacs

+%

+% This file is included in the free package called CCE.  It is

+% available at:

+%       http://ftp.debian.org/debian/dists/potato/main

+%               /source/utils/cce_0.36.orig.tar.gz

+%

+% As the file itself doesn't contain copyright and license notices,

+% the following statements of the file cce/Copyright covers it.

+%

+%             Copyright (C) 1999, Rui He, herui@cs.duke.edu

+%

+%

+%                  CCE(Console Chinese Environment) 0.32

+%

+% CCE is free software; you can redistribute it and/or modify it under the

+% terms of the GNU General Public License as published by the Free Software

+% Foundation; either version 1, or (at your option) any later version.

+%

+% CCE is distributed in the hope that it will be useful, but WITHOUT ANY

+% WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS

+% FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more

+% details.

+%

+% You should have received a copy of the GNU General Public License along with

+% CCE; see the file COPYING.  If not, write to the Free Software Foundation,

+% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

+%

+% End of header added for Emacs

 a       °¢°¡ºÇëçàÄï¹ß¹

 ai      °®°§°¤°­°£°©°¬°¦°«°¥°¨°ª°¯êÓö°ÞßàÈè¨æÈïÍàÉíÁ

 an      °²°¸°´°µ°¶°³ÚÏ÷ö°°°±âÖèñðÆ°·ï§ÞîáíÛû

diff --git a/leim/MISC-DIC/ziranma.cin b/leim/MISC-DIC/ziranma.cin
index 91122fc4fdb..fe380e9dc49 100644
--- a/leim/MISC-DIC/ziranma.cin
+++ b/leim/MISC-DIC/ziranma.cin
@@ -1,3 +1,32 @@
+% Header added for Emacs
+%
+% This file is included in the free package called CCE.  It is
+% available at:
+%       http://ftp.debian.org/debian/dists/potato/main
+%               /source/utils/cce_0.36.orig.tar.gz
+%
+% As the file itself doesn't contain copyright and license notices,
+% the following statements of the file cce/Copyright covers it.
+%
+%             Copyright (C) 1999, Rui He, herui@cs.duke.edu
+%
+%
+%                  CCE(Console Chinese Environment) 0.32
+%
+% CCE is free software; you can redistribute it and/or modify it under the
+% terms of the GNU General Public License as published by the Free Software
+% Foundation; either version 1, or (at your option) any later version.
+%
+% CCE is distributed in the hope that it will be useful, but WITHOUT ANY
+% WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+% FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+% details.
+%
+% You should have received a copy of the GNU General Public License along with
+% CCE; see the file COPYING.  If not, write to the Free Software Foundation,
+% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+%
+% End of header added for Emacs
 %ename  ZiranMa
 %prompt ¡¾×ÔÈ»¡¿
 %selkey 1234567890