Merge CEDET upstream (rev. 8579)

[gnu-emacs] / doc / misc / dired-x.texi

diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index cd1ad79eab57e5bc4422b56e107edbe406e606b1..1e3d11f6dc6bd4dbd528a6af17286e0880fedf5c 100644 (file)
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -19,7 +19,7 @@
 @comment %**end of header (This is for running Texinfo on a region.)
 
 @copying
-Copyright @copyright{} 1994-1995, 1999, 2001-2012
+Copyright @copyright{} 1994--1995, 1999, 2001--2013
 Free Software Foundation, Inc.
 
 @quotation
@@ -31,8 +31,7 @@ and with the Back-Cover Texts as in (a) below.  A copy of the license
 is included in the section entitled ``GNU Free Documentation License''.
 
 (a) The FSF's Back-Cover Text is: ``You have the freedom to copy and
-modify this GNU manual.  Buying copies from the FSF supports it in
-developing GNU and promoting software freedom.''
+modify this GNU manual.''
 @end quotation
 @end copying
 
@@ -883,7 +882,7 @@ Dired buffers, is like @code{shell-command}, but it runs with
 
 @file{dired-x} provides a method of visiting or editing a file mentioned in
 the buffer you are viewing (e.g., a mail buffer, a news article, a
-@file{README} file, etc.) or to test if that file exists.  You can then modify
+@file{README} file, etc.)@: or to test if that file exists.  You can then modify
 this in the minibuffer after snatching the file name.
 
 When installed @file{dired-x} will substitute @code{dired-x-find-file} for