Changes committed gnus/texi (gnus.texi sasl.texi)

Modified: gnus.texi sasl.texi

Merge from emacs--devo--0, gnus--rel--5.10

Patches applied:

 * emacs--devo--0  (patch 1254-1310)

   - Update from CVS
   - Fix behavior of text-scale-increase when text-scale-mode is disabled
   - Tweak interface of buffer-face-mode functions
   - Fix variable names in buffer-face-mode-invoke
   - Fix autoload building command in src Makefile
   - Fix autoload directives in lisp/face-remap.el
   - (text-scale-adjust): Bind `echo-keystrokes' to nil.
   - Handle void selection in mouse-appearance-menu
   - Update from CVS: lisp/ibuf-ext.el (diff-sentinel): Declare.
   - Fix a bug with parsing of overlapping markup sequences in rcirc
   - Merge from emacs--rel--22
   - Implement display-time wrap/line-prefix feature
   - Merge from gnus--devo--0
   - Add missing doc/misc/ChangeLog entry

 * emacs--rel--22  (patch 277)
 * gnus--rel--5.10  (patch 297)

   - Update from CVS

2008-07-02  Juanma Barranquero  <[email protected]>

   * lisp/nnimap.el (nnimap-id):
   * lisp/sieve-manage.el (sieve-manage-open): Doc fixes.

2008-07-02  Francesc Rocher  <[email protected]>

   * lisp/gnus.el (gnus-group-startup-message): Prefer SVG or PNG image,
   if available.

2008-06-25  Stefan Monnier  <[email protected]>

   * lisp/mm-util.el (mm-with-multibyte, mm-with-unibyte): Remove.

   * lisp/nnkiboze.el (nnkiboze-generate-group):
   Use explicit mm-disable-multibyte rather than mm-with-unibyte.

   * lisp/nnmairix.el: Require CL.

Revision: [email protected]/gnus--devo--0--patch-517


Index: gnus.texi
diff -u gnus/texi/gnus.texi:7.297 gnus/texi/gnus.texi:7.298
--- gnus.texi:7.297	Wed Jul  2 13:47:43 2008
+++ gnus.texi	Fri Jul  4 02:09:30 2008
@@ -12781,7 +12781,7 @@
 Displayed when Gnus has treated overstrike characters in the article buffer.
 
 @item e
-Displayed when Gnus has treated emphasised strings in the article buffer.
+Displayed when Gnus has treated emphasized strings in the article buffer.
 
 @end table
 
Index: sasl.texi
diff -u gnus/texi/sasl.texi:7.8 gnus/texi/sasl.texi:7.9
--- sasl.texi:7.8	Tue Jun 17 23:37:01 2008
+++ sasl.texi	Fri Jul  4 02:09:30 2008
@@ -124,9 +124,9 @@
 
 @defun sasl-find-mechanism mechanisms
 
-Retrieve an apropriate mechanism.
+Retrieve an appropriate mechanism.
 This function compares @var{mechanisms} and @code{sasl-mechanisms} then
-returns apropriate @code{sasl-mechanism} object.
+returns appropriate @code{sasl-mechanism} object.
 
 @example
 (let ((sasl-mechanisms '("CRAM-MD5" "DIGEST-MD5")))