ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint' 

Conflicts:
	doc/orgguide.texi
This commit is contained in:
Bastien Guerry 2013-01-08 12:11:08 +01:00
parent 86737d323e 2d81219147
commit 6c3ef62266
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/orgguide.texi
View File

@ -98,6 +98,8 @@ modify this GNU manual.''
* Working With Source Code:: Source code snippets embedded in Org * Working With Source Code:: Source code snippets embedded in Org
* Miscellaneous:: All the rest which did not fit elsewhere * Miscellaneous:: All the rest which did not fit elsewhere
* GNU Free Documentation License:: This manual license.
@detailmenu @detailmenu
--- The Detailed Node Listing --- --- The Detailed Node Listing ---
@ -207,7 +209,7 @@ Exporting
* HTML export:: Exporting to HTML * HTML export:: Exporting to HTML
* @LaTeX{} and PDF export:: Exporting to @LaTeX{}, and processing to PDF * @LaTeX{} and PDF export:: Exporting to @LaTeX{}, and processing to PDF
* DocBook export:: Exporting to DocBook * DocBook export:: Exporting to DocBook
* iCalendar export:: * iCalendar export::
Miscellaneous Miscellaneous
@ -1516,8 +1518,8 @@ projects need to be moved around. Moving completed project trees to an
archive file keeps the system compact and fast. archive file keeps the system compact and fast.
@menu @menu
* Capture:: * Capture::
* Refile and copy:: Moving a tree from one place to another * Refiling notes:: Moving a tree from one place to another
* Archiving:: What to do with finished projects * Archiving:: What to do with finished projects
@end menu @end menu
@ -2288,7 +2290,7 @@ that planning information can be incorporated into desktop calendars.
* HTML export:: Exporting to HTML * HTML export:: Exporting to HTML
* @LaTeX{} and PDF export:: Exporting to @LaTeX{}, and processing to PDF * @LaTeX{} and PDF export:: Exporting to @LaTeX{}, and processing to PDF
* DocBook export:: Exporting to DocBook * DocBook export:: Exporting to DocBook
* iCalendar export:: * iCalendar export::
@end menu @end menu
@node Export options, The export dispatcher, Exporting, Exporting @node Export options, The export dispatcher, Exporting, Exporting