Fix typos.

20 files changed, 98 insertions, 83 deletions

diff --git a/ChangeLog b/ChangeLog
index a3cfbd55db1..90af2520016 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1438,7 +1438,7 @@
 
 2010-10-24  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-	* configure.in: Remove the BROKEN annotation from gnutls.
+	* configure.in: Remove the BROKEN annotation from GnuTLS.
 
 2010-10-22  Glenn Morris  <rgm@gnu.org>
 
@@ -1521,7 +1521,7 @@
 2010-09-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* configure.in (HAVE_GNUTLS): Don't break if we don't have the
-	gnutls libraries.
+	GnuTLS libraries.
 
 2010-09-26  Teodor Zlatanov  <tzz@lifelogs.com>
 
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 57e7dd5871a..f94153479a8 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -2995,7 +2995,7 @@
 	* org.texi (Activation, Exporting, ASCII export, HTML export)
 	(HTML Export commands, LaTeX/PDF export commands):
 	Improve documentation about transient-mark-mode.
-	(References): DOcuemtn the use of special names like $LR1 to reference
+	(References): Document the use of special names like $LR1 to reference
 	to fields in the last table row.
 
 2008-12-19  Juri Linkov  <juri@jurta.org>
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d4410089716..8f31c293b7a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2011-11-25  Juanma Barranquero  <lekktu@gmail.com>
+
+	* emacs-lisp/avl-tree.el (avl-tree--do-copy, avl-tree-create)
+	(avl-tree-compare-function, avl-tree-empty, avl-tree-enter)
+	(avl-tree-delete, avl-tree-member, avl-tree-member-p, avl-tree-map)
+	(avl-tree-mapc, avl-tree-mapf, avl-tree-mapcar, avl-tree-copy)
+	(avl-tree-clear, avl-tree-stack, avl-tree-stack-pop)
+	(avl-tree-stack-first):
+	* emacs-lisp/cconv.el (cconv--analyse-use):
+	* net/gnutls.el (gnutls-negotiate): Fix typos.
+
 2011-11-24  Glenn Morris  <rgm@gnu.org>
 
 	* lpr.el (lpr-windows-system, lpr-lp-system):
@@ -3832,7 +3843,7 @@
 
 	* cus-edit.el (custom-show): Mark as obsolete.
 
-	* net/network-stream.el (network-stream-open-starttls): If gnutls
+	* net/network-stream.el (network-stream-open-starttls): If GnuTLS
 	negotiation fails, then possibly try again with a non-encrypted
 	connection (bug#9017).
 
@@ -8018,7 +8029,7 @@
 2011-04-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* net/network-stream.el (network-stream-open-starttls): Only do
-	opportunistic STARTTLS upgrades if we have built-in gnutls support.
+	opportunistic STARTTLS upgrades if we have built-in GnuTLS support.
 	Upgrades via gnutls-cli are too slow to be done opportunistically.
 
 2011-04-12  Juanma Barranquero  <lekktu@gmail.com>
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index bf6f21cd422..0d2255ac0a4 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -9746,8 +9746,8 @@
 
 2002-09-28  Simon Josefsson  <jas@extundo.com>
 
-	* mail/smtpmail.el (smtpmail-via-smtp): Only negotiate starttls on
-	streams that were opened using starttls.
+	* mail/smtpmail.el (smtpmail-via-smtp): Only negotiate STARTTLS on
+	streams that were opened using STARTTLS.
 
 2002-09-28  Paul Reilly  <pmr@pajato.com>
 
diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11
index c80091e4657..38a5530fbfc 100644
--- a/lisp/ChangeLog.11
+++ b/lisp/ChangeLog.11
@@ -6728,11 +6728,11 @@
 2004-05-28  Simon Josefsson  <jas@extundo.com>
 
 	* mail/smtpmail.el (smtpmail-open-stream):
-	Bind starttls-extra-arguments too, if starttls.el uses GNUTLS.
+	Bind starttls-extra-arguments too, if starttls.el uses GnuTLS.
 
 2004-05-26  Simon Josefsson  <jas@extundo.com>
 
-	* starttls.el: Merge with my GNUTLS based starttls.el.
+	* starttls.el: Merge with my GnuTLS based starttls.el.
 	(starttls-gnutls-program, starttls-use-gnutls)
 	(starttls-extra-arguments, starttls-process-connection-type)
 	(starttls-connect, starttls-failure, starttls-success): New variables.
diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13
index bfe0f4a7a51..12eadc6aadf 100644
--- a/lisp/ChangeLog.13
+++ b/lisp/ChangeLog.13
@@ -4275,7 +4275,7 @@
 	stops with an error and Emacs does not compile with those things in.
 	Besides, declare-function is not defined in XEmacs.
 
-	* ediff-util.el (eqiff-quit): Autoraise minibuffer.
+	* ediff-util.el (ediff-quit): Autoraise minibuffer.
 
 	* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): Make it a defun.
 
