* gnus.texi (Conformity): Fix typo.

	* emacs-mime.texi (Flowed text, Standards): Add.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 0698f92..912c657 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-12  Simon Josefsson  <jas@extundo.com>
+
+       * gnus.texi (Conformity): Fix typo.
+
+       * emacs-mime.texi (Flowed text, Standards): Add.
+
 2002-01-11  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * message.texi (Mailing Lists): Addition.

diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi
index 16ed3f8..0763241 100644 (file)
--- a/texi/emacs-mime.texi
+++ b/texi/emacs-mime.texi
@@ -1116,6 +1116,7 @@ string containing the @sc{mime} message.
 * Advanced MML Example::           Another example MML document.
 * Charset Translation::            How charsets are mapped from @sc{mule} to MIME.
 * Conversion::                     Going from @sc{mime} to MML and vice versa.
+* Flowed text::                    Soft and hard newlines.
 @end menu
 
 
@@ -1428,6 +1429,27 @@ other.  The resulting contents of the message should remain equivalent,
 if not identical.
 
 
+@node Flowed text
+@section Flowed text
+@cindex format=flowed
+
+The Emacs @sc{mime} library will respect the @code{use-hard-newlines}
+variable (@pxref{Hard and Soft Newlines, ,Hard and Soft Newlines,
+emacs, Emacs Manual}) when encoding a message, and the
+``format=flowed'' Content-Type parameter when decoding a message.
+
+On encoding text, lines terminated by soft newline characters are
+filled together and wrapped after the column decided by
+@code{fill-flowed-encode-column}.  This variable controls how the text
+will look in a client that does not support flowed text, the default
+is to wrap after 66 characters.  If hard newline characters are not
+present in the buffer, no flow encoding occurs.
+
+On decoding flowed text, lines with soft newline characters are filled
+together and wrapped after the column decided by
+@code{fill-flowed-display-column}.  The default is to wrap after
+@code{fill-column}.
+
 @node Standards
 @chapter Standards
 
@@ -1481,6 +1503,9 @@ Administrative Messages
 Communicating Presentation Information in Internet Messages: The
 Content-Disposition Header Field
 
+@item RFC2646
+Documentation of the text/plain format parameter for flowed text.
+
 @end table
 
 

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 26290e4..7c84975 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -20750,7 +20750,7 @@ look into implementing the changes when the draft is accepted as an RFC.
 @cindex MIME
 All the various MIME RFCs are supported.
 
-@item Disposition Notifications - RFC 2289
+@item Disposition Notifications - RFC 2298
 Message Mode is able to request notifications from the receiver.
 
 @item PGP - RFC 1991 and RFC 2440