Merge branch 'master' into next

2018-11-19 23:25:17 +01:00 · 2018-11-19 23:25:17 +01:00 · 78901a6602
parent a5df655f76 4aa6a37d24
commit 78901a6602
1 changed files with 5 additions and 0 deletions
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@ -5643,6 +5643,11 @@ This dynamic block has the following parameters:

     When non-~nil~, indent each =ITEM= field according to its level.

+- =:format= ::
+
+     Specify a column attribute (see [[*Column attributes]]) for the
+     dynamic block.
+
 The following commands insert or update the dynamic block:

 - {{{kbd(C-c C-x i)}}} (~org-insert-columns-dblock~) ::