Merge branch 'maint'

6 files changed, 17 insertions, 17 deletions

diff --git a/doc/org-manual.org b/doc/org-manual.org
index 95f2d60..f46064b 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -7987,14 +7987,14 @@ mentioning.
 
   Inheritance works the same way for both =ID= and =DIR= property.  If
   both properties are defined on the same headline then =DIR= takes
-  precedance.  This is also true if inheritance is enabled.  If =DIR=
+  precedence.  This is also true if inheritance is enabled.  If =DIR=
   is inherited from a parent node in the outline, that property still
   takes precedence over an =ID= property defined on the node itself.
 
 - ~org-attach-method~ ::
   #+vindex: org-attach-method
   When attaching files using the dispatcher {{{kbd(C-c C-a)}}} it
-  defaults to copying files.  The behaviour can be changed by
+  defaults to copying files.  The behavior can be changed by
   customizing ~org-attach-method~.  Options are Copy, Move/Rename,
   Hard link or Symbolic link.
 
@@ -20102,7 +20102,7 @@ Before updating a dynamic block, Org removes content between the
 previous content of the dynamic block becomes erased from the buffer
 and appended to the plist under ~:content~.
 
-The syntax for naming a writer function with a dynamic block labelled
+The syntax for naming a writer function with a dynamic block labeled
 =myblock= is: ~org-dblock-write:myblock~.
 
 The following is an example of a dynamic block and a block writer function
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 2bdaf7c..2d3a242 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -123,7 +123,7 @@ the message to 30 characters in order to build the description of the
 link.  This behavior was considered as too surprising.  As
 a consequence, Org no longer truncates subjects.
 
-You can get the old behaviour back with the following:
+You can get the old behavior back with the following:
 
 : (setq org-email-link-description-format "Email %c: %.30s")
 
@@ -201,7 +201,7 @@ From now on inheritance requires no extra property and will adhere to
 customized to always be activated or never be activated in
 ~org-attach-use-inheritance~.
 
-The ATTACH_DIR property is deprecated in favour of the shorter
+The ATTACH_DIR property is deprecated in favor of the shorter
 property DIR.  Links to folders inside the DIR property can now be
 declared as relative links.  This is not enabled by default, but can
 be set in ~org-attach-dir-relative~.
@@ -209,7 +209,7 @@ be set in ~org-attach-dir-relative~.
 When adding new attachment to the outline node the preferred way of
 doing so can be customized.  Take a look at
 ~org-attach-preferred-new-method~.  It defaults to using ID since that
-was the behaviour before this change.
+was the behavior before this change.
 
 If both DIR and ID properties are set on the same node, DIR has
 precedence and will be used.
@@ -342,7 +342,7 @@ matches the same structures than 'latex but it calls
 org-src-font-lock-fontify-block instead, thus bringing about full
 LaTeX font locking.
 
-*** ~org-clone-subtree-with-time-shift~ learnt to shift backward in time
+*** ~org-clone-subtree-with-time-shift~ learned to shift backward in time
 
 =<C-c C-x c>= (~org-clone-subtree-with-time-shift~) now takes a
 negative value as a valid repeater to shift time stamps in backward
@@ -366,7 +366,7 @@ parameters in ~sql-connection-alist~.
 The builtin "latex" exporters now accept and use a =:scale= attribute,
 which scales an image by a given factor.
 
-This attribute is wrapped adound the =scale= parameter of LaTeX's
+This attribute is wrapped around the =scale= parameter of LaTeX's
 =\includegraphics= (bitmap images) or a TiKZ's =\scalebox=.
 Therefore, its value should be some string palatable to LaTeX as
 a positive float Its default value is an empty string (i.e. disabled).
@@ -416,7 +416,7 @@ You can install it back from MELPA.
 *** ~org-capture-insert-template-here~
 *** ~org-attach-directory~
 
