Merge branch 'bugfix'

4 files changed, 13 insertions, 10 deletions

diff --git a/.dir-locals.el b/.dir-locals.el
index 9df10dfed..83e51000f 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,4 +1,4 @@
-;;; Directory Local Variables
+;;; Directory Local Variables            -*- no-byte-compile: t; -*-
 ;;; For more information see (info "(emacs) Directory Variables")
 
 ((nil
diff --git a/doc/org-manual.org b/doc/org-manual.org
index 512fce9a1..94fabde3b 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -604,11 +604,11 @@ Org uses just two commands, bound to {{{kbd(TAB)}}} and
   the very beginning of the buffer, but not on a headline, and
   ~org-cycle-global-at-bob~ is set to a non-~nil~ value.
 
-- {{{kbd(C-u C-u TAB)}}} (~org-set-startup-visibility~) ::
+- {{{kbd(C-u C-u TAB)}}} (~org-cycle-set-startup-visibility~) ::
 
   #+cindex: startup visibility
   #+kindex: C-u C-u TAB
-  #+findex: org-set-startup-visibility
+  #+findex: org-cycle-set-startup-visibility
   Switch back to the startup visibility of the buffer (see [[*Initial
   visibility]]).
 
@@ -695,10 +695,10 @@ Furthermore, any entries with a =VISIBILITY= property (see [[*Properties
 and Columns]]) get their visibility adapted accordingly.  Allowed values
 for this property are =folded=, =children=, =content=, and =all=.
 
-- {{{kbd(C-u C-u TAB)}}} (~org-set-startup-visibility~) ::
+- {{{kbd(C-u C-u TAB)}}} (~org-cycle-set-startup-visibility~) ::
 
   #+kindex: C-u C-u TAB
-  #+findex: org-set-startup-visibility
+  #+findex: org-cycle-set-startup-visibility
   Switch back to the startup visibility of the buffer, i.e., whatever
   is requested by startup options and =VISIBILITY= properties in
   individual entries.
@@ -3799,8 +3799,8 @@ argument.
 
 With the above setting, you could link to a specific bug with
 =[[bugzilla:129]]=, search the web for =OrgMode= with =[[duckduckgo:OrgMode]]=,
-show the map location of the Free Software Foundation =[[gmap:51
-Franklin Street, Boston]]= or of Carsten office =[[omap:Science Park 904,
+show the map location of the Free Software Foundation =[[omap:31
+Milk Street, Boston]]= or of Carsten's office =[[omap:Science Park 904,
 Amsterdam, The Netherlands]]= and find out what the Org author is doing
 besides Emacs hacking with =[[ads:Dominik,C]]=.
 
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index a9357aa28..949429308 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -507,7 +507,7 @@ when ~org-yank-dnd-method~ is =attach=.
 :CUSTOM_ID: preview-align
 :END:
 
-Previously, all the image previews where always left-aligned.
+Previously, all the image previews were always left-aligned.
 
 Now, you can customize image previews to be left-aligned, centered, or right-aligned.
 
diff --git a/lisp/ox.el b/lisp/ox.el
index 7a0ab4dc7..f6846b4e1 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -156,8 +156,11 @@
     (:cite-export "CITE_EXPORT" nil org-cite-export-processors))
   "Alist between export properties and ways to set them.
 
-The key of the alist is the property name, and the value is a list
-like (KEYWORD OPTION DEFAULT BEHAVIOR) where:
+Each element of the alist is a list like
+(ALIST-KEY KEYWORD OPTION DEFAULT BEHAVIOR)
+
+ALIST-KEY is the key of the alist - a symbol like `:option', and the
+value is (KEYWORD OPTION ...).
 
 KEYWORD is a string representing a buffer keyword, or nil.  Each
   property defined this way can also be set, during subtree