Merge from emacs-23; up to 2010-06-15T03:34:12Z!rgm@gnu.org.

[bpt/emacs.git] / doc / misc / emacs-mime.texi

diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi
index 2a0e856..a9d80d8 100644 (file)
--- a/doc/misc/emacs-mime.texi
+++ b/doc/misc/emacs-mime.texi
@@ -1,5 +1,7 @@
 \input texinfo
 
 \input texinfo
 

+@include gnus-overrides.texi
+

 @setfilename ../../info/emacs-mime
 @settitle Emacs MIME Manual
 @synindex fn cp
 @setfilename ../../info/emacs-mime
 @settitle Emacs MIME Manual
 @synindex fn cp


@@ -9,8 +11,7 @@
 @copying
 This file documents the Emacs MIME interface functionality.
 
 @copying
 This file documents the Emacs MIME interface functionality.
 

-Copyright @copyright{} 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+Copyright @copyright{} 1998-2011 Free Software Foundation, Inc.

 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document


@@ -29,7 +30,7 @@ developing GNU and promoting software freedom.''
 @c Node ``Interface Functions'' uses Latin-1 characters
 @documentencoding ISO-8859-1
 
 @c Node ``Interface Functions'' uses Latin-1 characters
 @documentencoding ISO-8859-1
 

-@dircategory Emacs
+@dircategory Emacs lisp libraries

 @direntry
 * Emacs MIME: (emacs-mime).     Emacs MIME de/composition library.
 @end direntry
 @direntry
 * Emacs MIME: (emacs-mime).     Emacs MIME de/composition library.
 @end direntry


@@ -39,7 +40,12 @@ developing GNU and promoting software freedom.''
 @setchapternewpage odd
 
 @titlepage
 @setchapternewpage odd
 
 @titlepage

+@ifset WEBHACKDEVEL
+@title Emacs MIME Manual (DEVELOPMENT VERSION)
+@end ifset
+@ifclear WEBHACKDEVEL

 @title Emacs MIME Manual
 @title Emacs MIME Manual

+@end ifclear

 
 @author by Lars Magne Ingebrigtsen
 @page
 
 @author by Lars Magne Ingebrigtsen
 @page


@@ -374,12 +380,18 @@ message as follows:
 @vindex mm-inline-large-images
 When displaying inline images that are larger than the window, Emacs
 does not enable scrolling, which means that you cannot see the whole
 @vindex mm-inline-large-images
 When displaying inline images that are larger than the window, Emacs
 does not enable scrolling, which means that you cannot see the whole

-image.  To prevent this, the library tries to determine the image size
+image. To prevent this, the library tries to determine the image size

 before displaying it inline, and if it doesn't fit the window, the
 library will display it externally (e.g. with @samp{ImageMagick} or
 before displaying it inline, and if it doesn't fit the window, the
 library will display it externally (e.g. with @samp{ImageMagick} or

-@samp{xv}).  Setting this variable to @code{t} disables this check and
+@samp{xv}). Setting this variable to @code{t} disables this check and

 makes the library display all inline images as inline, regardless of
 makes the library display all inline images as inline, regardless of

-their size.
+their size. If you set this variable to @code{resize}, the image will
+be displayed resized to fit in the window, if Emacs has the ability to
+resize images.
+
+@item mm-inline-large-images-proportion
+@vindex mm-inline-images-max-proportion
+The proportion used when resizing large images.

 
 @item mm-inline-override-types
 @vindex mm-inline-override-types
 
 @item mm-inline-override-types
 @vindex mm-inline-override-types


@@ -1034,6 +1046,10 @@ flowed text, the default is to wrap after 66 characters.  If hard
 newline characters are not present in the buffer, no flow encoding
 occurs.
 
 newline characters are not present in the buffer, no flow encoding
 occurs.
 

+You can customize the value of the @code{mml-enable-flowed} variable
+to enable or disable the flowed encoding usage when newline
+characteres are present in the buffer.
+

 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
 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