-It has been deprecated in favour of ~org-attach-id-dir~ which is less
+It has been deprecated in favor of ~org-attach-id-dir~ which is less
 ambiguous given the restructured org-attach.
 
 *** ~org-enable-fixed-width-editor~
@@ -642,7 +642,7 @@ document, use =shrink= value instead, or in addition to align:
 
 Function ~org-get-tags~ used to return local tags to the current
 headline.  It now returns all the inherited tags in addition to the
-local tags.  In order to get the old behaviour back, you can use:
+local tags.  In order to get the old behavior back, you can use:
 
 : (org-get-tags nil t)
 
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index ab7a7eb..6391e0e 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -7636,7 +7636,7 @@ and deselects entries with tag `John' or matching the regexp `plot'.
 
 During entry of the filter, completion for tags, categories and effort
 values is offered.  Since the syntax for categories and tags is identical
-there should be no overlap between categoroes and tags.  If there is, tags
+there should be no overlap between categories and tags.  If there is, tags
 get priority.
 
 A single `\\[universal-argument]' prefix arg STRIP-OR-ACCUMULATE will negate the
diff --git a/lisp/org-attach.el b/lisp/org-attach.el
index 27d06ec..c8ce326 100644
--- a/lisp/org-attach.el
+++ b/lisp/org-attach.el
@@ -187,7 +187,7 @@ attachment folders based on ID."
   "Hook that is invoked by `org-attach-open'.
 
 Created mostly to be compatible with org-attach-git after removing
-git-funtionality from this file.")
+git-functionality from this file.")
 
 (defcustom org-attach-commands
   '(((?a ?\C-a) org-attach-attach
@@ -231,7 +231,7 @@ directory in dired and delete from there.\n")
 Each entry in this list is a list of three elements:
 - A list of keys (characters) to select the command (the fist
   character in the list is shown in the attachment dispatcher's
-  splash buffer and minubuffer prompt).
+  splash buffer and minibuffer prompt).
 - A command that is called interactively when one of these keys
   is pressed.
 - A docstring for this command in the attachment dispatcher's
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 5f42db5..a2e77e0 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -1709,7 +1709,7 @@ The function assumes `org-table-copy-increment' is non-nil."
 	 (number-suffix-regexp (rx (and (one-or-more digit) string-end)))
 	 (analyze
 	  (lambda (field)
-	    ;; Analyse string FIELD and return information related to
+	    ;; Analyze string FIELD and return information related to
 	    ;; increment or nil.  When non-nil, return value has the
 	    ;; following scheme: (TYPE VALUE PATTERN) where
 	    ;; - TYPE is a symbol among `number', `prefix', `suffix'
diff --git a/lisp/org.el b/lisp/org.el
index 9b84592..fddc102 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9889,9 +9889,9 @@ Elements of length one have a tab appended.  Elements of length
 two are kept as is.  Longer elements are truncated to length two.
 
 If an element cannot be made unique, an error is raised."
-  (let ((orderd-keys (cl-sort (copy-sequence keys) #'< :key #'length))
+  (let ((ordered-keys (cl-sort (copy-sequence keys) #'< :key #'length))
 	menu-keys)
-    (dolist (key orderd-keys)
+    (dolist (key ordered-keys)
       (let ((potential-key
 	     (cl-case (length key)
 	       (1 (concat key "\t"))
@@ -10043,7 +10043,7 @@ By default the available states are \"TODO\" and \"DONE\".  So, for this
 example: when the item starts with TODO, it is changed to DONE.
 When it starts with DONE, the DONE is removed.  And when neither TODO nor
 DONE are present, add TODO at the beginning of the heading.
-You can set up single-charcter keys to fast-select the new state.  See the
+You can set up single-character keys to fast-select the new state.  See the
 `org-todo-keywords' and `org-use-fast-todo-selection' for details.
 
 With `\\[universal-argument]' prefix ARG, force logging the state change \