Merge branch 'maint'

doc/org-manual.org

@@ -6598,11 +6598,12 @@ be selected:
 
 - =:stepskip0= ::
 
-  Do not show steps that have zero time.
+  When non-~nil~, do not show steps that have zero time.
 
 - =:fileskip0= ::
 
-  Do not show table sections from files which did not contribute.
+  When non-~nil~, do not show table sections from files which did not
+  contribute.
 
 - =:match= ::
 
@@ -6617,7 +6618,7 @@ using the =:formatter= parameter.
 
 - =:emphasize= ::
 
-  When ~t~, emphasize level one and level two items.
+  When non-~nil~, emphasize level one and level two items.
 
 - =:lang= ::