branch: externals-release/org
commit 4dfe3db762211422023c71d555e9780f0dc9e08a
Merge: 7f2ce8272c 934dec45b5
Author: Kyle Meyer <k...@kyleam.com>
Commit: Kyle Meyer <k...@kyleam.com>
Merge branch 'km/from-emacs-30' into bugfix
---
doc/org-manual.org | 2 +-
etc/ORG-NEWS | 4 ++--
lisp/org-agenda.el | 2 +-
lisp/org-element.el | 2 +-
lisp/org-fold-core.el | 2 +-
lisp/org.el | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/doc/org-manual.org b/doc/org-manual.org
index eb9ab5ead0..2ce4a4dbf5 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -11766,7 +11766,7 @@ example
: ./img/cat.jpg
If you wish to define a caption for the image (see [[*Captions]]) and
-maybe a label for internal cross references (see [[*Internal Links]]),
+maybe a label for internal cross-references (see [[*Internal Links]]),
make sure that the link is on a line by itself and precede it with
=CAPTION= and =NAME= keywords as follows:
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index b2c591b67d..c5d1e87203 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -560,7 +560,7 @@ The old name is obsolete.
** New and changed options
-# Chanes deadling with changing default values of customizations,
+# Changes dealing with changing default values of customizations,
# adding new customizations, or changing the interpretation of the
# existing customizations.
@@ -623,7 +623,7 @@ This new hook runs when a note has been stored.
Sorting of agenda items, tables, menus, headlines, etc can now be
controlled using a new custom option ~org-sort-function~.
-By default, Org mode sorts things according to the operation system
+By default, Org mode sorts things according to the operating system
language. However, language sorting rules may or may not produce good
results depending on the use case. For example, multi-language
documents may be sorted weirdly when sorting rules for system language
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 569da84172..011884d5d5 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -2230,7 +2230,7 @@ This is an internal flag indicating either temporary or
extended
agenda restriction. Specifically, it is set to t if the agenda
is restricted to an entire file, and is set to the corresponding
buffer if the agenda is restricted to a part of a file, e.g. a
-region or a substree. In the latter case,
+region or a subtree. In the latter case,
`org-agenda-restrict-begin' and `org-agenda-restrict-end' are set
to the beginning and the end of the part.
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 811d322765..a3fe427403 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -7981,7 +7981,7 @@ the cache."
(unless (memq granularity '( headline headline+inlinetask
greater-element element))
(error "Unsupported granularity: %S" granularity))
- ;; Make TO-POS marker. Otherwise, buffer edits may garble the the
+ ;; Make TO-POS marker. Otherwise, buffer edits may garble the
;; process.
(unless (markerp to-pos)
(let ((mk (make-marker)))
diff --git a/lisp/org-fold-core.el b/lisp/org-fold-core.el
index 4eb875aff2..db8e8078b2 100644
--- a/lisp/org-fold-core.el
+++ b/lisp/org-fold-core.el
@@ -172,7 +172,7 @@
;; The isearch behavior is controlled on per-folding-spec basis by
;; setting `isearch-open' and `isearch-ignore' folding spec
-;; properties. The the docstring of `org-fold-core--specs' for more details.
+;; properties. See the docstring of `org-fold-core--specs' for more details.
;;; Handling edits inside folded text
diff --git a/lisp/org.el b/lisp/org.el
index 434c3f990a..8ca9a4b716 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3796,7 +3796,7 @@ You need to reload Org or to restart Emacs after setting
this.")
"Alist of characters and faces to emphasize text.
Text starting and ending with a special character will be emphasized,
for example *bold*, _underlined_ and /italic/. This variable sets the
-the face to be used by font-lock for highlighting in Org buffers.
+face to be used by font-lock for highlighting in Org buffers.
Marker characters must be one of */_=~+.
You need to reload Org or to restart Emacs after customizing this."
