diff options
author | Nicolas Goaziou <n.goaziou@gmail.com> | 2014-01-09 22:41:30 +0100 |
---|---|---|
committer | Nicolas Goaziou <n.goaziou@gmail.com> | 2014-01-09 22:41:30 +0100 |
commit | 99fdd76bb851fb460a129aafc790e226ef5ee48e (patch) | |
tree | 652bdc75f9d880ebd044a1408a5bee8497ddf289 | |
parent | b8028c607d69e79e979c043bd0e4da37ca9fb480 (diff) | |
parent | 432decf7257bae34d0d2cdf0bbce2cefde6b51c3 (diff) | |
download | org-mode-99fdd76bb851fb460a129aafc790e226ef5ee48e.tar.gz |
Merge branch 'maint'
-rw-r--r-- | doc/org.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/org.texi b/doc/org.texi index ccea65f..75ef957 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -594,7 +594,7 @@ Exporting * OpenDocument text export:: Exporting to OpenDocument Text * Org export:: Exporting to Org * iCalendar export:: Exporting to iCalendar -* Other built-in back-ends:: Exporting to @code{Texinfo}, a man page, or Org +* Other built-in back-ends:: Exporting to @code{Texinfo} or a man page * Export in foreign buffers:: Author tables in lists in Org syntax * Advanced configuration:: Fine-tuning the export output @@ -10359,7 +10359,7 @@ in the iCalendar format. * OpenDocument text export:: Exporting to OpenDocument Text * Org export:: Exporting to Org * iCalendar export:: Exporting to iCalendar -* Other built-in back-ends:: Exporting to @code{Texinfo}, a man page, or Org +* Other built-in back-ends:: Exporting to @code{Texinfo} or a man page * Export in foreign buffers:: Author tables in lists in Org syntax * Advanced configuration:: Fine-tuning the export output @end menu |