master acc5758: Mention how to disable auto-fill-mode in the auto-fill section

[Lars Ingebrigtsen]

branch: master
commit acc575846d13cf6d925116edccb9f213f1adf1be
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Mention how to disable auto-fill-mode in the auto-fill section
    
    * doc/lispref/text.texi (Margins): Mention how to disable
    auto-fill-mode.
---
 doc/lispref/text.texi | 7 ++++++-
 etc/NEWS              | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 9e0401f..f83ca97 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -1802,7 +1802,12 @@ read, you should set @code{fill-column} to no more than 
70.  Otherwise
 the line will be too long for people to read comfortably, and this can
 make the text seem clumsy.
 
-The default value for @code{fill-column} is 70.
+The default value for @code{fill-column} is 70.  To disable Auto Fill
+mode in a specific mode, you could say something like:
+
+@lisp
+(add-hook 'foo-mode-hook (lambda () (auto-fill-mode -1))
+@end lisp
 @end defopt
 
 @deffn Command set-left-margin from to margin
diff --git a/etc/NEWS b/etc/NEWS
index 7d16bf0..da1ca69 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2964,6 +2964,7 @@ This is to keep the same behavior as Eshell.
 The original key binding was 'M-s', which interfered with I-search,
 since the latter uses 'M-s' as a prefix key of the search prefix map.
 
+---
 ** In 'f90-mode', the backslash character ('\') no longer escapes.
 For about a decade, the backslash character has no longer had a
 special escape syntax in Fortran F90.  To get the old behavior back,
@@ -2971,6 +2972,7 @@ say something like:
 
     (modify-syntax-entry ?\\ "\\" f90-mode-syntax-table)
 
++++
 ** Setting 'fill-column' to nil is obsolete.
 This undocumented use of 'fill-column' is now obsolete.  To disable
 auto filling, turn off 'auto-fill-mode' instead.