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

[ELPA Syncer]

branch: externals/org
commit 1bdacbe729eaaa9ff50a217d6030fe942c9b259b
Merge: b944fecdfc 7caae6c088
Author: Bastien <bzg@gnu.org>
Commit: Bastien <bzg@gnu.org>

    Merge branch 'bugfix'
---
 README             | 37 ++++++++++++++++++++-----------------
 lisp/org-agenda.el |  2 +-
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/README b/README
index b0e39b9758..f78cbebe62 100644
--- a/README
+++ b/README
@@ -3,7 +3,8 @@
 This is a distribution of Org, a plain text notes and project planning
 tool for Emacs.
 
-Check the [[https://orgmode.org][homepage of Org]] and the 
[[https://orgmode.org/org.html#Installation][installations instructions]].
+Check the Org Mode website at https://orgmode.org and the installation
+instructions at https://orgmode.org/org.html#Installation.
 
 * Contents of this distribution
 
@@ -11,9 +12,10 @@ Check the [[https://orgmode.org][homepage of Org]] and the 
[[https://orgmode.org
 
 - COPYING :: The GNU General Public License.
 
-- Makefile :: The makefile to compile and install Org.  For
-  installation instructions, see 
[[https://orgmode.org/org.html#Installation][the manual]] or 
[[https://orgmode.org/worg/dev/org-build-system.html][this more detailed
-  procedure on Worg]].
+- Makefile :: The makefile to compile and install Org.  See the
+  installation instructions https://orgmode.org/org.html#Installation
+  or this more detailed procedure on Worg:
+  https://orgmode.org/worg/dev/org-build-system.html.
   
 - mk/ :: Files needed for building Org.
 
@@ -44,23 +46,24 @@ this are here http://www.gnu.org/help/evaluation
 Don't have a program to contribute?  Look at all the other ways to
 help: https://www.gnu.org/help/help.html
 
-And to learn more about Free (libre) Software in general, please
-read and share this page: https://gnu.org/philosophy/free-sw.html
+And to learn more about Free (libre) Software in general, please read
+and share this page: https://gnu.org/philosophy/free-sw.html
 
 * License
 
-Org-mode is published under [[https://www.gnu.org/licenses/gpl-3.0.html][the 
GNU GPLv3 license]] or any later
-version, the same as GNU Emacs.
+Org-mode is published under the GNU GPLv3 license or any later
+version, the same as GNU Emacs:
+https://www.gnu.org/licenses/gpl-3.0.html
 
-Org-mode is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+Org-mode is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
 
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Emacs is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Org mode.  If not, see <https://www.gnu.org/licenses/>.
+along with Org mode.  If not, see https://www.gnu.org/licenses/.
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 89c395d0b9..a09b535636 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4875,7 +4875,7 @@ Press `\\[org-agenda-manipulate-query-add]', \
 
 ;;;###autoload
 (defun org-todo-list (&optional arg)
-  "Show all (not done) TODO entries from all agenda file in a single list.
+  "Show all (not done) TODO entries from all agenda files in a single list.
 The prefix arg can be used to select a specific TODO keyword and limit
 the list to these.  When using `\\[universal-argument]', you will be prompted
 for a keyword.  A numeric prefix directly selects the Nth keyword in