summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-08 11:11:08 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-08 11:11:08 (GMT)
commit6c3ef6226625156066ae7f9dc0d41fbd499f6ae2 (patch)
treef346c0ef8028626185b99b30e1589905f73047eb
parent86737d323e99645dd37134516fec3b813385c409 (diff)
parent2d81219147719317887cdedc5286b1afa5bfb9d1 (diff)
downloadorg-mode-6c3ef6226625156066ae7f9dc0d41fbd499f6ae2.zip
org-mode-6c3ef6226625156066ae7f9dc0d41fbd499f6ae2.tar.gz
Merge branch 'maint'
Conflicts: doc/orgguide.texi
-rw-r--r--doc/orgguide.texi10
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/orgguide.texi b/doc/orgguide.texi
index 7f8a2e2..b86eea9 100644
--- a/doc/orgguide.texi
+++ b/doc/orgguide.texi
@@ -98,6 +98,8 @@ modify this GNU manual.''
* Working With Source Code:: Source code snippets embedded in Org
* Miscellaneous:: All the rest which did not fit elsewhere
+* GNU Free Documentation License:: This manual license.
+
@detailmenu
--- The Detailed Node Listing ---
@@ -207,7 +209,7 @@ Exporting
* HTML export:: Exporting to HTML
* @LaTeX{} and PDF export:: Exporting to @LaTeX{}, and processing to PDF
* DocBook export:: Exporting to DocBook
-* iCalendar export::
+* iCalendar export::
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.
@menu
-* Capture::
-* Refile and copy:: Moving a tree from one place to another
+* Capture::
+* Refiling notes:: Moving a tree from one place to another
* Archiving:: What to do with finished projects
@end menu
@@ -2288,7 +2290,7 @@ that planning information can be incorporated into desktop calendars.
* HTML export:: Exporting to HTML
* @LaTeX{} and PDF export:: Exporting to @LaTeX{}, and processing to PDF
* DocBook export:: Exporting to DocBook
-* iCalendar export::
+* iCalendar export::
@end menu
@node Export options, The export dispatcher, Exporting, Exporting