[elpa] externals/org bee8e3a: Merge branch 'maint'

[ELPA Syncer]

branch: externals/org
commit bee8e3adf8a81e1bba807df6330fd1ec528c3094
Merge: 62c90be 15200c2
Author: Bastien <bzg@gnu.org>
Commit: Bastien <bzg@gnu.org>

    Merge branch 'maint'
---
 doc/org-manual.org | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/org-manual.org b/doc/org-manual.org
index 0f4baf7..61f4672 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -16454,9 +16454,9 @@ extract, export, and publish source code blocks.  Org 
can also compile
 and execute a source code block, then capture the results.  The Org
 mode literature sometimes refers to source code blocks as /live code/
 blocks because they can alter the content of the Org document or the
-material that it exports.  Users can control how live they want each
-source code block by tweaking the header arguments (see [[*Using Header
-Arguments]]) for compiling, execution, extraction, and exporting.
+material that it exports.  Users can control how the "liveliness" of
+each source code block by tweaking the header arguments (see [[*Using
+Header Arguments]]) for compiling, execution, extraction, and exporting.
 
 For editing and formatting a source code block, Org uses an
 appropriate Emacs major mode that includes features specifically
@@ -21059,6 +21059,9 @@ be complete if the ones above were not mentioned in 
this manual.
 - Charles Cave's suggestion sparked the implementation of templates
   for Remember, which are now templates for capture.
 
+- Timothy E Chapman worked on a complete overhaul of the orgmode.org
+  website in 2020 and helped fixing various bugs.
+
 - Pavel Chalmoviansky influenced the agenda treatment of items with
   specified time.