master ca8170d906f 6/6: ; Fix merge problem in etc/NEWS.30.

[Eli Zaretskii]

branch: master
commit ca8170d906f99f40a953c399a94bf99e6466abed
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    ; Fix merge problem in etc/NEWS.30.
    
    Author:
---
 etc/NEWS.30 | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/etc/NEWS.30 b/etc/NEWS.30
index 40c8d4782a1..0766900a495 100644
--- a/etc/NEWS.30
+++ b/etc/NEWS.30
@@ -1416,6 +1416,16 @@ manual "(tramp) Improving performance of asynchronous 
remote processes".
 When a direct asynchronous process is invoked, it uses 'tramp-remote-path'
 for setting the remote 'PATH' environment variable.
 
+** SHR
+
+---
+*** New user option 'shr-fill-text'.
+When 'shr-fill-text' is non-nil (the default), SHR will fill text
+according to the width of the window.  If you customize it to nil, SHR
+will leave the text as-is; in that case, EWW will automatically enable
+'visual-line-mode' when displaying a page so that long lines are
+visually wrapped at word boundaries.
+
 ** EWW
 
 ---