* 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

diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index b2cb5ee3d3bf9d764e63cd072bb4a44b9a562cc6..e45189ba1d066282131aedb01f0a0d231d52621e 100644 (file)
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -2011,8 +2011,8 @@ highlighting (@pxref{Font Lock}).  Unlike Enriched mode, Font Lock
 mode assigns text properties automatically, based on the current
 buffer contents; those properties are not saved to disk.
 
-  The file @file{etc/enriched.doc} in the Emacs distribution serves as
-an example of the features of Enriched mode.
+  The file @file{enriched.txt} in Emacs's @code{data-directory}
+serves as an example of the features of Enriched mode.
 
 @menu
 * Enriched Mode::           Entering and exiting Enriched mode.

diff --git a/etc/ChangeLog b/etc/ChangeLog
index faa369c40fb8997ed35e019ed84eb93230daf623..9a585c6d3cd867f01f2e53f0b6fc65724d23c767 100644 (file)
--- 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
similarity index 88%
rename from etc/enriched.doc
rename to etc/enriched.txt
index c501fe6b341ff896cce072e13a88b18fda541978..21d8481dce861c3db4bab2f50bc904a98f5f3ee9 100644 (file)
--- 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>
-
-
 
 \f
 Copyright (C) 1995, 1997, 2001-2013 Free Software Foundation, Inc.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 97f4c007c7276ffdc2b287dc99e2d5ad61140a1e..30b62f0880f192d4a2f86120991beebe8d5472a6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2013-11-23  Glenn Morris  <rgm@gnu.org>
 
+       * textmodes/enriched.el (enriched-mode): Doc fix.
+       * emacs-lisp/authors.el (authors-renamed-files-alist):
+       Add enriched.doc -> enriched.txt.
+
        * Makefile.in (emacs): Empty EMACSLOADPATH rather than unsetting.
 
 2013-11-22  Leo Liu  <sdl.web@gmail.com>

diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index 92796ac4e999b47883e77d77edc78ca92198efa8..abb34d80348a0feabf3e5bceab373c9d124b54d7 100644 (file)
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -617,6 +617,7 @@ in the repository.")
     ("config.h.in" . "config.in")
     ("paths.h-dist" . "paths.h.in")
     ("patch1" . "sed1.inp")
+    ("enriched.doc" . "enriched.txt")
     ("GETTING.GNU.SOFTWARE" . "FTP")
     ("etc/MACHINES" . "MACHINES")
     ("ONEWS" . "NEWS.19")

diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el
index e22ad24ccae3382c2445cdbc4e81d2da4bcd584b..82faf883b770506a2badd00afaa4393547855a4d 100644 (file)
--- a/lisp/textmodes/enriched.el
+++ b/lisp/textmodes/enriched.el
@@ -31,7 +31,7 @@
 ;; are supported except for <smaller> and <bigger>, which are currently not
 ;; possible to display.
 
-;; A separate file, enriched.doc, contains further documentation and other
+;; A separate file, enriched.txt, contains further documentation and other
 ;; important information about this code.  It also serves as an example
 ;; file in text/enriched format.  It should be in the etc directory of your
 ;; emacs distribution.
@@ -199,7 +199,7 @@ if ARG is omitted or nil.
 Turning the mode on or off runs `enriched-mode-hook'.
 
 More information about Enriched mode is available in the file
-etc/enriched.doc in the Emacs distribution directory.
+\"enriched.txt\" in `data-directory'.
 
 Commands: