From: yamaoka <yamaoka>
Date: Sun, 20 Jul 2003 13:03:10 +0000 (+0000)
Subject: Synch to Gnus 200307191408.
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=037232362e15b4ece30f9380f126e5d726843dce;p=elisp%2Fgnus.git-

Synch to Gnus 200307191408.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 658885e..a49fae4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-19  Jesper Harder  <harder@ifa.au.dk>
+
+	* mm-util.el (mm-coding-system-priorities): Docstring improvement.
+
 2003-07-17  Jesper Harder  <harder@ifa.au.dk>
 
 	* gnus-sum.el (gnus-thread-latest-date): Move condition-case to
diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 682788d..3c164a7 100644
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -311,12 +311,12 @@ Valid elements include:
 	       ;; Japanese users may prefer iso-2022-jp to shift-jis.
 	       '(iso-2022-jp iso-2022-jp-2 japanese-shift-jis
 			     iso-latin-1 utf-8)))))
-  "Preferred coding systems for encoding outgoing mails.
+  "Preferred coding systems for encoding outgoing messages.
 
-More than one suitable coding system may be found for some text.  By
-default, the coding system with the highest priority is used to encode
-outgoing mails (see `sort-coding-systems').  If this variable is set,
-it overrides the default priority."
+More than one suitable coding system may be found for some text.
+By default, the coding system with the highest priority is used
+to encode outgoing messages (see `sort-coding-systems').  If this
+variable is set, it overrides the default priority."
   :type '(repeat (symbol :tag "Coding system"))
   :group 'mime)
 
diff --git a/texi/ChangeLog b/texi/ChangeLog
index c831fe4..f18b077 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-19  Jesper Harder  <harder@ifa.au.dk>
+
+	* emacs-mime.texi (Encoding Customization): Fix.
+	(MML Definition): Typo.
+
 2003-07-17  Jesper Harder  <harder@ifa.au.dk>
 
 	* gnus.texi (Sorting the Summary Buffer): Index.
diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi
index d37826e..4e359b2 100644
--- a/texi/emacs-mime.texi
+++ b/texi/emacs-mime.texi
@@ -589,7 +589,7 @@ Use the contents of the file in the body of the part
 
 @item charset
 The contents of the body of the part are to be encoded in the character
-set speficied (@code{Content-Type}). @xref{Charset Translation}.
+set specified (@code{Content-Type}). @xref{Charset Translation}.
 
 @item name
 Might be used to suggest a file name if the part is to be saved
@@ -803,7 +803,7 @@ is @code{nil}, which means to use the defaults in Emacs.  It is a list of
 coding system symbols (aliases of coding systems does not work, use
 @kbd{M-x describe-coding-system} to make sure you are not specifying
 an alias in this variable).  For example, if you have configured Emacs
-to use prefer UTF-8, but wish that outgoing messages should be sent in
+to prefer UTF-8, but wish that outgoing messages should be sent in
 ISO-8859-1 if possible, you can set this variable to
 @code{(iso-latin-1)}.  You can override this setting on a per-message
 basis by using the @code{charset} MML tag (@pxref{MML Definition}).