summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2014-09-03 19:56:47 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2014-09-03 19:56:47 +0200
commit9798a5d524d541a3e51fc41ee8c372bab53fa883 (patch)
tree864a5a180245c69326865d09e3735f4cf1551276
parent38d0eb64b061a2e555c6b0cf877e207e015a17d4 (diff)
parentdc16617f46d64073e4d06308f7150c46d992a408 (diff)
downloadorg-mode-9798a5d524d541a3e51fc41ee8c372bab53fa883.tar.gz
Merge branch 'maint'
-rw-r--r--doc/orgguide.texi11
1 files changed, 5 insertions, 6 deletions
diff --git a/doc/orgguide.texi b/doc/orgguide.texi
index 6237a15..ca8e052 100644
--- a/doc/orgguide.texi
+++ b/doc/orgguide.texi
@@ -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