Merge branch 'maint'

Conflicts:
	doc/org.texi

doc/org.texi

@@ -1428,7 +1428,7 @@ level).
 Move subtree down (swap with next subtree of same level).
 @orgcmd{M-h,org-mark-element}
 Mark the element at point.  Hitting repeatedly will mark subsequent elements
-of the one just marked.  E.g. hitting @key{M-h} on a paragraph will mark it,
+of the one just marked.  E.g., hitting @key{M-h} on a paragraph will mark it,
 hitting @key{M-h} immediately again will mark the next one.
 @orgcmd{C-c @@,org-mark-subtree}
 Mark the subtree at point.  Hitting repeatedly will mark subsequent subtrees
@@ -12081,7 +12081,7 @@ node which is known to TaskJuggler, such as @samp{limits}, @samp{vacation},
 @samp{shift}, @samp{booking}, @samp{efficiency}, @samp{journalentry},
 @samp{rate} for resources or @samp{account}, @samp{start}, @samp{note},
 @samp{duration}, @samp{end}, @samp{journalentry}, @samp{milestone},
-@samp{reference}, @samp{responsible}, @samp{scheduling}, etc for tasks.
+@samp{reference}, @samp{responsible}, @samp{scheduling}, etc.@: for tasks.
 
 @subsection Dependencies
 

lisp/org-element.el

@@ -3994,7 +3994,7 @@ containing the secondary string.  It is used to set correctly
   (data types fun &optional info first-match no-recursion with-affiliated)
   "Map a function on selected elements or objects.
 
-DATA is an Org buffer parse tree, as returned by, i.e,
+DATA is an Org buffer parse tree, as returned by, i.e.,
 `org-element-parse-buffer'.  TYPES is a symbol or list of symbols
 of elements or objects types (see `org-element-all-elements' and
 `org-element-all-objects' for a complete list of types).  FUN is

lisp/org.el

@@ -1038,7 +1038,7 @@ nil, don't do anything special at the beginning of the buffer."
 (defcustom org-cycle-level-after-item/entry-creation t
   "Non-nil means cycle entry level or item indentation in new empty entries.
 
-When the cursor is at the end of an empty headline, i.e with only stars
+When the cursor is at the end of an empty headline, i.e., with only stars
 and maybe a TODO keyword, TAB will then switch the entry to become a child,
 and then all possible ancestor states, before returning to the original state.
 This makes data entry extremely fast:  M-RET to create a new headline,