Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2013-02-15 22:59:29 +01:00
commit 6dd035c925
2 changed files with 10 additions and 6 deletions

View File

@ -53,7 +53,7 @@
(defgroup org-export-icalendar nil
"Options specific for iCalendar export back-end."
:tag "Org iCalendar"
:tag "Org Export iCalendar"
:group 'org-export)
(defcustom org-icalendar-combined-agenda-file "~/org.ics"

View File

@ -5256,11 +5256,15 @@ files or buffers, only the display.
"Export dispatcher for Org mode.
It provides an access to common export related tasks in a buffer.
Its interface comes in two flavours: standard and expert. While
both share the same set of bindings, only the former displays the
valid keys associations in a dedicated buffer. Set
`org-export-dispatch-use-expert-ui' to switch to one flavour or
the other.
Its interface comes in two flavours: standard and expert.
While both share the same set of bindings, only the former
displays the valid keys associations in a dedicated buffer.
Scrolling (resp. line-wise motion) in this buffer is done with
SPC and DEL (resp. C-n and C-p) keys.
Set variable `org-export-dispatch-use-expert-ui' to switch to one
flavour or the other.
When ARG is \\[universal-argument], repeat the last export action, with the same set
of options used back then, on the current buffer.