Spelling fixes.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8b678c..49dc47b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2011-11-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * color.el (color-rgb-to-hsl):
+       * gmm-utils.el (gmm-tool-bar-style):
+       * gnus-group.el (gnus-group-prepare-flat):
+       * gnus-topic.el (gnus-topic-prepare-topic):
+       * mm-decode.el (mm-discouraged-alternatives):
+       * rfc2047.el (rfc2047-encode-1):
+       * starttls.el: Spelling fix.
+
 2011-11-24  Glenn Morris  <rgm@gnu.org>
 
        * binhex.el (binhex-begin-line): Give it basic doc-string.
@@ -3073,7 +3083,7 @@
 2011-01-28  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-sum.el (gnus-select-newsgroup): Don't try to alter the active
-       data if the group is unactivated.
+       data if the group is deactivated.
 
 2011-01-28  Julien Danjou  <julien@danjou.info>
 

diff --git a/lisp/color.el b/lisp/color.el
index 487e280..96b79a4 100644 (file)
--- a/lisp/color.el
+++ b/lisp/color.el
@@ -128,8 +128,8 @@ inclusive."
 RED, GREEN, and BLUE should each be numbers between 0.0 and 1.0,
 inclusive.
 
-Return a list (HUE, SATURATION, LUMINENCE), where HUE is in radians
-and both SATURATION and LUMINENCE are between 0.0 and 1.0,
+Return a list (HUE, SATURATION, LUMINANCE), where HUE is in radians
+and both SATURATION and LUMINANCE are between 0.0 and 1.0,
 inclusive."
   (let* ((r red)
          (g green)

diff --git a/lisp/gmm-utils.el b/lisp/gmm-utils.el
index f913ddb..3ee72bc 100644 (file)
--- a/lisp/gmm-utils.el
+++ b/lisp/gmm-utils.el
@@ -217,7 +217,7 @@ This is a copy of the `lazy' widget in Emacs 22.1 provided for compatibility."
                                 'static-color 'pseudo-color)))))
       'gnome
     'retro)
-  "Prefered tool bar style."
+  "Preferred tool bar style."
   :type '(choice (const :tag "GNOME style" gnome)
                 (const :tag "Retro look"  retro))
   :group 'gmm)

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 7e48864..731a312 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -1354,9 +1354,9 @@ if it is a string, only list groups matching REGEXP."
                     (predicate t)      ; We list all groups?
                     (t
                      (or
-                      (if (eq unread t) ; Unactivated?
+                      (if (eq unread t) ; Deactivated?
                           gnus-group-list-inactive-groups
-                                       ; We list unactivated
+                                       ; We list inactive
                         (and (numberp unread) (> unread 0)))
                                        ; We list groups with unread articles
                       (and gnus-list-groups-with-ticked-articles

diff --git a/lisp/gnus-topic.el b/lisp/gnus-topic.el
index 17af1a3..87ca27a 100644 (file)
--- a/lisp/gnus-topic.el
+++ b/lisp/gnus-topic.el
@@ -582,7 +582,7 @@ articles in the topic and its subtopics."
               (or gnus-topic-display-empty-topics ;We want empty topics
                   (not (zerop unread)) ;Non-empty
                   tick                 ;Ticked articles
-                  (/= point-max (point-max)))) ;Unactivated groups
+                  (/= point-max (point-max)))) ;Inactive groups
       (gnus-extent-start-open (point))
       (gnus-topic-insert-topic-line
        (car type) visiblep

diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el
index 36c56e0..44e2af5 100644 (file)
--- a/lisp/mm-decode.el
+++ b/lisp/mm-decode.el
@@ -360,7 +360,7 @@ to:
  (\"text/html\" \"text/richtext\")
 
 Adding \"image/.*\" might also be useful.  Spammers use it as the
-prefered part of multipart/alternative messages.  See also
+preferred part of multipart/alternative messages.  See also
 `gnus-buttonized-mime-types', to which adding \"multipart/alternative\"
 enables you to choose manually one of two types those mails include."
   :type '(repeat regexp) ;; See `mm-preferred-alternative-precedence'.

diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index feed078..f1cb1f6 100644 (file)
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -586,7 +586,7 @@ should not change this value.")
        ((>= column rfc2047-encode-max-chars)
         (when eword
           (cond ((string-match "\n[ \t]+\\'" eword)
-                 ;; Reomove a superfluous empty line.
+                 ;; Remove a superfluous empty line.
                  (setq eword (substring eword 0 (match-beginning 0))))
                 ((string-match "(+\\'" eword)
                  ;; Break the line before the open parenthesis.
@@ -639,7 +639,7 @@ should not change this value.")
               (setq crest " "
                     eword (concat eword next)))
             (when (string-match "\n[ \t]+\\'" eword)
-              ;; Reomove a superfluous empty line.
+              ;; Remove a superfluous empty line.
               (setq eword (substring eword 0 (match-beginning 0))))
             (rfc2047-encode-1 (length crest) (substring string index)
                               cs encoder start " " tail

diff --git a/lisp/starttls.el b/lisp/starttls.el
index 58dbebf..af9fd42 100644 (file)
--- a/lisp/starttls.el
+++ b/lisp/starttls.el
@@ -35,7 +35,7 @@
 ;; and the second one is Simon Josefsson's starttls.el which uses
 ;; "gnutls-cli" from GnuTLS.
 ;;
-;; If "starttls" is available, it is prefered by the code over
+;; If "starttls" is available, it is preferred by the code over
 ;; "gnutls-cli", for backwards compatibility.  Use
 ;; `starttls-use-gnutls' to toggle between implementations if you have
 ;; both tools installed.  It is recommended to use GnuTLS, though, as

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 8f81afd..a8ae1b8 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * gnus.texi (The swish++ Engine, The swish-e Engine):
+       * message.texi (IDNA): Spelling fix.
+
 2011-11-24  Glenn Morris  <rgm@gnu.org>
 
        * gnus.texi: Fix case of "GnuTLS".

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 8ca795b..e3d9283 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -21279,7 +21279,7 @@ name (or part of a name) to match.
 @node The swish++ Engine
 @subsubsection The swish++ Engine
 
-FIXEM: Say something more here.
+FIXME: Say something more here.
 
 Documentation for swish++ may be found at the swish++ sourceforge page:
 @uref{http://swishplusplus.sourceforge.net}
@@ -21302,7 +21302,7 @@ to get a group name. By default this is @code{$HOME/Mail}.
 @node The swish-e Engine
 @subsubsection The swish-e Engine
 
-FIXEM: Say something more here.
+FIXME: Say something more here.
 
 Documentation for swish-e may be found at the swish-e homepage
 @uref{http://swish-e.org}

diff --git a/texi/message.texi b/texi/message.texi
index 775f501..909292f 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -904,7 +904,7 @@ happen---Message will encode non-@acronym{ASCII} domain names in @code{From},
 Until @acronym{IDNA} becomes more well known, Message queries you
 whether @acronym{IDNA} encoding of the domain name really should
 occur.  Some users might not be aware that domain names can contain
-non-@acronym{ASCII} now, so this gives them a safety net if they accidently
+non-@acronym{ASCII} now, so this gives them a safety net if they accidentally
 typed a non-@acronym{ASCII} domain name.
 
 @vindex message-use-idna