Merge from trunk

[gnu-emacs] / lisp / net / ntlm.el

diff --git a/lisp/net/ntlm.el b/lisp/net/ntlm.el
index 9af148e8faac85164fd322c7d0e2837fc3426e4e..9626aef558d7d8a3c23c40329aba2495cf30d305 100644 (file)
--- a/lisp/net/ntlm.el
+++ b/lisp/net/ntlm.el
@@ -1,6 +1,6 @@
 ;;; ntlm.el --- NTLM (NT LanManager) authentication support
 
-;; Copyright (C) 2001, 2007-2011  Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2007-2012  Free Software Foundation, Inc.
 
 ;; Author: Taro Kawagishi <tarok@transpulse.org>
 ;; Keywords: NTLM, SASL
@@ -440,7 +440,7 @@ length of STR is LEN."
 
 (defun ntlm-smb-dohash (in key forw)
   "Return the hash value for a string IN and a string KEY.
-Length of IN and KEY are 64.  FORW non nill means forward, nil means
+Length of IN and KEY are 64.  FORW non-nil means forward, nil means
 backward."
   (let (pk1                            ;string of length 56
        c                               ;string of length 28