[elpa] externals/org 1e353648ef: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit 1e353648ef8aacd92a9d0e496b7c7ae7c2e4efa3
Merge: 08c9664a42 3cdb637fcf
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>

    Merge branch 'bugfix'
---
 etc/ORG-NEWS        | 2 +-
 lisp/oc-biblatex.el | 2 +-
 lisp/oc.el          | 2 +-
 lisp/org-capture.el | 2 +-
 lisp/org-compat.el  | 2 +-
 lisp/org-element.el | 2 +-
 lisp/org-persist.el | 4 ++--
 lisp/org-table.el   | 2 +-
 lisp/org.el         | 4 ++--
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 1207d6fca9..aef7e11841 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -1857,7 +1857,7 @@ Conversion to SVG exposes a number of additional 
customizations that
 give the user full control over the contents of the latex source
 block. ~org-babel-latex-preamble~, ~org-babel-latex-begin-env~ and
 ~org-babel-latex-end-env~ are new customization options added to allow
-the user to specify the preamble and code that preceedes and proceeds
+the user to specify the preamble and code that precedes and proceeds
 the contents of the source block.
 
 *** New option ~org-html-meta-tags~ allows for HTML meta tags customization
diff --git a/lisp/oc-biblatex.el b/lisp/oc-biblatex.el
index cf08d4110d..9c6ae209ee 100644
--- a/lisp/oc-biblatex.el
+++ b/lisp/oc-biblatex.el
@@ -26,7 +26,7 @@
 
 ;; The processor relies on "biblatex" LaTeX package.  As such it ensures that
 ;; the package is properly required in the document's preamble.  More
-;; accurately, it will re-use any "\usepackage{biblatex}" already present in
+;; accurately, it will reuse any "\usepackage{biblatex}" already present in
 ;; the document (e.g., through `org-latex-packages-alist'), or insert one using
 ;; options defined in `org-cite-biblatex-options'.
 
diff --git a/lisp/oc.el b/lisp/oc.el
index 03f4ee0128..01077afc80 100644
--- a/lisp/oc.el
+++ b/lisp/oc.el
@@ -52,7 +52,7 @@
 ;; through the "cite_export" keyword.
 
 ;; Eventually, this library provides some tools, mainly targeted at
-;; processor implementors.  Most are export-specific and are located
+;; processor implementers.  Most are export-specific and are located
 ;; in the "Tools only available during export" and "Tools generating
 ;; or operating on parsed data" sections.
 
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index d65b2c9b0c..e482f667f6 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -1326,7 +1326,7 @@ may have been stored before."
                (while (< (point) end)
                  (indent-to i)
                  (forward-line)))
-             ;; Pre-pending an item could change the type of the list
+             ;; Prepending an item could change the type of the list
              ;; if there is a mismatch.  In this situation,
              ;; prioritize the existing list.
              (when prepend?
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 0c10c67224..d02e520f64 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -177,7 +177,7 @@ Ignore optional argument."
 Elements in COMPONENTS must be a string or nil.
 DIRECTORY or the non-final elements in COMPONENTS may or may not end
 with a slash -- if they don't end with a slash, a slash will be
-inserted before contatenating."
+inserted before concatenating."
     (save-match-data
       (mapconcat
        #'identity
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 700657588b..92a81210ea 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -5822,7 +5822,7 @@ This variable is used to determine when re-parsing buffer 
is not going
 to slow down the command.
 
 If the commands end up modifying the cache, the worst case scenario is
-performance drop.  So, advicing these commands is safe.  Yet, it is
+performance drop.  So, advising these commands is safe.  Yet, it is
 better to remove the commands advised in such a way from this list.")
 
 (defmacro org-element--request-key (request)
diff --git a/lisp/org-persist.el b/lisp/org-persist.el
index 9d740df5f8..69481c5607 100644
--- a/lisp/org-persist.el
+++ b/lisp/org-persist.el
@@ -201,7 +201,7 @@
 ;; Each collection is represented as a plist containing the following
 ;; properties:
 ;;
-;; - `:container'   : list of data continers to be stored in single
+;; - `:container'   : list of data containers to be stored in single
 ;;                    file;
 ;; - `:persist-file': data file name;
 ;; - `:associated'  : list of associated objects;
@@ -360,7 +360,7 @@ The index is a list of plists.  Each plist contains 
information about
 persistent data storage.  Each plist contains the following
 properties:
 
-  - `:container'  : list of data continers to be stored in single file
+  - `:container'  : list of data containers to be stored in single file
   - `:persist-file': data file name
   - `:associated'  : list of associated objects
   - `:last-access' : last date when the container has been read
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 9176d2e5bc..112def0349 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -4895,7 +4895,7 @@ This function sets up the following dynamically scoped 
variables:
                        (push (cons field v) org-table-local-parameters)
                        (push (list field line col)
                              org-table-named-field-locations))))))))))
-      ;; Re-use existing markers when possible.
+      ;; Reuse existing markers when possible.
       (if (markerp org-table-current-begin-pos)
          (move-marker org-table-current-begin-pos (point))
        (setq org-table-current-begin-pos (point-marker)))
diff --git a/lisp/org.el b/lisp/org.el
index bdccc2d241..e5223934de 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -1250,7 +1250,7 @@ This applies to indirect buffers created with the commands
 Valid values are:
 current-window   Display in the current window
 other-window     Just display in another window.
-dedicated-frame  Create one new frame, and re-use it each time.
+dedicated-frame  Create one new frame, and reuse it each time.
 new-frame        Make a new frame each time.  Note that in this case
                  previously-made indirect buffers are kept, and you need to
                  kill these buffers yourself."
@@ -4605,7 +4605,7 @@ is available.  This option applies only if FILE is a URL."
                            file)
                   nil))
             (error (if noerror
-                       (message "Org could't download \"%s\": %s %S" file (car 
error) (cdr error))
+                       (message "Org couldn't download \"%s\": %s %S" file 
(car error) (cdr error))
                      (signal (car error) (cdr error)))))
         (funcall (if noerror #'message #'user-error)
                  "The remote resource %S is considered unsafe, and will not be 
downloaded."