From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 21 Apr 2020 13:50:13 +0000 (+0300)
Subject: Minor improvements in documentation of the last change
X-Git-Tag: emacs-27.1-rc1~197
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fc55f65305e855b31a8594764cfadfb5bf0f107f;p=emacs.git

Minor improvements in documentation of the last change

* etc/NEWS:
* doc/emacs/files.texi (Image Mode): Minor copyedits of last change.
---

diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 8d75b569edb..7318667403f 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -2126,11 +2126,14 @@ and displaying it in hex representation.  Displaying the file as an
 image works only if Emacs is compiled with support for displaying
 such images.
 
-If the displayed image is wider or taller than the frame, the usual
-point motion keys (@kbd{C-f}, @kbd{C-p}, and so forth) cause different
-parts of the image to be displayed.  But by default the image is
-resized automatically to fit to the window.  You can configure this by
-using two options @code{image-auto-resize} and
+@vindex image-auto-resize
+@vindex image-auto-resize-on-window-resize
+If the displayed image is wider or taller than the window in which it
+is displayed, the usual point motion keys (@kbd{C-f}, @kbd{C-p}, and
+so forth) cause different parts of the image to be displayed.
+However, by default images are resized automatically to fit the
+window, so this is only necessary if you customize the default
+behavior by using the options @code{image-auto-resize} and
 @code{image-auto-resize-on-window-resize}.
 
 You can press @kbd{n} (@code{image-next-file}) and @kbd{p}
diff --git a/etc/NEWS b/etc/NEWS
index 1d630a3e91b..65ac6d2a2f3 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -3525,10 +3525,10 @@ according to the orientation in the Exif data, if any.
 
 +++
 *** In 'image-mode' the image is resized automatically to fit in window.
-The image will resize upon first display and whenever the window's
-dimensions change.  Two user options 'image-auto-resize' and
-'image-auto-resize-on-window-resize' can define resizing parameters or
-disable auto-resizing.
+By default, the image will resize upon first display and whenever the
+window's dimensions change.  Two user options 'image-auto-resize' and
+'image-auto-resize-on-window-resize' control the resizing behavior
+(including the possibility to disable auto-resizing).
 
 ---
 *** New library image-converter.