[elpa] externals/org f7fb1157f2: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit f7fb1157f24d47debda5e7399ac84bc42cb1ed99
Merge: 5b419c80d6 fa3147c100
Author: Bastien Guerry <bzg@gnu.org>
Commit: Bastien Guerry <bzg@gnu.org>

    Merge branch 'bugfix'
---
 doc/org-manual.org | 2 +-
 lisp/org-lint.el   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index 701e0cddf3..15fc24712d 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -21525,7 +21525,7 @@ sources when reading a document.  To that effect, you 
can use
 a bookmark with the following location:
 
 #+begin_example
-javascript:location.href='org-protocol://open-source?&url='+
+javascript:location.href='org-protocol://open-source?url='+
       encodeURIComponent(location.href);void(0)
 #+end_example
 
diff --git a/lisp/org-lint.el b/lisp/org-lint.el
index 15950b2311..31b29ec19f 100644
--- a/lisp/org-lint.el
+++ b/lisp/org-lint.el
@@ -37,7 +37,7 @@
 
 ;; Checks currently implemented report the following:
 
-;; - duplicates CUSTOM_ID properties,
+;; - duplicate CUSTOM_ID properties,
 ;; - duplicate NAME values,
 ;; - duplicate targets,
 ;; - duplicate footnote definitions,
@@ -1588,7 +1588,7 @@ AST is the buffer parse tree."
   #'org-lint-misplaced-heading :trust 'low)
 
 (org-lint-add-checker 'duplicate-custom-id
-  "Report duplicates CUSTOM_ID properties"
+  "Report duplicate CUSTOM_ID properties"
   #'org-lint-duplicate-custom-id
   :categories '(link))