master 92ce1d3fda: Update manual for recent image-dired changes

[Stefan Kangas]

branch: master
commit 92ce1d3fda4d892468d579e5d9cb3165677745ed
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Update manual for recent image-dired changes
    
    * doc/emacs/dired.texi (Image-Dired): Update to reflect recent
    changes.
---
 doc/emacs/dired.texi | 13 ++++++-------
 etc/NEWS             |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 33e9270d42..3dc6f724de 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -1641,7 +1641,7 @@ or through an external viewer.  This is different from 
Image mode
   To enter Image-Dired, mark the image files you want to look at in
 the Dired buffer, using @kbd{m} as usual.  Then type @kbd{C-t d}
 (@code{image-dired-display-thumbs}).  This creates and switches to a
-buffer containing image-dired, corresponding to the marked files.
+buffer containing Image-Dired, corresponding to the marked files.
 
   You can also enter Image-Dired directly by typing @kbd{M-x
 image-dired}.  This prompts for a directory; specify one that has
@@ -1660,10 +1660,9 @@ display the next image.  Typing @key{DEL}
 the previous thumbnail and displays that instead.
 
 @vindex image-dired-external-viewer
-  To view the image in its original size, either provide a prefix
-argument (@kbd{C-u}) before pressing @key{RET}, or type
-@kbd{C-@key{RET}} (@code{image-dired-thumbnail-display-external}) to
-display the image in an external viewer.  You must first configure
+  Type @kbd{C-@key{RET}}
+(@code{image-dired-thumbnail-display-external}) to display the image
+in an external viewer.  You must first configure
 @code{image-dired-external-viewer}.
 
   You can delete images through Image-Dired also.  Type @kbd{d}
@@ -1674,9 +1673,9 @@ image from the thumbnail buffer with @kbd{C-d}
 
   More advanced features include @dfn{image tags}, which are metadata
 used to categorize image files.  The tags are stored in a plain text
-file configured by @code{image-dired-db-file}.
+file configured by @code{image-dired-tags-db-file}.
 
-  To tag image files, mark them in the dired buffer (you can also mark
+  To tag image files, mark them in the Dired buffer (you can also mark
 files in Dired from the thumbnail buffer by typing @kbd{m}) and type
 @kbd{C-t t} (@code{image-dired-tag-files}).  This reads the tag name
 in the minibuffer.  To mark files having a certain tag, type @kbd{C-t f}
diff --git a/etc/NEWS b/etc/NEWS
index d7a6cc60eb..63c4ec79d2 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2157,7 +2157,7 @@ nil to disable this confirmation completely.
 ---
 *** 'image-dired-thumb-size' increased to 128.
 
----
++++
 *** 'image-dired-db-file' renamed to 'image-dired-tags-db-file'.
 
 ---