2009-02-02 Carsten Dominik <dominik@science.uva.nl>

	* org.texi (Structure editing, Handling links)
	(Fast access to TODO states, Javascript support): Make standard docs
	correctly reflect default variable settings.

2 files changed, 24 insertions, 17 deletions

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 7659efeb9e6..d67f4d3a1b8 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-02  Carsten Dominik  <dominik@science.uva.nl>
+
+        * org.texi (Structure editing, Handling links)
+        (Fast access to TODO states, Javascript support): Make standard docs
+        correctly reflect default variable settings.
+
 2009-02-02  Glenn Morris  <rgm@gnu.org>
 
         * org.texi: Fix typos.
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index 69381ae6295..102f8bcf6a0 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -3,8 +3,8 @@
 @setfilename ../../info/org
 @settitle The Org Manual
 
-@set VERSION 6.20h
-@set DATE January 2009
+@set VERSION 6.21b
+@set DATE February 2009
 
 @dircategory Emacs
 @direntry
@@ -968,12 +968,13 @@ headline marker like @samp{****}.
 Depending on the variables @code{org-yank-adjusted-subtrees} and
 @code{org-yank-folded-subtrees}, Org's internal @code{yank} command will
 paste subtrees folded and in a clever way, using the same command as @kbd{C-c
-C-x C-y}.  With the default settings, level adjustment will take place and
-yanked trees will be folded unless doing so would swallow text previously
-visible.  Any prefix argument to this command will force a normal @code{yank}
-to be executed, with the prefix passed along.  A good way to force a normal
-yank is @kbd{C-u C-y}.  If you use @code{yank-pop} after a yank, it will yank
-previous kill items plainly, without adjustment and folding.
+C-x C-y}.  With the default settings, no level adjustment will take place,
+but the yanked tree will be folded unless doing so would swallow text
+previously visible.  Any prefix argument to this command will force a normal
+@code{yank} to be executed, with the prefix passed along.  A good way to
+force a normal yank is @kbd{C-u C-y}.  If you use @code{yank-pop} after a
+yank, it will yank previous kill items plainly, without adjustment and
+folding.
 @kindex C-c C-w
 @item C-c C-w
 Refile entry or region to a different location.  @xref{Refiling notes}.
@@ -2794,7 +2795,8 @@ link and description parts of the link.
 @c
 @cindex following links
 @kindex C-c C-o
-@item C-c C-o
+@kindex RET
+@item C-c C-o @r{or} @key{RET}
 Open link at point.  This will launch a web browser for URLs (using
 @command{browse-url-at-point}), run VM/MH-E/Wanderlust/Rmail/Gnus/BBDB for
 the corresponding links, and execute the command in a shell link.  When the
@@ -3231,15 +3233,13 @@ key after each keyword, in parenthesis.  For example:
         (sequence "|" "CANCELED(c)")))
 @end lisp
 
-If you then press @code{C-u C-c C-t} followed by the selection key, the
-entry will be switched to this state.  @key{SPC} can be used to remove
-any TODO keyword from an entry.  Should you like this way of selecting
-TODO states a lot, you might want to set the variable
-@code{org-use-fast-todo-selection} to @code{t} and make this behavior
-the default.  Check also the variable
+If you then press @code{C-c C-t} followed by the selection key, the entry
+will be switched to this state.  @key{SPC} can be used to remove any TODO
+keyword from an entry.@footnote{Check also the variable
 @code{org-fast-tag-selection-include-todo}, it allows to change the TODO
-state through the tags interface (@pxref{Setting tags}), in case you
-like to mingle the two concepts.
+state through the tags interface (@pxref{Setting tags}), in case you like to
+mingle the two concepts.  Note that this means you need to come up with
+unique keys across both sets of keywords.}
 
 @node Per-file keywords, Faces for TODO keywords, Fast access to TODO states, TODO extensions
 @subsection Setting up keywords for individual files
@@ -8174,6 +8174,7 @@ tdepth:  @r{The depth of the table of contents.  The defaults are taken from}
 ftoc:    @r{Does the css of the page specify a fixed position for the toc?}
          @r{If yes, the toc will never be displayed as a section.}
 ltoc:    @r{Should there be short contents (children) in each section?}
+         @r{Make this @code{above} it the section should be above initial text.}
 mouse:   @r{Headings are highlighted when the mouse is over them.  Should be}
          @r{@samp{underline} (default) or a background color like @samp{#cccccc}.}
 buttons: @r{Should view-toggle buttons be everywhere?  When @code{nil} (the}