diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2014-09-02 14:56:16 +0200 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2014-09-02 14:56:16 +0200 |
commit | d4e4b1ea68e9dc493fe99a09085008b68d1885cb (patch) | |
tree | df791f1f7460960d3441e1e6b263501755c6abd4 | |
parent | aaa70b90ef1395e1469e3c3ad94d7e390eeb944c (diff) | |
parent | 51f2730d7f0b069f5c6400f4d10c9a7f04cac550 (diff) | |
download | org-mode-d4e4b1ea68e9dc493fe99a09085008b68d1885cb.tar.gz |
Merge branch 'maint'
-rw-r--r-- | doc/org.texi | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/doc/org.texi b/doc/org.texi index 842b308..fafa93b 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -12977,7 +12977,7 @@ an Info file. Export as a Texinfo file. For an Org file, @file{myfile.org}, the resulting file will be @file{myfile.texi}. The file will be overwritten without warning. -@orgcmd{C-c C-e m M,org-texinfo-export-to-info} +@orgcmd{C-c C-e i i,org-texinfo-export-to-info} Export to Texinfo and then process to an Info file@footnote{By setting @code{org-texinfo-info-process}, it is possible to generate other formats, including DocBook.}. @@ -13102,7 +13102,15 @@ an appendix, independently on its level and the class used. Each regular sectioning structure creates a menu entry, named after the heading. You can provide a different, e.g., shorter, title in @code{:ALT_TITLE:} property (@pxref{Table of contents}). Optionally, you can -specify a description for the item in @code{:DESCRIPTION:} property. +specify a description for the item in @code{:DESCRIPTION:} property. E.g., + +@example +* Controlling Screen Display + :PROPERTIES: + :ALT_TITLE: Display + :DESCRIPTION: Controlling Screen Display + :END: +@end example @node Indices @subsection Indices @@ -13168,9 +13176,8 @@ written just above the list or table. In Texinfo output, description lists appear as two-column tables, using the default command @code{@@table}. You can use @code{@@ftable} or -@code{@@vtable}@footnote{For more information, please refer to -@inforef{Two-column Tables,,texinfo}.} instead with @code{:table-type} -attribute. +@code{@@vtable}@footnote{For more information, @inforef{Two-column +Tables,,texinfo}.} instead with @code{:table-type} attribute. @vindex org-texinfo-def-table-markup In any case, these constructs require a highlighting command for entries in |