Merge changes from emacs-23 branch

[gnu-emacs] / etc / enriched.doc

diff --git a/etc/enriched.doc b/etc/enriched.doc
index fc1703c18d792a468483864a99075f54d11a800a..78459de8090d07b87743d0013b84dc2ab5f4a61b 100644 (file)
--- a/etc/enriched.doc
+++ b/etc/enriched.doc
@@ -74,9 +74,9 @@ the right margin, fully justified, centered, or left alone).</indent>
 <indent>You can add faces either with the menu or with <fixed>M-g.</fixed>  The face is
 applied to the current region.  If you are using
 `transient-mark-mode' and the region is not active, then the face
-applies to whatever you type next.  Any face can have colors, but
-faces have no other attributes are put on the color submenus of
-the "Text Properties" menu.</indent>
+applies to whatever you type next.  Any face can have colors.  If
+this is its lone attribute, the face is put on the color submenus
+of the "Text Properties" menu.</indent>
 
 
 <x-bg-color><param>blue</param><x-color><param>white</param><bold>NEWLINES and PARAGRAPHS</bold></x-color></x-bg-color>
@@ -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
@@ -196,11 +196,11 @@ FTP or email may be obtained by sending an email message to
 enriched-verbose.
 
 </fixed></indent>-<indent> You can add annotations for your own text properties by making
-additions to <fixed>enriched-annotation-alist</fixed>.  Note that the
-standard requires you to name your annotation starting<italic> "x-"
-</italic>(as in <italic>"x-read-only"</italic>).  Please send me any such additions that
-you think might be of general interest so that I can include
-them in the distribution.</indent>
+additions to <fixed>enriched-translations</fixed>.  Note that the standard
+requires you to name your annotation starting<italic> "x-" </italic>(as in
+<italic>"x-read-only"</italic>).  Please send me any such additions that you
+think might be of general interest so that I can include them
+in the distribution.</indent>
 
 </indent>
 
@@ -219,7 +219,7 @@ them in the distribution.</indent>
 paragraph properly filled all the time, without slowing down
 editing too much.  Refill mode is a start at this, but needs
 
-</indent></indent>     <indent>improvment.
+</indent></indent>     <indent>improvement.
 
 + Refill after yank.  [Refill mode does that.]
 
@@ -253,3 +253,22 @@ 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, 2001-2012  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 3 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, see <<http://www.gnu.org/licenses/>.