Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-08-12 15:01:10 +02:00
commit 0461101fbb
1 changed files with 1 additions and 1 deletions

View File

@ -10222,7 +10222,7 @@ argument to the @code{@{@{@{date@}@}@}} macro that will be used only if
@code{#+DATE} is a single timestamp. @var{FORMAT} should be a format string @code{#+DATE} is a single timestamp. @var{FORMAT} should be a format string
understood by @code{format-time-string}. understood by @code{format-time-string}.
@itemx @{@{@{time(@var{FORMAT})@}@}@} @item @{@{@{time(@var{FORMAT})@}@}@}
@itemx @{@{@{modification-time(@var{FORMAT})@}@}@} @itemx @{@{@{modification-time(@var{FORMAT})@}@}@}
@cindex time, macro @cindex time, macro
@cindex modification time, macro @cindex modification time, macro