summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-01-11 00:35:00 (GMT)
committer Bastien Guerry <bzg@altern.org>2014-01-11 00:35:00 (GMT)
commit89147ede728260627cc6093304c3f1a0e3f3c927 (patch)
tree82a763750e8cbf027802188fe6a43d397286b5d6
parent21472107fa736c8ce557107051578163e0d84ee7 (diff)
parentde8884f38e774c366d63ebf1ba75575d031cc393 (diff)
downloadorg-mode-89147ede728260627cc6093304c3f1a0e3f3c927.zip
org-mode-89147ede728260627cc6093304c3f1a0e3f3c927.tar.gz
Merge branch 'maint' of orgmode.org:org-mode into maint
-rw-r--r--doc/org.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/org.texi b/doc/org.texi
index b8339ac..bbcdb8a 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -592,7 +592,7 @@ Exporting
* Org export:: Exporting to Org
* iCalendar export:: Exporting to iCalendar
* Other built-in back-ends:: Exporting to @code{Texinfo} or a man page
-* Export in foreign buffers:: Author tables in lists in Org syntax
+* Export in foreign buffers:: Author tables and lists in Org syntax
* Advanced configuration:: Fine-tuning the export output
HTML export
@@ -10365,7 +10365,7 @@ in the iCalendar format.
* Org export:: Exporting to Org
* iCalendar export:: Exporting to iCalendar
* Other built-in back-ends:: Exporting to @code{Texinfo} or a man page
-* Export in foreign buffers:: Author tables in lists in Org syntax
+* Export in foreign buffers:: Author tables and lists in Org syntax
* Advanced configuration:: Fine-tuning the export output
@end menu