* etc/enriched.txt: Rename from enriched.doc.

Misc small updates for this hardly being "new" any more.

* lisp/textmodes/enriched.el (enriched-mode): Doc fix.

* lisp/emacs-lisp/authors.el (authors-renamed-files-alist):
Add enriched.doc -> enriched.txt.

Fixes: debbugs:15947

2 files changed, 17 insertions, 28 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index faa369c40fb..9a585c6d3cd 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-23  Glenn Morris  <rgm@gnu.org>
+
+        * enriched.txt: Rename from enriched.doc.  (Bug#15947)
+        Misc small updates for this hardly being "new" any more.
+
 2013-11-20  Leo Liu  <sdl.web@gmail.com>
 
         * NEWS: Mention new display action alist entry `no-display-ok'.
diff --git a/etc/enriched.doc b/etc/enriched.txt
index c501fe6b341..21d8481dce8 100644
--- a/etc/enriched.doc
+++ b/etc/enriched.txt
@@ -10,10 +10,10 @@ Text-Width: 70
 
 
 
-<indent>Emacs now has the ability to edit <italic>enriched text</italic>, which is text
-containing faces, colors, indentation, and other properties.  This
-document is a quick introduction to some of the new features, and
-is also an example file in the <italic>text/enriched </italic>format.</indent>
+<indent>Emacs has the ability to edit <italic>enriched text</italic>, which is text
+containing faces, colors, indentation, and other properties.
+This document is a quick introduction to some of the features,
+and is also an example file in the <italic>text/enriched </italic>format.</indent>
 
 
 <x-bg-color><param>blue</param><x-color><param>white</param><bold>INSTALLATION and STARTUP</bold></x-color></x-bg-color>
@@ -175,16 +175,8 @@ all of the features of your document, but they will get as close
 as possible.
 
 
-The MIME standard is defined in </indent>Internet<indent> RFC 1521; text/enriched
-is defined in RFC 1563.  Details on obtaining these documents via
-FTP or email may be obtained by sending an email message to
-<fixed>rfc-info@isi.edu</fixed> with the message body:
-
-
-<fixed><indent>help: ways_to_get_rfcs</indent></fixed>
-
-
-<indent>See also the newsgroup <fixed>comp.mail.mime</fixed>.</indent></indent>
+The text/enriched standard is defined in </indent>Internet<indent> RFC 1896
+(<<http://www.ietf.org/rfc/rfc1896.txt>).</indent></indent>
 
 
 <x-bg-color><param>blue</param><x-color><param>white</param><bold>CUSTOMIZATION</bold></x-color></x-bg-color><bold>
@@ -198,16 +190,15 @@ enriched-verbose.
 </fixed></indent>-<indent> You can add annotations for your own text properties by making
 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>
+<italic>"x-read-only"</italic>).  Please report any such additions that you
+think might be of general interest using <fixed>M-x report-emacs-bug</fixed>.</indent>
 
 </indent>
 
-<x-bg-color><param>blue</param><x-color><param>white</param><bold>TO-DO LIST</bold></x-color></x-bg-color>
+<x-bg-color><param>blue</param><x-color><param>white</param><bold>TODO LIST</bold></x-color></x-bg-color>
 
 
-<italic><indent>[Feel free to work on these and send me the results!]</indent></italic><indent>
+<italic><indent>[Feel free to work on these and send us the results!]</indent></italic><indent>
 
 + Conform to updated text/enriched spec in RFC 1896.
 
@@ -238,22 +229,15 @@ it.</indent>
 
 + Support more formats: RTF, HTML...
 
-+ Use Emacs 21 display features.
++ Use modern Emacs display features.
 
 </indent>
 
-<x-bg-color><param>blue</param><x-color><param>white</param><bold>Final Notes:</bold></x-color></x-bg-color>
-
-
-<indent>This code and documentation is under development.  Comments and
-bug reports are welcome.</indent>
+<x-bg-color><param>blue</param><x-color><param>white</param><bold>Original Author:</bold></x-color></x-bg-color>
 
 
 <bold><x-color><param>white</param><x-bg-color><param>blue</param>Boris Goldowsky</x-bg-color></x-color><x-color><param>light blue</param> </x-color></bold><x-color><param>light blue</param><fixed><<boris@gnu.ai.mit.edu></fixed></x-color><x-color><param>blue</param>
 
-</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, 2001-2013 Free Software Foundation, Inc.