@@ -7393,7 +7393,7 @@
 
 	* help-mode.el (help-mode): Set view-exit-action to bury the
 	buffer instead of fiddling with windows.  Simplify code.
-	(help-mode-finish): When help-window eqs t set it to the selected
+	(help-mode-finish): When help-window equals t set it to the selected
 	window and have with-help-window set up view-return-to-alist.
 	(help-buffer): Add autoload cookie.
 
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index e9bd06afae8..82f3417ef82 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -6065,7 +6065,7 @@
 
 2010-10-03  Teodor Zlatanov  <tzz@lifelogs.com>
 
-	* net/gnutls.el: Improve docs.  Remove starttls and ssl emulation.
+	* net/gnutls.el: Improve docs.  Remove STARTTLS and SSL emulation.
 	Provide only `open-gnutls-stream' (formerly `open-ssl-stream') and
 	`gnutls-negotiate' (formerly `starttls-negotiate').
 	Remove trivial wrapper `starttls-open-stream'.
@@ -6217,7 +6217,7 @@
 
 2010-10-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-	* net/tls.el (tls-starttls-switches): Give up on using starttls with
+	* net/tls.el (tls-starttls-switches): Give up on using STARTTLS with
 	gnutls-cli.
 	(tls-program): Add --insecure to be consistent with the defaults from
 	openssl s_client.  Now all three commands are insecure.
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index a59f1abb2a2..df2f5cce23f 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -1012,7 +1012,7 @@
 	bindings for quail-execute-non-quail-command deleted.
 	(quail-conversion-keymap): Likewise.  Add key bindings for
 	quail-self-insert-command.
-	(quail-delete-overlays): Chekc overlay-start for overlays before
+	(quail-delete-overlays): Check overlay-start for overlays before
 	deleting them.
 	(quail-mode): This function deleted.
 	(quail-inactivate, quail-activate): New functions.
@@ -19394,7 +19394,7 @@
 	* loadup.el: Load language/english and language/tibetan.
 
 	* mule-cmds.el: Prefix for Mule related commands is changed.
-	(view-hello-file): Allways does correct decoding of HELLO file.
+	(view-hello-file): Always does correct decoding of HELLO file.
 
 	* mule-conf.el: Change descriptions for Arabic, Indian, and
 	Vietnamese character sets.  Define Tibetan character sets.
diff --git a/lisp/emacs-lisp/avl-tree.el b/lisp/emacs-lisp/avl-tree.el
index 9ecd4e12020..bc1efc118ef 100644
--- a/lisp/emacs-lisp/avl-tree.el
+++ b/lisp/emacs-lisp/avl-tree.el
@@ -74,7 +74,7 @@
   cmpfun)
 
 (defmacro avl-tree--root (tree)
-  ;; Return the root node for an avl-tree.  INTERNAL USE ONLY.
+  ;; Return the root node for an AVL tree.  INTERNAL USE ONLY.
   `(avl-tree--node-left (avl-tree--dummyroot ,tree)))
 
 (defsetf avl-tree--root (tree) (node)
@@ -372,7 +372,7 @@ itself."
 
 ;;; INTERNAL USE ONLY
 (defun avl-tree--do-copy (root)
-  "Copy the avl tree with ROOT as root. Highly recursive."
+  "Copy the AVL tree with ROOT as root.  Highly recursive."
   (if (null root)
       nil
     (avl-tree--node-create
@@ -401,7 +401,7 @@ itself."
   ;; front of the STACK, until a leaf is reached.
   (let ((node (car (avl-tree--stack-store stack)))
 	(dir (if (avl-tree--stack-reverse stack) 1 0)))
-    (when node  ; check for emtpy stack
+    (when node  ; check for empty stack
       (while (setq node (avl-tree--node-branch node dir))
 	(push node (avl-tree--stack-store stack))))))
 
@@ -411,21 +411,21 @@ itself."
 
 ;; define public alias for constructors so that we can set docstring
 (defalias 'avl-tree-create 'avl-tree--create
-  "Create an empty avl tree.
+  "Create an empty AVL tree.
 COMPARE-FUNCTION is a function which takes two arguments, A and B,
 and returns non-nil if A is less than B, and nil otherwise.")
 
 (defalias 'avl-tree-compare-function 'avl-tree--cmpfun
-  "Return the comparison function for the avl tree TREE.
+  "Return the comparison function for the AVL tree TREE.
 
 \(fn TREE)")
 
 (defun avl-tree-empty (tree)
-  "Return t if avl tree TREE is emtpy, otherwise return nil."
+  "Return t if AVL tree TREE is empty, otherwise return nil."
   (null (avl-tree--root tree)))
 
 (defun avl-tree-enter (tree data &optional updatefun)
-  "Insert DATA into the avl tree TREE.
+  "Insert DATA into the AVL tree TREE.
 
 If an element that matches DATA (according to the tree's
 comparison function, see `avl-tree-create') already exists in
@@ -433,8 +433,8 @@ TREE, it will be replaced by DATA by default.
 
 If UPDATEFUN is supplied and an element matching DATA already
 exists in TREE, UPDATEFUN is called with two arguments: DATA, and
-the matching element. Its return value replaces the existing
-element. This value *must* itself match DATA (and hence the
+the matching element.  Its return value replaces the existing
+element.  This value *must* itself match DATA (and hence the
 pre-existing data), or an error will occur.
 
 Returns the new data."
@@ -443,7 +443,7 @@ Returns the new data."
 			   0 data updatefun)))
 
 (defun avl-tree-delete (tree data &optional test nilflag)
-  "Delete the element matching DATA from the avl tree TREE.
+  "Delete the element matching DATA from the AVL tree TREE.
 Matching uses the comparison function previously specified in
 `avl-tree-create' when TREE was created.
 
@@ -456,7 +456,7 @@ distinguished from the case of a successfully deleted null
 element.
 
 If supplied, TEST specifies a test that a matching element must
-pass before it is deleted. If a matching element is found, it is
+pass before it is deleted.  If a matching element is found, it is
 passed as an argument to TEST, and is deleted only if the return
 value is non-nil."
   (cdr (avl-tree--do-delete (avl-tree--cmpfun tree)
@@ -465,14 +465,14 @@ value is non-nil."
 
 
 (defun avl-tree-member (tree data &optional nilflag)
-  "Return the element in the avl tree TREE which matches DATA.
+  "Return the element in the AVL tree TREE which matches DATA.
 Matching uses the comparison function previously specified in
 `avl-tree-create' when TREE was created.
 
 If there is no such element in the tree, nil is
-returned. Optional argument NILFLAG specifies a value to return
-instead of nil in this case. This allows non-existent elements to
-be distinguished from a null element. (See also
+returned.  Optional argument NILFLAG specifies a value to return
+instead of nil in this case.  This allows non-existent elements to
+be distinguished from a null element.  (See also
 `avl-tree-member-p', which does this for you.)"
   (let ((node (avl-tree--root tree))
 	(compare-function (avl-tree--cmpfun tree)))
@@ -488,15 +488,15 @@ be distinguished from a null element. (See also
 
 
 (defun avl-tree-member-p (tree data)
-  "Return t if an element matching DATA exists in the avl tree TREE,
-otherwise return nil. Matching uses the comparison function
+  "Return t if an element matching DATA exists in the AVL tree TREE.
+Otherwise return nil.  Matching uses the comparison function
 previously specified in `avl-tree-create' when TREE was created."
   (let ((flag '(nil)))
     (not (eq (avl-tree-member tree data flag) flag))))
 
 
 (defun avl-tree-map (__map-function__ tree &optional reverse)
-  "Modify all elements in the avl tree TREE by applying FUNCTION.
+  "Modify all elements in the AVL tree TREE by applying FUNCTION.
 
 Each element is replaced by the return value of FUNCTION applied
 to that element.
@@ -512,7 +512,7 @@ descending order if REVERSE is non-nil."
 
 
 (defun avl-tree-mapc (__map-function__ tree &optional reverse)
-  "Apply FUNCTION to all elements in avl tree TREE,
+  "Apply FUNCTION to all elements in AVL tree TREE,
 for side-effect only.
 
 FUNCTION is applied to the elements in ascending order, or
@@ -526,7 +526,7 @@ descending order if REVERSE is non-nil."
 
 (defun avl-tree-mapf
   (__map-function__ combinator tree &optional reverse)
-  "Apply FUNCTION to all elements in avl tree TREE,
+  "Apply FUNCTION to all elements in AVL tree TREE,
 and combine the results using COMBINATOR.
 
 The FUNCTION is applied and the results are combined in ascending
@@ -545,7 +545,7 @@ order, or descending order if REVERSE is non-nil."
 
 
 (defun avl-tree-mapcar (__map-function__ tree &optional reverse)
-  "Apply FUNCTION to all elements in avl tree TREE,
+  "Apply FUNCTION to all elements in AVL tree TREE,
 and make a list of the results.
 
 The FUNCTION is applied and the list constructed in ascending
@@ -578,7 +578,7 @@ is more efficient."
       (avl-tree--node-data node))))
 
 (defun avl-tree-copy (tree)
-  "Return a copy of the avl tree TREE."
+  "Return a copy of the AVL tree TREE."
   (let ((new-tree (avl-tree-create (avl-tree--cmpfun tree))))
     (setf (avl-tree--root new-tree) (avl-tree--do-copy (avl-tree--root tree)))
     new-tree))
@@ -600,7 +600,7 @@ is more efficient."
     treesize))
 
 (defun avl-tree-clear (tree)
-  "Clear the avl tree TREE."
+  "Clear the AVL tree TREE."
   (setf (avl-tree--root tree) nil))
 
 
@@ -617,8 +617,8 @@ calling `avl-tree-stack-pop' will give unpredictable results).
 
 Operations on these objects are significantly more efficient than
 constructing a real stack with `avl-tree-flatten' and using
-standard stack functions. As such, they can be useful in
-implementing efficient algorithms of AVL trees. However, in cases
+standard stack functions.  As such, they can be useful in
+implementing efficient algorithms of AVL trees.  However, in cases
 where mapping functions `avl-tree-mapc', `avl-tree-mapcar' or
 `avl-tree-mapf' would be sufficient, it is better to use one of
 those instead."
@@ -629,11 +629,11 @@ those instead."
 
 (defun avl-tree-stack-pop (avl-tree-stack &optional nilflag)
   "Pop the first element from AVL-TREE-STACK.
-\(See also `avl-tree-stack'\).
+\(See also `avl-tree-stack').
 
-Returns nil if the stack is empty, or NILFLAG if specified. (The
-latter allows an empty stack to be distinguished from a null
-element stored in the AVL tree.)"
+Returns nil if the stack is empty, or NILFLAG if specified.
+\(The latter allows an empty stack to be distinguished from
+a null element stored in the AVL tree.)"
   (let (node next)
     (if (not (setq node (pop (avl-tree--stack-store avl-tree-stack))))
 	nilflag
@@ -650,9 +650,9 @@ element stored in the AVL tree.)"
   "Return the first element of AVL-TREE-STACK, without removing it
 from the stack.
 
-Returns nil if the stack is empty, or NILFLAG if specified. (The
-latter allows an empty stack to be distinguished from a null
-element stored in the AVL tree.)"
+Returns nil if the stack is empty, or NILFLAG if specified.
+\(The latter allows an empty stack to be distinguished from
+a null element stored in the AVL tree.)"
   (or (car (avl-tree--stack-store avl-tree-stack))
       nilflag))
 
diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el
index c6e157be776..22db9ddba38 100644
--- a/lisp/emacs-lisp/cconv.el
+++ b/lisp/emacs-lisp/cconv.el
@@ -507,7 +507,7 @@ places where they originally did not directly appear."
   (defalias 'byte-compile-not-lexical-var-p 'boundp))
 
 (defun cconv--analyse-use (vardata form varkind)
-  "Analyse the use of a variable.
+  "Analyze the use of a variable.
 VARDATA should be (BINDER READ MUTATED CAPTURED CALLED).
 VARKIND is the name of the kind of variable.
 FORM is the parent form that binds this var."
@@ -559,7 +559,7 @@ FORM is the parent form that binds this var."
        (t (let ((varstruct (list arg nil nil nil nil)))
             (push (cons (list arg) (cdr varstruct)) newvars)
             (push varstruct newenv)))))
-    (dolist (form body)                   ;Analyse body forms.
+    (dolist (form body)                   ;Analyze body forms.
       (cconv-analyse-form form newenv))
     ;; Summarize resulting data about arguments.
     (dolist (vardata newvars)
@@ -612,7 +612,7 @@ and updates the data stored in ENV."
              (push (cons binder (cdr varstruct)) newvars)
              (push varstruct env))))
 
-       (dolist (form body-forms)          ; Analyse body forms.
+       (dolist (form body-forms)          ; Analyze body forms.
          (cconv-analyse-form form env))
 
        (dolist (vardata newvars)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index de5f5e0b7c4..39f43bd8e3b 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -2869,7 +2869,7 @@
 	we're using an encrypted connection.
 
 	* proto-stream.el: Alter the interface functions to also return the
-	actual stream type used: network or tls.
+	actual stream type used: network or TLS.
 
 2011-01-25  Julien Danjou  <julien@danjou.info>
 
@@ -3598,7 +3598,7 @@
 
 2010-11-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-	* proto-stream.el (open-protocol-stream): All starttls connections are
+	* proto-stream.el (open-protocol-stream): All STARTTLS connections are
 	handled by the network handler.
 
 2010-11-30  Julien Danjou  <julien@danjou.info>
@@ -3687,9 +3687,9 @@
 	(nnimap-open-connection): Be more backwards-compatible.
 
 	* proto-stream.el (proto-stream-always-use-starttls): New variable.
-	(proto-stream-open-starttls): De-duplicate the starttls code.
+	(proto-stream-open-starttls): De-duplicate the STARTTLS code.
 	(proto-stream-open-starttls): Folded back into the main function.
-	(proto-stream-open-network): Fix typo in the gnutls path.
+	(proto-stream-open-network): Fix typo in the GnuTLS path.
 	(proto-stream-command): Refactor out.
 
 	* nntp.el (nntp-open-connection): Fix the STARTTLS command syntax.
@@ -3701,7 +3701,7 @@
 
 	* proto-stream.el (proto-stream-open-tls): Delete output from openssl
 	if we're using tls.el.
-	(proto-stream-open-network): If we don't have gnutls-cli or gnutls
+	(proto-stream-open-network): If we don't have gnutls-cli or GnuTLS
 	built in, then don't try to establish a STARTTLS connection.
 
 	* nntp.el (nntp-open-connection): Switch on STARTTLS on supported
@@ -5101,7 +5101,7 @@
 	* gnus-sum.el (gnus-summary-set-local-parameters): Ignore the `active'
 	non-variable, too.
 
-	* nnimap.el (nnimap-open-connection): Use gnutls STARTTLS, if
+	* nnimap.el (nnimap-open-connection): Use GnuTLS STARTTLS, if
 	available.
 	(nnimap-update-info): Rely more on the current active than the param
 	active to avoid marking articles as read too much.
@@ -5150,8 +5150,8 @@
 	group is the "last", so that the backends like nnfolder actually save
 	their folders.
 
-	* nnimap.el (nnimap-open-connection): If we have gnutls loaded, then
-	try to use that for the tls stream.
+	* nnimap.el (nnimap-open-connection): If we have GnuTLS loaded, then
+	try to use that for the TLS stream.
 	(nnimap-retrieve-group-data-early): Rework the marks code to heed
 	UIDVALIDITY and find out which groups are read-only and not.
 	(nnimap-get-flags): Use the same marks parsing code as the rest of
@@ -6370,8 +6370,8 @@
 	* gnus-int.el (gnus-request-update-info): Protect against backends not
 	having the function.
 
-	* nnimap.el (nnimap-stream): Mention starttls.
-	(nnimap-open-connection): Add starttls support.
+	* nnimap.el (nnimap-stream): Mention STARTTLS.
+	(nnimap-open-connection): Add STARTTLS support.
 
 2010-09-23  Andrew Cohen  <cohen@andy.bu.edu>
 
@@ -18651,7 +18651,7 @@
 2004-09-28  Kevin Greiner  <kgreiner@compsol.cc>
 
 	* gnus-agent.el (gnus-agent-synchronize-group-flags): Replace
-	gnus-requst-update-info with explicit code to sync the in-memory
+	gnus-request-update-info with explicit code to sync the in-memory
 	info read flags with the marks being sync'd to the backend.
 
 	* gnus-util.el (gnus-pp): Add optional stream to match pp API.
@@ -19765,7 +19765,7 @@
 
 2004-05-26  Simon Josefsson  <jas@extundo.com>
 
-	* starttls.el: Merge with my GNUTLS based starttls.el.
+	* starttls.el: Merge with my GnuTLS based starttls.el.
 	(starttls-gnutls-program, starttls-use-gnutls)
 	(starttls-extra-arguments, starttls-process-connection-type)
 	(starttls-connect, starttls-failure, starttls-success):
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index e519ce340c2..952aae28b17 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -1396,7 +1396,7 @@
 	* tls.el (tls-process-connection-type): Doc fix.
 
 	* imap.el (imap-starttls-open): Rewrite, should support both old
-	starttls.el and new starttls.el that uses GNUTLS.
+	starttls.el and new starttls.el that uses GnuTLS.
 
 2003-09-18  Katsumi Yamaoka  <yamaoka@jpl.org>
 
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index 9cb071b185d..18471782f2c 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -108,7 +108,7 @@ trust and key files, and priority string."
            trustfiles crlfiles keylist min-prime-bits
            verify-flags verify-error verify-hostname-error
            &allow-other-keys)
-  "Negotiate a SSL/TLS connection.  Returns proc. Signals gnutls-error.
+  "Negotiate a SSL/TLS connection.  Returns proc.  Signals gnutls-error.
 
 Note arguments are passed CL style, :type TYPE instead of just TYPE.
 
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 3aa7bd658e4..3de7192ae99 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-25  Juanma Barranquero  <lekktu@gmail.com>
+
+	* configure.bat: Fix typos.
+
 2011-11-25  Eli Zaretskii  <eliz@gnu.org>
 
 	* INSTALL: Elaborate on debugging fatal errors.
diff --git a/nt/INSTALL b/nt/INSTALL
index 7dc027f06f4..9947cd86a34 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -606,7 +606,7 @@
   Emacs on Windows uses more than one thread.  When Emacs aborts due
   to a fatal error, the current thread may not be the application
   thread running Emacs code.  Therefore, to produce a meaningful
-  backtrace from a debugger, you need to iunstruct it to show the
+  backtrace from a debugger, you need to instruct it to show the
   backtrace for every thread.  With GDB, you do it like this:
 
    (gdb) thread apply all backtrace
diff --git a/nt/configure.bat b/nt/configure.bat
index 45d966fc34d..c503900274e 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -155,7 +155,7 @@ echo.   --without-jpeg          do not use JPEG library even if it is installed
 echo.   --without-gif           do not use GIF library even if it is installed

 echo.   --without-tiff          do not use TIFF library even if it is installed

 echo.   --without-xpm           do not use XPM library even if it is installed

-echo.   --without-gnutls        do not use GNUTLS library even if it is installed

+echo.   --without-gnutls        do not use GnuTLS library even if it is installed

 echo.   --with-svg              use the RSVG library (experimental)

 echo.   --distfiles             path to files for make dist, e.g. libXpm.dll

 if "%use_extensions%" == "0" goto end

@@ -563,7 +563,7 @@ set HAVE_GNUTLS=
 goto :tlsDone

 

 :haveTls

-echo ...GNUTLS header available, building with GNUTLS support.

+echo ...GnuTLS header available, building with GnuTLS support.

 set HAVE_GNUTLS=1

 

 :tlsDone

diff --git a/src/ChangeLog b/src/ChangeLog
index 1614b02786b..fe7080f9c02 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -7730,7 +7730,7 @@
 	* keyboard.c (Fcommand_execute, Fsuspend_emacs, safe_run_hooks_1):
 	Use Frun_hooks.
 	(command_loop_1): Use Frun_hooks.  Call safe_run_hooks
-	unconditionnaly since it does the check itself.
+	unconditionally since it does the check itself.
 
 2011-03-23  Paul Eggert  <eggert@cs.ucla.edu>
 
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 6acc09c2164..4c0590aa94b 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -4346,7 +4346,7 @@
 
 	* textprop.c (Fremove_list_of_text_properties):
 	Ensure modify_region is called only when buffer is modified and that
-	signal_after_change is allways called in that case.
+	signal_after_change is always called in that case.
 
 	* print.c (PRINTFINISH): Call signal_after_change.
 
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index cb8b413a514..7c027f1caec 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -966,7 +966,7 @@
 	($(BLD)/editfns.$(O)): Depend on ../lib/strftime.h.
 	($(BLD)/print.$(O)): Depend on ../lib/ftoastr.h and ../lib/intprops.h.
 
-	* deps.mk: Update for recent changes: gnutls support, gnulib
+	* deps.mk: Update for recent changes: GnuTLS support, gnulib
 	imports, addition of globals.h.
 
 	* makefile.w32-in ($(BLD)/sysdep.$(O)): Depend on
@@ -3268,7 +3268,7 @@
 2010-10-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnutls.c (emacs_gnutls_write): If we're trying to write before
-	gnutls is ready, return EAGAIN as the errno.
+	GnuTLS is ready, return EAGAIN as the errno.
 
 2010-10-10  Dan Nicolaescu  <dann@ics.uci.edu>
 
@@ -3585,12 +3585,12 @@
 	* process.c (make_process): Set the gnutls_p field to zero by
 	default.
 	(read_process_output): Always call the gnutls_read function if the
-	stream is a gnutls stream.
+	stream is a GnuTLS stream.
 	(send_process): Ditto for writes.
 
 	* gnutls.c (emacs_gnutls_write, emacs_gnutls_read): Refuse to read
 	or write anything until the state is GNUTLS_STAGE_READY.
-	(Fgnutls_boot): Mark the stream as being a gnutls stream.
+	(Fgnutls_boot): Mark the stream as being a GnuTLS stream.
 
 2010-09-29  Eli Zaretskii  <eliz@gnu.org>
 
@@ -27366,7 +27366,7 @@
 
 	* ccl.c: Include "character.h".
 	(Qccl, Qcclp): New variables.
-	(CCL_WRITE_CHAR): Alway treat the arg CH as a character even if
+	(CCL_WRITE_CHAR): Always treat the arg CH as a character even if
 	it's less than 256.
 	(CCL_WRITE_MULTIBYTE_CHAR): Delete.
 	(CCL_WRITE_STRING, CCL_READ_CHAR): Adjust for the change of SRC
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6
index af97d0de7b4..74141f6813a 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -718,7 +718,7 @@
 	(init_ntproc) [HAVE_SOCKETS]: Only load winsock library on startup
 	if PRELOAD_WINSOCK is set in environment (or registry).
 
-	* ntproc.c (Fwin32_has_winsock,	Fwin32_unload_winsock)
+	* ntproc.c (Fwin32_has_winsock, Fwin32_unload_winsock)
 	[HAVE_SOCKETS]: New functions.
 	(syms_of_ntproc) [HAVE_SOCKETS]: defsubr them.
 
@@ -845,7 +845,7 @@
 	(timer_id): Renamed to mouse_button_timer.
 	(saved_mouse_move_msg, mouse_move_timer): New variables.
 	(win_msg_worker): Delete WM_TIMER code.
-	(win32_wnd_proc): Handle WM_TIMER events here. Use separate timers
+	(win32_wnd_proc): Handle WM_TIMER events here.  Use separate timers
 	for mouse down and mouse move (including scroll bar drag) events.
 	Add new handling code for WM_VSCROLL and WM_MOUSEMOVE events.
 	Only filter WM_MOUSEMOVE events when a button is held down.
@@ -1100,17 +1100,17 @@
 
 	(nt_sleep): Renamed to sys_sleep.
 
-	(rename): Renamed to sys_rename. Always rename to a temporary name
+	(rename): Renamed to sys_rename.  Always rename to a temporary name
 	first on Windows 95.  Unlink new name first if necessary.
 
 	(dir_finding): Variable deleted.
 	(dir_is_fat, dir_pathname): New variables.
 
-	(openddir): Fail if dir_find_handle is in use. Save directory name
+	(openddir): Fail if dir_find_handle is in use.  Save directory name
 	in dir_pathname, and set dir_is_fat appropriately.
 	(closedir, readdir): Use dir_find_handle in place of dir_finding.
 	(readdir): Copy directory name from dir_pathname on first
-	call. Use IS_DIRECTORY_SEP instead of IS_ANY_SEP.  Force filename
+	call.  Use IS_DIRECTORY_SEP instead of IS_ANY_SEP.  Force filename
 	to be lower case on FAT volumes.
 
 	(getpwuid): Move struct passwd initialization to init_user_info,
@@ -1141,7 +1141,7 @@
 	(get_emacs_configuration): Detect Windows flavor (Windows 95 or
 	NT) at run-time.  Change OS name for Windows 95 to be "win95".
 
-	(fd_info): New variable. Array of extra info for file descriptors
+	(fd_info): New variable.  Array of extra info for file descriptors
 	needed for pipe/socket support.
 
 	(utc_base_ft, utc_base, init): New internal variables used for
@@ -1206,7 +1206,7 @@
 	* ntinevt.c (win32_kdb_patch_key): Initialize isdead.
 	(key_event) [HAVE_NTGUI]: Use Windows key code.
 
-	* ntproc.c: Include config.h after CRT headers. Include fcntl.h.
+	* ntproc.c: Include config.h after CRT headers.  Include fcntl.h.
 	(child_process, MAX_CHILDREN, CHILD_ACTIVE): Moved to nt.h.
 	(DebugPrint): New macro.
 	(new_child): Create input event structures for child processes.
@@ -2580,7 +2580,7 @@
 	(win32_fill_rect, dumpglyphs, do_line_dance, x_draw_box):
 	Use Get/ReleaseFrameDC.
 	(win32_update_begin): Regenerate palette if required.
-	(w32_read_socket): Use FALSE. Handle WM_PALETTECHANGED.
+	(w32_read_socket): Use FALSE.  Handle WM_PALETTECHANGED.
 	(win32_term_init): Use GetDC directly.
 	Enable palette in display structure.
 	Predefine white and black.
@@ -4501,7 +4501,7 @@
 	* msdos.c (putchar): Call internal_flush instead of _flsbuf.
 	(DO_TERMSCRIPT): New macro to support open-termscript.
 	(internal_flush): Corrected handling of flush in middle of
-	escape sequences. Handle screen width > 127.
+	escape sequences.  Handle screen width > 127.
 	(flush_escape): New function for use by internal_flush.
 	(sys_select): New MS-DOS specific version with us timing.
 	(EMACSCOLORS): New environment variable.