summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-01-13 23:26:33 +0100
committerBastien Guerry <bzg@altern.org>2014-01-13 23:26:33 +0100
commitdd412491b36f36cf506e7b75f53adb7e3c6a94d3 (patch)
tree2bd40ddf653fa1c45cf56190014f1ce425c8e72c
parentae0f1c56a7934cde23d30e5481510cbe79562fea (diff)
parent3f7822d31b2bd4f69e0760c183ae0e51f3b04ed7 (diff)
downloadorg-mode-dd412491b36f36cf506e7b75f53adb7e3c6a94d3.tar.gz
Merge branch 'maint'
-rw-r--r--doc/org.texi2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/org.texi b/doc/org.texi
index 9601d32..8e7b5ed 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -10699,7 +10699,7 @@ Toggle inclusion of tables (@code{org-export-with-tables}).
@cindex property, EXPORT_FILE_NAME
When exporting only a subtree, each of the previous keywords@footnote{With
-the exception of @samp{SETUPFILE}.} can be overriden locally by special node
+the exception of @samp{SETUPFILE}.} can be overridden locally by special node
properties. These begin with @samp{EXPORT_}, followed by the name of the
keyword they supplant. For example, @samp{DATE} and @samp{OPTIONS} keywords
become, respectively, @samp{EXPORT_DATE} and @samp{EXPORT_OPTIONS}