Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 285-296)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Update from CVS: admin/FOR-RELEASE: Update refcard section.

 * gnus--rel--5.10  (patch 102-104)

   - Update from CVS

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

1 files changed, 21 insertions, 0 deletions

diff --git a/etc/enriched.doc b/etc/enriched.doc
index 122652f005a..0b83bbcabfe 100644
--- a/etc/enriched.doc
+++ b/etc/enriched.doc
@@ -254,3 +254,24 @@ bug reports are welcome.</indent>
 </x-color><x-bg-color><param>blue</param><x-color><param>white</param>April 1995; updated August 1997</x-color></x-bg-color>
 
 
+
+
+Copyright (c) 1995, 1997, 2006
+Free software Foundation, Inc.
+
+COPYING PERMISSIONS:
+
+    This document 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 2 of the License, or
+    (at your option) any later version.
+
+    This program 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 this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+