branch: externals-release/org
commit d0b1729ad553ba6655dcb6d8422c514ac7b1397c
Merge: 008c28426d 8a82a06bec
Author: Kyle Meyer <k...@kyleam.com>
Commit: Kyle Meyer <k...@kyleam.com>

    Merge branch 'km/from-emacs-master' into bugfix
---
 etc/ORG-NEWS | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index b76fdc3e2d..edeb7d3ab6 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -285,7 +285,7 @@ passing universal argument.
 
 When using this feature, IDs should not include =::=, which is used in
 links to indicate the start of the search string.  For backwards
-compability, existing IDs including =::= will still be matched (but
+compatibility, existing IDs including =::= will still be matched (but
 cannot be used together with search option).  A new org-lint checker
 has been added to warn about this.
 
@@ -426,8 +426,8 @@ in the dynamic block.
 A global default formatting function for =colview= dynamic blocks can
 be set via the new option ~org-columns-dblock-formatter~ which
 defaults to the new function ~org-columns-dblock-write-default~, that
-implements the previous (fixed) formatting behaviour. Hence, the
-default behaviour is identical to previous versions.
+implements the previous (fixed) formatting behavior. Hence, the
+default behavior is identical to previous versions.
 
 The global default function can be overridden for any given =colview=
 dynamic block individually by specifying a custom formatter function
@@ -893,7 +893,7 @@ order to remain backward-compatible.
 
 Before, a ClojureScript source block used the same backend as Clojure,
 configured in ~org-babel-clojure-backend~ and relied on an undocumented
-~:target~ paramter.
+~:target~ parameter.
 
 Now, there's ~org-babel-clojurescript-backend~ to determine the
 backend used for evaluation of ClojureScript.
@@ -971,7 +971,7 @@ manner with ~run-python~.
 
 *** New hook option ~org-indent-post-buffer-init-functions~
 
-This allows to run functions after ~org-indent~ intializes a buffer to
+This allows to run functions after ~org-indent~ initializes a buffer to
 enrich its properties.
 *** New option ~org-agenda-start-with-archives-mode~
 
@@ -1034,7 +1034,7 @@ of the dynamic block. This new option can be used to set 
the global
 default formatting function that will be used for =colview= dynamic
 blocks that do not specify any ~:formatter~ parameter. Its default
 value (the new function ~org-columns-dblock-write-default~) yields the
-previous (fixed) formatting behaviour.
+previous (fixed) formatting behavior.
 
 *** New allowed value of ~org-md-headline-style~ to mix ATX and Setext style 
headlines
 
@@ -1578,12 +1578,12 @@ is initiated only when user explicitly executes 
R/Julia-mode commands
 that trigger session interactions (requires ESS 24.01.0 or newer).
 The same session will remain available in the context of Org babel.
 
-*** ~org-store-link~ behaviour storing additional =CUSTOM_ID= links has changed
+*** ~org-store-link~ behavior storing additional =CUSTOM_ID= links has changed
 
 Previously, when storing =id:= link, ~org-store-link~ stored an
 additional "human readable" link using a node's =CUSTOM_ID= property.
 
-This behaviour has been expanded to store an additional =CUSTOM_ID=
+This behavior has been expanded to store an additional =CUSTOM_ID=
 link when storing any type of external link type in an Org file, not
 just =id:= links.
 

Reply via email to