Merge from gnus--rel--5.10

[gnus] / texi / emacs-mime.texi

diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi
index 642aff0..a3571d3 100644 (file)
--- a/texi/emacs-mime.texi
+++ b/texi/emacs-mime.texi
@@ -10,7 +10,7 @@
 This file documents the Emacs MIME interface functionality.
 
 Copyright @copyright{} 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -125,7 +125,7 @@ diff.  Each of these features can be disabled by add an item into
 @table @code
 @item postscript
 @findex postscript
-Postscript file.
+PostScript file.
 
 @item uu
 @findex uu
@@ -865,7 +865,7 @@ ISO-8859-1 if possible, you can set this variable to
 basis by using the @code{charset} @acronym{MML} tag (@pxref{MML Definition}).
 
 As different hierarchies prefer different charsets, you may want to set
-@code{mm-coding-system-priorities} accoriding to the hierarchy in Gnus.
+@code{mm-coding-system-priorities} according to the hierarchy in Gnus.
 Here's an example:
 
 @c Corrections about preferred charsets are welcome.  de, fr and fj
@@ -877,20 +877,20 @@ Here's an example:
       (nconc
        ;; Some charsets are just examples!
        '(("^cn\\." ;; Chinese
-         (mm-coding-system-priorities
-          '(iso-8859-1 cn-big5 chinese-iso-7bit utf-8)))
-        ("^cz\\.\\|^pl\\." ;; Central and Eastern European
-         (mm-coding-system-priorities '(iso-8859-2 utf-8)))
-        ("^de\\." ;; German language
-         (mm-coding-system-priorities '(iso-8859-1 iso-8859-15 utf-8)))
-        ("^fr\\." ;; French
-         (mm-coding-system-priorities '(iso-8859-15 iso-8859-1 utf-8)))
-        ("^fj\\." ;; Japanese
-         (mm-coding-system-priorities
-          '(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8)))
-        ("^ru\\." ;; Cyrillic
-         (mm-coding-system-priorities
-          '(koi8-r iso-8859-5 iso-8859-1 utf-8))))
+          (mm-coding-system-priorities
+           '(iso-8859-1 cn-big5 chinese-iso-7bit utf-8)))
+         ("^cz\\.\\|^pl\\." ;; Central and Eastern European
+          (mm-coding-system-priorities '(iso-8859-2 utf-8)))
+         ("^de\\." ;; German language
+          (mm-coding-system-priorities '(iso-8859-1 iso-8859-15 utf-8)))
+         ("^fr\\." ;; French
+          (mm-coding-system-priorities '(iso-8859-15 iso-8859-1 utf-8)))
+         ("^fj\\." ;; Japanese
+          (mm-coding-system-priorities
+           '(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8)))
+         ("^ru\\." ;; Cyrillic
+          (mm-coding-system-priorities
+           '(koi8-r iso-8859-5 iso-8859-1 utf-8))))
        gnus-parameters))
 @end lisp