Merge from emacs-23 branch, up to 2010-05-20T22:16:19Z!juri@jurta.org.

[gnu-emacs] / lisp / erc / erc-xdcc.el

diff --git a/lisp/erc/erc-xdcc.el b/lisp/erc/erc-xdcc.el
index 0f3d742a3666d91b849970ee7008a7cae8be338b..36bb5f4f12774a1228fef0b5a28befc2959da1a2 100644 (file)
--- a/lisp/erc/erc-xdcc.el
+++ b/lisp/erc/erc-xdcc.el
@@ -1,6 +1,6 @@
 ;;; erc-xdcc.el --- XDCC file-server support for ERC
 
-;; Copyright (C) 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm, processes
@@ -56,7 +56,7 @@ Your friends should issue \"/ctcp yournick XDCC list\" to see this."
      (erc-current-nick) " XDCC send #\" to get a particular file number."))
   "*Help text sent in response to XDCC help command.
 A list of messages, each consisting of strings and expressions, expressions
-being evaluated and should return stings."
+being evaluated and should return strings."
   :group 'erc-dcc
   :type '(repeat (repeat :tag "Message" (choice string sexp))))
 
@@ -136,4 +136,3 @@ being evaluated and should return stings."
 ;; tab-width: 8
 ;; End:
 
-;; arch-tag: a13b62fe-2399-4562-af4e-f18a8dd4b9c8