Merge branch 'maint'

lisp/org-agenda.el

@@ -765,7 +765,7 @@ to make his option also apply to the tags-todo list."
 	  (integer :tag "Ignore if N or more days in past(-) or future(+).")))
 
 (defcustom org-agenda-todo-ignore-deadlines nil
-  "Non-nil means ignore some deadlined TODO items when making TODO list.
+  "Non-nil means ignore some deadline TODO items when making TODO list.
 There are different motivations for using different values, please think
 carefully when configuring this variable.
 

lisp/org-irc.el

@@ -105,7 +105,7 @@ attributes that are found."
    ((eq major-mode 'erc-mode)
     (org-irc-erc-store-link))))
 
-(defun org-irc-elipsify-description (string &optional after)
+(defun org-irc-ellipsify-description (string &optional after)
   "Remove unnecessary white space from STRING and add ellipses if necessary.
 Strip starting and ending white space from STRING and replace any
 chars that the value AFTER with '...'"
@@ -158,7 +158,7 @@ the session itself."
 	    (progn
 	      (org-store-link-props
 	       :type "file"
-	       :description (concat "'" (org-irc-elipsify-description
+	       :description (concat "'" (org-irc-ellipsify-description
 					 (cadr parsed-line) 20)
 				    "' from an IRC conversation")
 	       :link (concat "file:" (car parsed-line) "::"