Merge from emacs--devo--0

[gnu-emacs] / etc / enriched.doc

diff --git a/etc/enriched.doc b/etc/enriched.doc
index 55e11004f0589789b254f4b124942597c292e0d2..0b83bbcabfe3836820523d617c8fe31a0a2be225 100644 (file)
--- a/etc/enriched.doc
+++ b/etc/enriched.doc
@@ -98,8 +98,8 @@ direct request, such as using the return key or the <fixed>C-o
 <indent>The fill functions also understand margins, which can be set for
 any region of a document.  In addition to the menu items, which
 increase or decrease the margins, there are two commands for
-setting the margins absolutely: <fixed>C-c C-l (set-left-margin)</fixed> and <fixed>C-c
-C-r (set-right-margin)</fixed>.
+setting the margins absolutely: <fixed>C-c [ (set-left-margin)</fixed> and <fixed>C-c
+] (set-right-margin)</fixed>.
 
 
 You <indent>can change indentation at any point in a paragraph, which
@@ -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>
 
 
+
+\f
+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
+