[Emacs-diffs] trunk r115193: * etc/enriched.txt: Rename from enriched.doc.

[Glenn Morris]

------------------------------------------------------------
revno: 115193
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15947
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-11-22 18:21:51 -0800
message:
  * 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.
renamed:
  etc/enriched.doc => etc/enriched.txt 
enriched.doc-20091113204419-o5vbwnq5f7feedwu-801
modified:
  doc/emacs/text.texi            text.texi-20091113204419-o5vbwnq5f7feedwu-6278
  etc/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1485
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/authors.el     authors.el-20091113204419-o5vbwnq5f7feedwu-1898
  lisp/textmodes/enriched.el     
enriched.el-20091113204419-o5vbwnq5f7feedwu-2594
  etc/enriched.txt               
enriched.doc-20091113204419-o5vbwnq5f7feedwu-801

=== modified file 'doc/emacs/text.texi'
--- a/doc/emacs/text.texi       2013-09-12 12:04:18 +0000
+++ b/doc/emacs/text.texi       2013-11-23 02:21:51 +0000
@@ -2011,8 +2011,8 @@
 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.

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2013-11-20 02:44:38 +0000
+++ b/etc/ChangeLog     2013-11-23 02:21:51 +0000
@@ -1,3 +1,8 @@
+2013-11-23  Glenn Morris  <address@hidden>
+
+       * enriched.txt: Rename from enriched.doc.  (Bug#15947)
+       Misc small updates for this hardly being "new" any more.
+
 2013-11-20  Leo Liu  <address@hidden>
 
        * NEWS: Mention new display action alist entry `no-display-ok'.

=== renamed file 'etc/enriched.doc' => 'etc/enriched.txt'
--- a/etc/enriched.doc  2013-11-21 19:22:42 +0000
+++ b/etc/enriched.txt  2013-11-23 02:21:51 +0000
@@ -10,10 +10,10 @@
 
 
 
-<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 @@
 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>address@hidden</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 @@
 </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>
-
-
-<italic><indent>[Feel free to work on these and send me the 
results!]</indent></italic><indent>
+<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 us the 
results!]</indent></italic><indent>
 
 + Conform to updated text/enriched spec in RFC 1896.
 
@@ -238,22 +229,15 @@
 
 + 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><<address@hidden></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.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-23 01:55:16 +0000
+++ b/lisp/ChangeLog    2013-11-23 02:21:51 +0000
@@ -1,5 +1,9 @@
 2013-11-23  Glenn Morris  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/emacs-lisp/authors.el'
--- a/lisp/emacs-lisp/authors.el        2013-10-13 23:01:20 +0000
+++ b/lisp/emacs-lisp/authors.el        2013-11-23 02:21:51 +0000
@@ -617,6 +617,7 @@
     ("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")

=== modified file 'lisp/textmodes/enriched.el'
--- a/lisp/textmodes/enriched.el        2013-01-01 09:11:05 +0000
+++ b/lisp/textmodes/enriched.el        2013-11-23 02:21:51 +0000
@@ -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 @@
 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: