ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-08-12 00:58:53 +02:00
parent 3add787abd 06026a16f9
commit 36468b90db
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/org.texi
View File

@ -10216,16 +10216,20 @@ export.
@item @{@{@{date@}@}@} @item @{@{@{date@}@}@}
@itemx @{@{@{date(@var{FORMAT})@}@}@} @itemx @{@{@{date(@var{FORMAT})@}@}@}
@cindex date, macro
This macro refers to the @code{#+DATE} keyword. @var{FORMAT} is an optional
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
understood by @code{format-time-string}.
@itemx @{@{@{time(@var{FORMAT})@}@}@} @itemx @{@{@{time(@var{FORMAT})@}@}@}
@itemx @{@{@{modification-time(@var{FORMAT})@}@}@} @itemx @{@{@{modification-time(@var{FORMAT})@}@}@}
@cindex date, macro
@cindex time, macro @cindex time, macro
@cindex modification time, macro @cindex modification time, macro
These macros refer to the @code{#+DATE} keyword, the current date, and the These macros refer to the date and time when the document is exported and to
modification time of the file being exported, respectively. @var{FORMAT} the modification date and time of the file being exported, respectively.
should be a format string understood by @code{format-time-string}. Note that @var{FORMAT} should be a format string understood by
@var{FORMAT} is an optional argument to the @code{@{@{@{date@}@}@}} macro, @code{format-time-string}.
and that it will only be used if @code{#+DATE} is a single timestamp.
@item @{@{@{input-file@}@}@} @item @{@{@{input-file@}@}@}
@cindex input file, macro @cindex input file, macro