Merge branch 'maint'

lisp/org-agenda.el

@@ -9342,7 +9342,7 @@ the same tree node, and the headline of the tree node in the Org file."
        (save-window-excursion
 	 (org-agenda-change-all-lines newhead hdmarker 'fixface just-one))
        (when (bound-and-true-p org-clock-out-when-done)
-      	 (string-match (concat "^" (regexp-opt org-done-keywords-for-agenda))
+	 (string-match (concat "^" (regexp-opt org-done-keywords-for-agenda))
 		       newhead)
 	 (org-agenda-unmark-clocking-task))
        (org-move-to-column col)

lisp/org.el

@@ -4189,7 +4189,7 @@ After a match, the following groups carry important information:
   "Variable associated with STARTUP options for Org.
 Each element is a list of three items: the startup options (as written
 in the #+STARTUP line), the corresponding variable, and the value to set
-this variable to if the option is found.  An optional forth element PUSH
+this variable to if the option is found.  An optional fourth element PUSH
 means to push this value onto the list in the variable.")
 
 (defcustom org-group-tags t