[elpa] externals/org aed55381bd 5/5: Merge branch 'km/from-emacs-master'

[ELPA Syncer]

branch: externals/org
commit aed55381bde797a3cabb27c5f47ad5bcd70c7ffe
Merge: 62e1513b5a 257df88645
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>

    Merge branch 'km/from-emacs-master'
---
 doc/org-manual.org | 2 +-
 etc/ORG-NEWS       | 8 ++++----
 lisp/ol.el         | 2 +-
 lisp/org-faces.el  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index a1c648b61a..4f877d3715 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -17021,7 +17021,7 @@ identifying a reference in the bibliography.
 
 - Each key can be qualified by a /prefix/ (e.g.\nbsp{}"see ") and/or
   a /suffix/ (e.g.\nbsp{}"p.\nbsp{}123"), giving information useful or 
necessary
-  fo the comprehension of the citation but not included in the
+  for the comprehension of the citation but not included in the
   reference.
 
 - A single citation can cite more than one reference ; the keys are
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index c03bbb76ec..1f79f8ae59 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -3539,7 +3539,7 @@ can pass the converted path to the =sqlcmd= tool.
 
 **** Improved support of header arguments for postgresql
 
-The postgresql engine in a sql code block supports now ~:dbport~ nd
+The postgresql engine in a sql code block now supports ~:dbport~ and
 ~:dbpassword~ as header arguments.
 
 **** Support for additional plantuml output formats
@@ -6455,7 +6455,7 @@ that Calc formulas can operate on them.
 **** org-ctags.el (Paul Sexton)
 
      Targets like =<<my target>>= can now be found by Emacs' etag
-     functionality, and Org-mode links can be used to to link to
+     functionality, and Org-mode links can be used to link to
      etags, also in non-Org-mode files.  For details, see the file
      /org-ctags.el/.
 
@@ -6812,7 +6812,7 @@ that Calc formulas can operate on them.
     code that is actually evaluated comprises the code block contents,
     augmented with the extra code which assigns the referenced data to
     variables. It is now possible to preview expanded contents, and
-    also to expand code during during tangling. This expansion takes
+    also to expand code during tangling. This expansion takes
     into account all header arguments, and variables.
 
     A new keybinding `C-c M-b p' bound to `org-babel-expand-src-block'
@@ -6927,7 +6927,7 @@ that Calc formulas can operate on them.
 
 **** Localized clock tables
 
-     Clock tables now support a new new =:lang= parameter, allowing
+     Clock tables now support a new =:lang= parameter, allowing
      the user to customize the localization of the table headers.  See
      the variable =org-clock-clocktable-language-setup= which controls
      available translated strings.
diff --git a/lisp/ol.el b/lisp/ol.el
index 20169691b3..0b4457b003 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -357,7 +357,7 @@ another window."
 (defcustom org-link-search-must-match-exact-headline 'query-to-create
   "Non-nil means internal fuzzy links can only match headlines.
 
-When nil, the a fuzzy link may point to a target or a named
+When nil, the fuzzy link may point to a target or a named
 construct in the document.  When set to the special value
 `query-to-create', offer to create a new headline when none
 matched.
diff --git a/lisp/org-faces.el b/lisp/org-faces.el
index afc8c609e5..0effa13a1d 100644
--- a/lisp/org-faces.el
+++ b/lisp/org-faces.el
@@ -140,7 +140,7 @@ The following faces apply, with this priority.
 
 Since column view works by putting overlays with a display property
 over individual characters in the buffer, the face of the underlining
-character (this might for example be the a TODO keyword) might still
+character (this might for example be the TODO keyword) might still
 shine through in some properties.  So when your column view looks
 funny, with \"random\" colors, weight, strike-through, try to explicitly
 set the properties in the `org-column' face.  For example, set