Improve documentation on inclusion if inactive timestamps.

doc/ChangeLog

@@ -1,3 +1,8 @@
+2009-08-18  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org.texi (Agenda commands): Improve documentation of the keys to
+	include inactive time stamps into the agenda view.
+
 2009-08-14  Dan Davison <davison@stats.ox.ac.uk>  (tiny change)
 
 	* org.texi (Structure editing): Added an index entry for the

doc/org.texi

@@ -6898,37 +6898,6 @@ Display the entire subtree of the current item in an indirect buffer.  With a
 numeric prefix argument N, go up to level N and then take that tree.  If N is
 negative, go up that many levels.  With a @kbd{C-u} prefix, do not remove the
 previously used indirect buffer.
-@c
-@kindex v l
-@kindex l
-@item v l @ @r{or short} @ l
-@vindex org-log-done
-@vindex org-agenda-log-mode-items
-Toggle Logbook mode.  In Logbook mode, entries that were marked DONE while
-logging was on (variable @code{org-log-done}) are shown in the agenda, as are
-entries that have been clocked on that day.  You can configure the entry
-types that should be included in log mode using the variable
-@code{org-agenda-log-mode-items}.  When called with a @kbd{C-u} prefix, show
-all possible logbook entries, including state changes.  When called with two
-prefix args @kbd{C-u C-u}, show only logging information, nothing else.
-@c
-@kindex v a
-@kindex v A
-@item v a
-@itemx v A
-Toggle Archives mode.  In Archives mode, trees that are marked
-@code{ARCHIVED} are also scanned when producing the agenda.  When you use the
-capital @kbd{A}, even all archive files are included.  To exit archives mode,
-press @kbd{v a} again.
-@c
-@kindex R
-@item R
-@vindex org-agenda-start-with-clockreport-mode
-Toggle Clockreport mode.  In Clockreport mode, the daily/weekly agenda will
-always show a table with the clocked times for the timespan and file scope
-covered by the current agenda view.  The initial setting for this mode in new
-agenda buffers can be set with the variable
-@code{org-agenda-start-with-clockreport-mode}.
 
 @tsubheading{Change display}
 @cindex display changing, in agenda
@@ -6961,6 +6930,44 @@ be mapped to the interval 1938-2037.
 @item D
 Toggle the inclusion of diary entries.  See @ref{Weekly/daily agenda}.
 @c
+@kindex v l
+@kindex l
+@item v l @ @r{or short} @ l
+@vindex org-log-done
+@vindex org-agenda-log-mode-items
+Toggle Logbook mode.  In Logbook mode, entries that were marked DONE while
+logging was on (variable @code{org-log-done}) are shown in the agenda, as are
+entries that have been clocked on that day.  You can configure the entry
+types that should be included in log mode using the variable
+@code{org-agenda-log-mode-items}.  When called with a @kbd{C-u} prefix, show
+all possible logbook entries, including state changes.  When called with two
+prefix args @kbd{C-u C-u}, show only logging information, nothing else.
+@c
+@kindex v [
+@kindex [
+@item v [ @ @r{or short} @ [
+Include inactive timestamps into the current view.  Only for weekly/daily
+agenda and timeline views.
+@c
+@kindex v a
+@kindex v A
+@item v a
+@itemx v A
+Toggle Archives mode.  In Archives mode, trees that are marked
+@code{ARCHIVED} are also scanned when producing the agenda.  When you use the
+capital @kbd{A}, even all archive files are included.  To exit archives mode,
+press @kbd{v a} again.
+@c
+@kindex v R
+@kindex R
+@item v R @ @r{or short} @ R
+@vindex org-agenda-start-with-clockreport-mode
+Toggle Clockreport mode.  In Clockreport mode, the daily/weekly agenda will
+always show a table with the clocked times for the timespan and file scope
+covered by the current agenda view.  The initial setting for this mode in new
+agenda buffers can be set with the variable
+@code{org-agenda-start-with-clockreport-mode}.
+@c
 @kindex G
 @item G
 @vindex org-agenda-use-time-grid
@@ -7086,9 +7093,6 @@ add a positive search term prefixed by @samp{+}, indicating that this search
 term @i{must} occur/match in the entry.  The closing bracket/brace will add a
 negative search term which @i{must not} occur/match in the entry for it to be
 selected.
-@item @r{in} weekly/daily agenda @r{or}
-@itemx @r{in} timeline view
-Redisplay with inactive timestamps included.
 @end table
 
 @tsubheading{Remote editing}

doc/orgcard.tex

@@ -633,11 +633,11 @@ after  ``{\tt :}'', and dictionary words elsewhere.
 {\bf Change display}
 
 \key{delete other windows}{o}
+\key{view mode dipatcher}{v}
 \key{switch to day/week/month/year view}{d w vm vy}
-\key{toggle inclusion of diary entries}{D}
-\key{toggle time grid for daily schedule}{G}
-\key{toggle display of logbook entries}{l}
-\key{toggle inclusion of archived trees/files}{v / C-u v}
+\key{toggle diary entries / time grid / clock report}{D / G / R}
+\key{toggle display of logbook entries}{l / v l/L}
+\key{toggle inclusion of archived trees/files}{v a/A}
 \key{refresh agenda buffer with any changes}{r / g}
 \key{filter with repect to a tag}{/}
 \key{save all org-mode buffers}{s}

lisp/org-agenda.el

@@ -5051,7 +5051,7 @@ With prefix ARG, go backward that many times the current span."
   "Call one of the view mode commands."
   (interactive)
   (message "View: [d]ay [w]eek [m]onth [y]ear [l]og [L]og-all [a]rch-trees [A]rch-files
-       clock[R]eport          time[G]rid                include[D]iary")
+       clock[R]eport      time[G]rid      [[]inactive      include[D]iary")
   (let ((a (read-char-exclusive)))
     (case a
       (?d (call-interactively 'org-agenda-day-view))
@@ -5064,6 +5064,10 @@ With prefix ARG, go backward that many times the current span."
       (?R (call-interactively 'org-agenda-clockreport-mode))
       (?G (call-interactively 'org-agenda-toggle-time-grid))
       (?D (call-interactively 'org-agenda-toggle-diary))
+      (?\[ (let ((org-agenda-include-inactive-timestamps t))
+	     (org-agenda-check-type t 'timeline 'agenda)
+	     (org-agenda-redo))
+	   (message "Display now includes inactive timestamps as well"))
       (?q (message "Abort"))
       (otherwise (error "Invalid key" )))))