Merge branch 'maint'

doc/org.texi

@@ -6925,7 +6925,7 @@ countdown timer.  With a prefix argument, first reset the relative timer to
 @orgcmd{M-@key{RET},org-insert-heading}
 Once the timer list is started, you can also use @kbd{M-@key{RET}} to insert
 new timer items.
-@orgcmd{C-c C-x \\,org-timer-pause-or-continue}
+@orgcmd{C-c C-x @comma{},org-timer-pause-or-continue}
 Pause the timer, or continue it if it is already paused.
 @orgcmd{C-c C-x _,org-timer-stop}
 Stop the timer.  After this, you can only start a new timer, not continue the

lisp/org.el

@@ -14875,7 +14875,7 @@ If DATA is nil or the empty string, any tags will be removed."
 	(delete-region (match-beginning 1) (match-end 1))))))
 
 (defun org-align-all-tags ()
-  "Align the tags i all headings."
+  "Align the tags in all headings."
   (interactive)
   (save-excursion
     (or (ignore-errors (org-back-to-heading t))