Merge branch 'maint'

4 files changed, 12 insertions, 13 deletions

diff --git a/doc/org-manual.org b/doc/org-manual.org
index 286b9e0..cec7e17 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -20089,13 +20089,12 @@ These commands update dynamic blocks:
 
 Before updating a dynamic block, Org removes content between the
 =BEGIN= and =END= markers.  Org then reads the parameters on the
-=BEGIN= line for passing to the writer function.  If the function
-expects to access the removed content, then Org expects an extra
-parameter, =:content=, on the =BEGIN= line.
+=BEGIN= line for passing to the writer function as a plist. The
+previous content of the dynamic block becomes erased from the buffer
+and appended to the plist under ~:content~.
 
 The syntax for naming a writer function with a dynamic block labelled
-=myblock= is: ~org-dblock-write:myblock~.  Parameters come from the
-=BEGIN= line.
+=myblock= is: ~org-dblock-write:myblock~.
 
 The following is an example of a dynamic block and a block writer function
 that updates the time when the function was last run:
diff --git a/lisp/ob-lua.el b/lisp/ob-lua.el
index 9a66505..530376a 100644
--- a/lisp/ob-lua.el
+++ b/lisp/ob-lua.el
@@ -55,7 +55,7 @@
 
 (defcustom org-babel-lua-mode 'lua-mode
   "Preferred lua mode for use in running lua interactively.
-This will typically be 'lua-mode."
+This will typically be `lua-mode'."
   :group 'org-babel
   :version "26.1"
   :package-version '(Org . "8.3")
@@ -69,7 +69,7 @@ This will typically be 'lua-mode."
   :type 'string)
 
 (defcustom org-babel-lua-None-to 'hline
-  "Replace 'None' in lua tables with this before returning."
+  "Replace `None' in lua tables with this before returning."
   :group 'org-babel
   :version "26.1"
   :package-version '(Org . "8.3")
@@ -284,8 +284,8 @@ fd:close()")
 (defun org-babel-lua-evaluate-external-process
     (body &optional result-type result-params preamble)
   "Evaluate BODY in external lua process.
-If RESULT-TYPE equals 'output then return standard output as a
-string.  If RESULT-TYPE equals 'value then return the value of the
+If RESULT-TYPE equals `output' then return standard output as a
+string.  If RESULT-TYPE equals `value' then return the value of the
 last statement in BODY, as elisp."
   (let ((raw
          (pcase result-type
@@ -316,8 +316,8 @@ last statement in BODY, as elisp."
 (defun org-babel-lua-evaluate-session
     (session body &optional result-type result-params)
   "Pass BODY to the Lua process in SESSION.
-If RESULT-TYPE equals 'output then return standard output as a
-string.  If RESULT-TYPE equals 'value then return the value of the
+If RESULT-TYPE equals `output' then return standard output as a
+string.  If RESULT-TYPE equals `value' then return the value of the
 last statement in BODY, as elisp."
   (let* ((send-wait (lambda () (comint-send-input nil t) (sleep-for 0 5)))
 	 (dump-last-value
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 3f4e963..d389fc2 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -4021,7 +4021,7 @@ dimming them."
 the header at `org-hd-marker' is blocked according to
 `org-entry-blocked-p', then if `org-agenda-dim-blocked-tasks' is
 'invisible and the header is not blocked by checkboxes, set the
-text property `org-todo-blocked' to 'invisible, otherwise set it
+text property `org-todo-blocked' to `invisible', otherwise set it
 to t."
   (when (get-text-property 0 'todo-state entry)
     (let ((entry-marker (get-text-property 0 'org-hd-marker entry))
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 832d9bf..65f40fb 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -384,7 +384,7 @@ variable is non-nil, Org passes their value to \\label unchanged.
 You are responsible for ensuring that the value is a valid LaTeX
 \\label key, and that no other \\label commands with the same key
 appear elsewhere in your document.  (Keys may contain letters,
-numbers, and the following punctuation: '_' '.'  '-' ':'.)  There
+numbers, and the following punctuation: `_' `.' `-' `:'.)  There
 are no such limitations on CUSTOM_ID and NAME when this variable
 is nil.