1
0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-29 07:58:21 +00:00

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

This commit is contained in:
Bastien Guerry 2014-09-05 03:06:12 +02:00
commit 0ba1b1ad6d

View File

@ -2313,13 +2313,12 @@ that planning information can be incorporated into desktop calendars.
@node Export options, The export dispatcher, Exporting, Exporting
@section Export options
The exporter recognizes special lines in the buffer which provide
additional information. These lines may be put anywhere in the file.
The whole set of lines can be inserted into the buffer with @kbd{C-c
C-e t}.
The exporter recognizes special lines in the buffer which provide additional
information. These lines may be put anywhere in the file. The whole set of
lines can be inserted into the buffer with @kbd{C-c C-e #}.
@table @kbd
@item C-c C-e t
@item C-c C-e #
Insert template with export options, see example below.
@end table
@ -2330,7 +2329,7 @@ Insert template with export options, see example below.
#+EMAIL: his/her email address (default from @code{user-mail-address})
#+DESCRIPTION: the page description, e.g.@: for the XHTML meta tag
#+KEYWORDS: the page keywords, e.g.@: for the XHTML meta tag
#+LANGUAGE: language for HTML, e.g.@: @samp{en} (@code{org-export-default-language})
#+LANGUAGE: language, e.g.@: @samp{en} (@code{org-export-default-language})
#+OPTIONS: H:2 num:t toc:t \n:nil ::t |:t ^:t f:t tex:t ...
@end smallexample