Browse Source

Release 4.46

Carsten Dominik 17 years ago
parent
commit
5b35e5ae66
6 changed files with 1266 additions and 733 deletions
  1. 513 294
      org
  2. 375 273
      org.el
  3. BIN
      org.pdf
  4. 371 161
      org.texi
  5. BIN
      orgcard.pdf
  6. 7 5
      orgcard.tex

+ 513 - 294
org

@@ -2,10 +2,10 @@ This is org, produced by makeinfo version 4.8 from org.texi.
 
 INFO-DIR-SECTION Emacs
 START-INFO-DIR-ENTRY
-* Org Mode: (org).	outline-based notes management and organizer
+* Org Mode: (org).      outline-based notes management and organizer
 END-INFO-DIR-ENTRY
 
-   This manual is for Org-mode (version 4.45).
+   This manual is for Org-mode (version 4.46).
 
    Copyright (C) 2004, 2005, 2006 Free Software Foundation
 
@@ -27,7 +27,7 @@ File: org,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
 Org Mode Manual
 ***************
 
-This manual is for Org-mode (version 4.45).
+This manual is for Org-mode (version 4.46).
 
    Copyright (C) 2004, 2005, 2006 Free Software Foundation
 
@@ -159,15 +159,26 @@ Agenda Views
 * Global TODO list::            All unfinished action items
 * Matching headline tags::      Structured information with fine-tuned search
 * Timeline::                    Time-sorted view for single file
+* Presentation and sorting::    How agenda items are prepared for display
 * Agenda commands::             Remote editing of org trees
+* Custom agenda views::         Defining special searches and views
 
 The weekly/daily agenda
 
+* Calendar/Diary integration::  Integrating Anniversaries and more
+
+Presentation and sorting
+
 * Categories::                  Not all tasks are equal
 * Time-of-day specifications::  How the agenda knows the time
-* Calendar/Diary integration::  Integrating Anniversaries and more
 * Sorting of agenda items::     The order of things
 
+Custom agenda views
+
+* Storing searches::            Type once, use often
+* Block agenda::                All the stuff you need in a single buffer
+* Setting Options::             Changing the rules
+
 Embedded LaTeX
 
 * Math symbols::                TeX macros for symbols and Greek letters
@@ -856,7 +867,7 @@ horizontal separator line and will be expanded on the next re-align to
 span the whole table width.  So, to create the above table, you would
 only type
 
-     |Name|Phone|Age
+     |Name|Phone|Age|
      |-
 
 and then press <TAB> to align the table and start filling in fields.
@@ -2081,9 +2092,8 @@ by starting it with the string `[ ]'.  This feature is similar to TODO
 items (*note TODO items::), but more lightweight.  Checkboxes are not
 included into the global TODO list, so they are often great to split a
 task into a number of simple steps.  Or you can use them in a shopping
-list to select the items you need to buy.  To toggle a checkbox, use
-`C-c C-c', or try Piotr Zielinski's `org-mouse.el'.  Here is an example
-of a checkbox list.
+list.  To toggle a checkbox, use `C-c C-c', or try Piotr Zielinski's
+`org-mouse.el'.  Here is an example of a checkbox list.
 
      * TODO Organize party [3/6]
        - call people [1/3]
@@ -2104,7 +2114,7 @@ headline/item.  You have to insert the cookie yourself by typing either
 `[/]' or `[%]'.  In the first case you get an `n out of m' result, in
 the second case you get information about the percentage of checkboxes
 checked (in the above example, this would be `[50%]' and `[33%],
-respectively'.
+respectively').
 
 The following commands work with checkboxes:
 
@@ -2119,8 +2129,8 @@ The following commands work with checkboxes:
           independently, use a prefix argument.
 
         - If the cursor is in a headline, toggle checkboxes in the
-          region between this headline and the next.  This does _not_
-          act on the entire subtree, just the current entry.
+          region between this headline and the next (so _not_ the
+          entire subtree).
 
         - If no active region, just toggle the checkbox at point.
      
@@ -2611,15 +2621,21 @@ are important for a particular date, this information must be collected,
 sorted and displayed in an organized way.
 
    Org-mode can select items based on various criteria, and display them
-in a separate buffer.  Three different views are provided:
+in a separate buffer.  Five different view types are provided:
 
    * an _agenda_ that is like a calendar and shows information for
      specific dates
 
-   * a _TODO list_ that covers all unfinished action items, and
+   * a _TODO list_ that covers all unfinished action items,
 
    * a _tags view_ that shows information based on the tags associated
-     with headlines in the outline tree.
+     with headlines in the outline tree,
+
+   * a _timeline view_ that shows all events in a single Org-mode file,
+     in time-sorted view
+
+   * _custom views_ that are special tag and keyword searches and
+     combinations of different views.
 
 The extracted information is displayed in a special _agenda buffer_.
 This buffer is read-only, but provides commands to visit the
@@ -2634,7 +2650,9 @@ edit these files remotely.
 * Global TODO list::            All unfinished action items
 * Matching headline tags::      Structured information with fine-tuned search
 * Timeline::                    Time-sorted view for single file
+* Presentation and sorting::    How agenda items are prepared for display
 * Agenda commands::             Remote editing of org trees
+* Custom agenda views::         Defining special searches and views
 
 
 File: org,  Node: Agenda files,  Next: Agenda dispatcher,  Prev: Agenda views,  Up: Agenda views
@@ -2668,7 +2686,7 @@ visit any of them.
 name, then the list of agenda files will be maintained in that external
 file.
 
-   (2) When using the dispatcher pressing `1' before selecting a
+   (2) When using the dispatcher, pressing `1' before selecting a
 command will actually limit the command to the current file, and ignore
 `org-agenda-files' until the next dispatcher command.
 
@@ -2694,31 +2712,24 @@ command.  The dispatcher offers the following default commands:
      Create a list of headlines matching a TAGS expression (*note
      Matching headline tags::).
 
-   You can also define custom commands that will be accessible through
-the dispatcher, just like the default commands.  Custom commands are
-global searches for tags and specific TODO keywords, or a variety of
-sparse tree creating commands (*note Sparse trees::).  As sparse trees
-are only defined for a single org-mode file, these latter commands act
-on the current buffer instead of the list of agenda files.
+`L'
+     Create the timeline view for the current buffer (*note Timeline::).
 
-   Custom commands are configured in the variable
-`org-agenda-custom-commands'.  You can customize this variable, for
-example by pressing `C-c a C'.  You can also directly set it with Emacs
-Lisp in `.emacs'.  For example:
+`1'
+     Restrict an agenda command to the current buffer.  After pressing
+     `1', you still need to press the character selecting the command.
 
-     (setq org-agenda-custom-commands
-           '(("w" todo "WAITING")
-             ("u" tags "+BOSS-URGENT")
-             ("U" tags-tree "+BOSS-URGENT")
-             ("f" occur-tree "\\<FIXME\\>")))
+`0'
+     If there is an active region, restrict the following agenda
+     command to the region.  Otherwise, restrict it to the current
+     subtree.  After pressing `0', you still need to press the
+     character selecting the command.
 
-will define `C-c a w' as a global search for TODO entries with
-`WAITING' as the TODO keyword, `C-c a u' as a global tags search for
-headlines marked `:BOSS:' but not `:URGENT:', `C-c a U' to do the same
-search but only in the current buffer and display the result as a
-sparse tree, and `C-c a f' to create a sparse tree with all entries
-containing the word `FIXME'.  For more information, look at the
-documentation string of the variable `org-agenda-custom-commands'.
+   You can also define custom commands that will be accessible through
+the dispatcher, just like the default commands.  This includes the
+possibility to create extended agenda buffers that contain several
+blocks together, for example the weekly agenda, the global TODO list and
+a number of special tags matches.  *Note Custom agenda views::.
 
 
 File: org,  Node: Weekly/Daily agenda,  Next: Global TODO list,  Prev: Agenda dispatcher,  Up: Agenda views
@@ -2743,77 +2754,12 @@ buffer.  The commands available in the Agenda buffer are listed in
 
 * Menu:
 
-* Categories::                  Not all tasks are equal
-* Time-of-day specifications::  How the agenda knows the time
 * Calendar/Diary integration::  Integrating Anniversaries and more
-* Sorting of agenda items::     The order of things
-
-
-File: org,  Node: Categories,  Next: Time-of-day specifications,  Prev: Weekly/Daily agenda,  Up: Weekly/Daily agenda
-
-8.3.1 Categories
-----------------
-
-In the agenda buffer, each entry is preceded by a _category_, which is
-derived from the file name.  The category can also be set with a
-special line anywhere in the buffer, looking like this:
-
-     #+CATEGORY: Thesis
-
-   If there are several such lines in a file, each specifies the
-category for the text below it (but the first category also applies to
-any text before the first CATEGORY line).  The display in the agenda
-buffer looks best if the category is not longer than 10 characters.
 
 
-File: org,  Node: Time-of-day specifications,  Next: Calendar/Diary integration,  Prev: Categories,  Up: Weekly/Daily agenda
+File: org,  Node: Calendar/Diary integration,  Prev: Weekly/Daily agenda,  Up: Weekly/Daily agenda
 
-8.3.2 Time-of-Day Specifications
---------------------------------
-
-Org-mode checks each agenda item for a time-of-day specification.  The
-time can be part of the time stamp that triggered inclusion into the
-agenda, for example as in `<2005-05-10 Tue 19:00>'.  Time ranges can be
-specified with two time stamps, like
-`<2005-05-10 Tue 20:30>--<2005-05-10 Tue 22:15>'.
-
-   In the headline of the entry itself, a time(range) may also appear as
-plain text (like `12:45' or a `8:30-1pm'.  If the agenda integrates the
-Emacs diary (*note Calendar/Diary integration::), time specifications
-in diary entries are recognized as well.
-
-   For agenda display, Org-mode extracts the time and displays it in a
-standard 24 hour format as part of the prefix.  The example times in
-the previous paragraphs would end up in the agenda like this:
-
-         8:30-13:00 Arthur Dent lies in front of the bulldozer
-        12:45...... Ford Prefect arrives and takes Arthur to the pub
-        19:00...... The Vogon reads his poem
-        20:30-22:15 Marwin escorts the Hitchhikers to the bridge
-
-   If the agenda is in single-day mode, or for the display of today, the
-timed entries are embedded in a time grid, like
-
-         8:00...... ------------------
-         8:30-13:00 Arthur Dent lies in front of the bulldozer
-        10:00...... ------------------
-        12:00...... ------------------
-        12:45...... Ford Prefect arrives and takes Arthur to the pub
-        14:00...... ------------------
-        16:00...... ------------------
-        18:00...... ------------------
-        19:00...... The Vogon reads his poem
-        20:00...... ------------------
-        20:30-22:15 Marwin escorts the Hitchhikers to the bridge
-
-   The time grid can be turned on and off with the variable
-`org-agenda-use-time-grid', and can be configured with
-`org-agenda-time-grid'.
-
-
-File: org,  Node: Calendar/Diary integration,  Next: Sorting of agenda items,  Prev: Time-of-day specifications,  Up: Weekly/Daily agenda
-
-8.3.3 Calendar/Diary integration
+8.3.1 Calendar/Diary integration
 --------------------------------
 
 Emacs contains the calendar and diary by Edward M. Reingold.  The
@@ -2839,26 +2785,6 @@ date works in the agenda buffer, as well as the commands `S', `M', and
 to other calendars, respectively.  `c' can be used to switch back and
 forth between calendar and agenda.
 
-
-File: org,  Node: Sorting of agenda items,  Prev: Calendar/Diary integration,  Up: Weekly/Daily agenda
-
-8.3.4 Sorting of agenda items
------------------------------
-
-The entries for each day are sorted.  The default order is to first
-collect all items containing an explicit time-of-day specification.
-These entries will be shown at the beginning of the list, as a
-_schedule_ for the day.  After that, items remain grouped in
-categories, in the sequence given by `org-agenda-files'.  Within each
-category, items are sorted by priority (*note Priorities::).
-
-   The priority is a numerical quantity composed of the base priority
-(2000 for priority `A', 1000 for `B', and 0 for `C'), plus additional
-increments for overdue scheduled or deadline items.
-
-   Sorting can be customized using the variable
-`org-agenda-sorting-strategy'.
-
 
 File: org,  Node: Global TODO list,  Next: Matching headline tags,  Prev: Weekly/Daily agenda,  Up: Agenda views
 
@@ -2890,7 +2816,7 @@ collected into a single place.
 TODO entry with a single key press.  The commands available in the TODO
 list are described in *Note Agenda commands::.
 
-   Nomally the global todo list simply shows all headlines with TODO
+   Normally the global todo list simply shows all headlines with TODO
 keywords.  This list can become very long.  There are two ways to keep
 it more compact:
    - Some people view a TODO item that has been _scheduled_ for
@@ -2923,25 +2849,22 @@ collect them into an agenda buffer.
 `C-c a M'
      Like `C-c a m', but only select headlines that are also TODO items
      and force checking subitems (see variable
-     `org-tags-match-list-sublevels'.
+     `org-tags-match-list-sublevels').
 
    The commands available in the tags list are described in *Note
 Agenda commands::.
 
 
-File: org,  Node: Timeline,  Next: Agenda commands,  Prev: Matching headline tags,  Up: Agenda views
+File: org,  Node: Timeline,  Next: Presentation and sorting,  Prev: Matching headline tags,  Up: Agenda views
 
 8.6 Timeline for a single file
 ==============================
 
-The timeline is not really an agenda view, because it only summarizes
-items from a single Org-mode file.  But it also uses the agenda buffer
-and provides similar commands, so we discuss it here.  The timeline
-shows all time-stamped items in a single Org-mode file (or the selected
-part of it), in a _time-sorted view_.  The main purpose of this command
-is to give an overview over events in a project.
+The timeline summarizes all time-stamped items from a single Org-mode
+file in a _time-sorted view_.  The main purpose of this command is to
+give an overview over events in a project.
 
-`C-c C-r'
+`C-c a L'
      Show a time-sorted view of the org file, with all time-stamped
      items.  When called with a `C-u' prefix, all unfinished TODO
      entries (scheduled or not) are also listed under the current date.
@@ -2950,9 +2873,119 @@ The commands available in the timeline buffer are listed in *Note
 Agenda commands::.
 
 
-File: org,  Node: Agenda commands,  Prev: Timeline,  Up: Agenda views
+File: org,  Node: Presentation and sorting,  Next: Agenda commands,  Prev: Timeline,  Up: Agenda views
+
+8.7 Presentation and sorting
+============================
+
+Before displaying items in an agenda view, Org-mode visually prepares
+the items and sorts them.  Each item occupies a single line.  The line
+starts with a _prefix_ that contains the _category_ (*note
+Categories::) of the item and other important information.  You can
+customize the prefix using the option `org-agenda-prefix-format'.  The
+prefix is followed by a cleaned-up version of the outline headline
+associated with the item.
+
+* Menu:
+
+* Categories::                  Not all tasks are equal
+* Time-of-day specifications::  How the agenda knows the time
+* Sorting of agenda items::     The order of things
+
+
+File: org,  Node: Categories,  Next: Time-of-day specifications,  Prev: Presentation and sorting,  Up: Presentation and sorting
+
+8.7.1 Categories
+----------------
+
+The category is a broad label assigned to each agenda item.  By default,
+the category is simply derived from the file name, but you can also
+specify it with a special line in the buffer, like this:
+
+     #+CATEGORY: Thesis
+
+   If there are several such lines in a file, each specifies the
+category for the text below it (but the first category also applies to
+any text before the first CATEGORY line).  The display in the agenda
+buffer looks best if the category is not longer than 10 characters.
+
+
+File: org,  Node: Time-of-day specifications,  Next: Sorting of agenda items,  Prev: Categories,  Up: Presentation and sorting
+
+8.7.2 Time-of-Day Specifications
+--------------------------------
+
+Org-mode checks each agenda item for a time-of-day specification.  The
+time can be part of the time stamp that triggered inclusion into the
+agenda, for example as in `<2005-05-10 Tue 19:00>'.  Time ranges can be
+specified with two time stamps, like
+`<2005-05-10 Tue 20:30>--<2005-05-10 Tue 22:15>'.
+
+   In the headline of the entry itself, a time(range) may also appear as
+plain text (like `12:45' or a `8:30-1pm'.  If the agenda integrates the
+Emacs diary (*note Calendar/Diary integration::), time specifications
+in diary entries are recognized as well.
+
+   For agenda display, Org-mode extracts the time and displays it in a
+standard 24 hour format as part of the prefix.  The example times in
+the previous paragraphs would end up in the agenda like this:
+
+         8:30-13:00 Arthur Dent lies in front of the bulldozer
+        12:45...... Ford Prefect arrives and takes Arthur to the pub
+        19:00...... The Vogon reads his poem
+        20:30-22:15 Marwin escorts the Hitchhikers to the bridge
+
+   If the agenda is in single-day mode, or for the display of today, the
+timed entries are embedded in a time grid, like
+
+         8:00...... ------------------
+         8:30-13:00 Arthur Dent lies in front of the bulldozer
+        10:00...... ------------------
+        12:00...... ------------------
+        12:45...... Ford Prefect arrives and takes Arthur to the pub
+        14:00...... ------------------
+        16:00...... ------------------
+        18:00...... ------------------
+        19:00...... The Vogon reads his poem
+        20:00...... ------------------
+        20:30-22:15 Marwin escorts the Hitchhikers to the bridge
+
+   The time grid can be turned on and off with the variable
+`org-agenda-use-time-grid', and can be configured with
+`org-agenda-time-grid'.
+
+
+File: org,  Node: Sorting of agenda items,  Prev: Time-of-day specifications,  Up: Presentation and sorting
+
+8.7.3 Sorting of agenda items
+-----------------------------
+
+Before being inserted into a view, the items are sorted.  How this is
+done depends on the type of view.
+   * For the daily/weekly agenda, the items for each day are sorted.
+     The default order is to first collect all items containing an
+     explicit time-of-day specification.  These entries will be shown
+     at the beginning of the list, as a _schedule_ for the day.  After
+     that, items remain grouped in categories, in the sequence given by
+     `org-agenda-files'.  Within each category, items are sorted by
+     priority (*note Priorities::), which is composed of the base
+     priority (2000 for priority `A', 1000 for `B', and 0 for `C'),
+     plus additional increments for overdue scheduled or deadline items.
+
+   * For the TODO list, items remain in the order of categories, but
+     within each category, sorting takes place according to priority
+     (*note Priorities::).
+
+   * For tags matches, items are not sorted at all, but just appear in
+     the sequence in which they are found in the agenda files.
 
-8.7 Commands in the agenda buffer
+   Sorting can be customized using the variable
+`org-agenda-sorting-strategy'.
+
+
+File: org,  Node: Agenda commands,  Next: Custom agenda views,  Prev: Presentation and sorting,  Up: Agenda views
+
+8.8 Commands in the agenda buffer
 =================================
 
 Entries in the agenda buffer are linked back to the org file or diary
@@ -3166,6 +3199,163 @@ Quit and Exit
      user to visit org files will not be removed.
 
 
+
+File: org,  Node: Custom agenda views,  Prev: Agenda commands,  Up: Agenda views
+
+8.9 Custom agenda views
+=======================
+
+Custom agenda commands serve two purposes: to store and quickly access
+frequently used TODO and tags searches, and to create special composite
+agenda buffers.  Custom agenda commands will be accessible through the
+dispatcher (*note Agenda dispatcher::), just like the default commands.
+
+* Menu:
+
+* Storing searches::            Type once, use often
+* Block agenda::                All the stuff you need in a single buffer
+* Setting Options::             Changing the rules
+
+
+File: org,  Node: Storing searches,  Next: Block agenda,  Prev: Custom agenda views,  Up: Custom agenda views
+
+8.9.1 Storing searches
+----------------------
+
+The first application of custom searches is the definition of keyboard
+shortcuts for frequently used searches, either creating an agenda
+buffer, or a sparse tree (the latter covering of course only the current
+buffer).  Custom commands are configured in the variable
+`org-agenda-custom-commands'.  You can customize this variable, for
+example by pressing `C-c a C'.  You can also directly set it with Emacs
+Lisp in `.emacs'.  The following example contains all valid search
+types:
+
+     (setq org-agenda-custom-commands
+           '(("w" todo "WAITING")
+             ("W" todo-tree "WAITING")
+             ("u" tags "+BOSS-URGENT")
+             ("v" tags-todo "+BOSS-URGENT")
+             ("U" tags-tree "+BOSS-URGENT")
+             ("f" occur-tree "\\<FIXME\\>")))
+
+The initial single-character string in each entry defines the character
+you have to press after the dispatcher command `C-c a' in order to
+access the command.   The second parameter is the search type, followed
+by the string or regular expression to be used for the matching.  The
+example above will therefore define:
+
+`C-c a w'
+     as a global search for TODO entries with `WAITING' as the TODO
+     keyword
+
+`C-c a W'
+     as the same search, but only in the current buffer and displaying
+     the results as a sparse tree
+
+`C-c a u'
+     as a global tags search for headlines marked `:BOSS:' but not
+     `:URGENT:'
+
+`C-c a v'
+     as the same search as `C-c a u', but limiting the search to
+     headlines that are also TODO items
+
+`C-c a U'
+     as the same search as `C-c a u', but only in the current buffer and
+     displaying the result as a sparse tree
+
+`C-c a f'
+     to create a sparse tree (again: current buffer only) with all
+     entries containing the word `FIXME'.
+
+
+File: org,  Node: Block agenda,  Next: Setting Options,  Prev: Storing searches,  Up: Custom agenda views
+
+8.9.2 Block agenda
+------------------
+
+Another possibility is the construction of agenda views that comprise
+the results of _several_ commands, each of which creates a block in the
+agenda buffer.  The available commands include `agenda' for the daily
+or weekly agenda (as created with `C-c a a'), `alltodo' for the global
+todo list (as constructed with `C-c a t'), and the matching commands
+discussed above: `todo', `tags', and `tags-todo'.  Here are two
+examples:
+
+     (setq org-agenda-custom-commands
+           '(("h" "Agenda and Home-related tasks"
+              ((agenda)
+               (tags-todo "HOME")
+               (tags "GARDEN")))
+             ("o" "Agenda and Office-related tasks"
+              ((agenda)
+               (tags-todo "WORK")
+               (tags "OFFICE")))))
+
+This will define `C-c a h' to create a multi-block view for stuff you
+need to attend to at home.  The resulting agenda buffer will contain
+your agenda for the current week, all TODO items that carry the tag
+`HOME', and also all lines tagged with `GARDEN'.  Finally the command
+`C-c a o' provides a similar view for office tasks.
+
+
+File: org,  Node: Setting Options,  Prev: Block agenda,  Up: Custom agenda views
+
+8.9.3 Setting Options for custom commands
+-----------------------------------------
+
+Org-mode contains a number of variables regulating agenda construction
+and display.  The global variables define the behavior for all agenda
+commands, including the custom commands.  However, if you want to change
+some settings just for a single custom view, you can do so.  Setting
+options requires inserting a list of variable names and values at the
+right spot in `org-agenda-custom-commands'.  For example:
+
+     (setq org-agenda-custom-commands
+           '(("w" todo "WAITING"
+              ((org-agenda-sorting-strategy '(priority-down))
+               (org-agenda-prefix-format "  Mixed: ")))
+             ("U" tags-tree "+BOSS-URGENT"
+              ((org-show-following-heading nil)
+               (org-show-hierarchy-above nil)))))
+
+Now the `C-c a w' command will sort the collected entries only by
+priority, and the prefix format is modified to just say `  Mixed:'
+instead of giving the category of the entry.  The sparse tags tree of
+`C-c a U' will now turn out ultra-compact, because neither the headline
+hierarchy above the match, nor the headline following the match will be
+shown.
+
+   For command sets creating a block agenda,
+`org-agenda-custom-commands' has two separate spots for setting
+options.  You can add options that should be valid for just a single
+command in the set, and options that should be valid for all commands in
+the set.  The former are just added to the command entry, the latter
+must come after the list of command entries.  Going back to the block
+agenda example (*note Block agenda::), let's change the sorting strategy
+for the `C-c a h' commands to `priority-down', but let's sort the
+results for GARDEN tags query in the opposite order, `priority-up'.
+This would look like this:
+
+     (setq org-agenda-custom-commands
+           '(("h" "Agenda and Home-related tasks"
+              ((agenda)
+               (tags-todo "HOME")
+               (tags "GARDEN" ((org-agenda-sorting-strategy '(priority-up)))))
+              ((org-agenda-sorting-strategy '(priority-down))))
+             ("o" "Agenda and Office-related tasks"
+              ((agenda)
+               (tags-todo "WORK")
+               (tags "OFFICE")))))
+
+   As you see, the values and parenthesis setting is a little complex.
+When in doubt, use the customize interface to set this variable - it
+fully supports its structure.  Just one caveat: When setting options in
+this interface, the _values_ are just lisp expressions.  So if the
+value is a string, you need to add the double quotes around the value
+yourself.
+
 
 File: org,  Node: Embedded LaTeX,  Next: Exporting,  Prev: Agenda views,  Up: Top
 
@@ -4035,16 +4225,23 @@ buffer and use the key to complete text right there.
 
         * After `\', complete TeX symbols supported by the exporter.
 
-        * After `*', complete CamelCase versions of all headlines in the
-          buffer.
+        * After `*', complete headlines in the current buffer so that
+          they can be used in search links like `[[*find this
+          headline]]'.
 
-        * After `:', complete tags used elsewhere in the buffer.
+        * After `:', complete tags.  The list of tags is taken from the
+          variable `org-tag-alist' (possibly set through the `#+TAGS'
+          in-buffer option, *note Setting tags::), or it is created
+          dynamically from all tags used in the current buffer.
 
         * After `#+', complete the special keywords like `TYP_TODO' or
           `OPTIONS' which set file-specific options for Org-mode.  When
           the option keyword is already complete, pressing `M-<TAB>'
           again will insert example settings for this keyword.
 
+        * In the line after `#+STARTUP: ', complete startup keywords,
+          i.e. valid keys for this line.
+
         * Elsewhere, complete dictionary words using ispell.
 
 
@@ -4520,7 +4717,7 @@ The corresponding block writer function could look like this:
      (defun org-dblock-write:block-update-time (params)
         (let ((fmt (or (plist-get params :format) "%d. %m. %Y")))
           (insert "Last block update at: "
-     	     (format-time-string fmt (current-time)))))
+                  (format-time-string fmt (current-time)))))
 
    If you want to make sure that all dynamic blocks are always
 up-to-date, you could add the function `org-update-all-dblocks' to a
@@ -4571,7 +4768,7 @@ if I have forgotten someone, please accept my apologies and let me know.
 
    * Sacha Chua suggested to copy some linking code from Planner.
 
-   * Eddward DeVilla proposed Checkbox statistics.
+   * Eddward DeVilla proposed and tested checkbox statistics.
 
    * Kees Dullemond inspired the use of narrowed tabled columns.
 
@@ -4603,7 +4800,8 @@ if I have forgotten someone, please accept my apologies and let me know.
    * Scott Otterson sparked the introduction of descriptive text for
      links, among other things.
 
-   * Pete Phillips helped the development of the TAGS feature.
+   * Pete Phillips helped during the development of the TAGS feature,
+     and provided frequent feedback.
 
    * T.V. Raman reported bugs and suggested improvements.
 
@@ -4652,8 +4850,8 @@ if I have forgotten someone, please accept my apologies and let me know.
    * Roland Winkler requested additional keybindings to make Org-mode
      work on a tty.
 
-   * Piotr Zielinski wrote `org-mouse.el' and showed how to follow
-     links with mouse-1.
+   * Piotr Zielinski wrote `org-mouse.el', proposed angenda blocks and
+     contributed various ideas and code snippets.
 
 
 File: org,  Node: Index,  Next: Key Index,  Prev: History and Acknowledgments,  Up: Top
@@ -4674,11 +4872,12 @@ Index
                                                               (line 165)
 * active region:                         Structure editing.   (line  51)
 * agenda:                                Weekly/Daily agenda. (line   6)
-* agenda commands, custom:               Agenda dispatcher.   (line   6)
 * agenda dispatcher:                     Agenda dispatcher.   (line   6)
+* agenda files:                          Agenda files.        (line   6)
 * agenda files, removing buffers:        Agenda commands.     (line 211)
 * agenda views:                          Agenda views.        (line   6)
-* agenda, for single file:               Timeline.            (line   6)
+* agenda views, custom:                  Custom agenda views. (line   6)
+* agenda, with block views:              Block agenda.        (line   6)
 * allout.el:                             Conflicts.           (line   6)
 * angular brackets, around links:        External links.      (line  38)
 * applescript, for calendar update:      iCalendar export.    (line  38)
@@ -4688,6 +4887,7 @@ Index
 * author:                                Feedback.            (line   6)
 * autoload:                              Activation.          (line   6)
 * BBDB links:                            External links.      (line   6)
+* block agenda:                          Block agenda.        (line   6)
 * bold text:                             Enhancing text.      (line  15)
 * bug reports:                           Feedback.            (line   6)
 * bugs:                                  Bugs.                (line   6)
@@ -4696,6 +4896,7 @@ Index
 * calculations, in tables <1>:           Table calculations.  (line   6)
 * calculations, in tables:               Built-in table editor.
                                                               (line 135)
+* calendar commands, from agenda:        Agenda commands.     (line 172)
 * calendar integration:                  Calendar/Diary integration.
                                                               (line   6)
 * calendar, for selecting date:          Creating timestamps. (line  71)
@@ -4704,7 +4905,7 @@ Index
 * CamelCase links, completion of:        CamelCase links.     (line   6)
 * category:                              Categories.          (line   6)
 * cdlatex.el:                            Cooperation.         (line  29)
-* checkbox statistics:                   Checkboxes.          (line  24)
+* checkbox statistics:                   Checkboxes.          (line  23)
 * checkboxes:                            Checkboxes.          (line   6)
 * children, subtree visibility state:    Visibility cycling.  (line  10)
 * clean outline view:                    Clean view.          (line   6)
@@ -4732,12 +4933,13 @@ Index
 * copying, of subtrees:                  Structure editing.   (line   6)
 * creating timestamps:                   Creating timestamps. (line   6)
 * CUA.el:                                Conflicts.           (line  15)
-* custom agenda commands:                Agenda dispatcher.   (line   6)
+* custom agenda views:                   Custom agenda views. (line   6)
 * custom search strings:                 Custom searches.     (line   6)
 * customization:                         Customization.       (line   6)
 * cutting, of subtrees:                  Structure editing.   (line   6)
 * cycling, of TODO states:               TODO basics.         (line  13)
 * cycling, visibility:                   Visibility cycling.  (line   6)
+* daily agenda:                          Weekly/Daily agenda. (line   6)
 * date stamps:                           Time stamps.         (line   6)
 * date, reading in minibuffer:           Creating timestamps. (line  71)
 * DEADLINE keyword:                      Time stamps.         (line  43)
@@ -4750,6 +4952,7 @@ Index
 * directories, for publishing:           Sources and destinations.
                                                               (line   6)
 * dispatching agenda commands:           Agenda dispatcher.   (line   6)
+* display changing, in agenda:           Agenda commands.     (line  59)
 * document structure:                    Document structure.  (line   6)
 * DONE, final TODO keyword:              Per file keywords.   (line  20)
 * editing tables:                        Tables.              (line   6)
@@ -4847,6 +5050,7 @@ Index
 * MH-E links:                            External links.      (line   6)
 * minor mode for tables:                 orgtbl-mode.         (line   6)
 * mode, for calc:                        Formula syntax.      (line  34)
+* motion commands in agenda:             Agenda commands.     (line  19)
 * motion, between headlines:             Motion.              (line   6)
 * name, of column or field:              Formula syntax.      (line  26)
 * named field formula:                   Named-field formulas.
@@ -4855,6 +5059,7 @@ Index
 * narrow columns in tables:              Narrow columns.      (line   6)
 * occur, command:                        Sparse trees.        (line   6)
 * option keyword completion:             Completion.          (line   6)
+* options, for custom agenda views:      Setting Options.     (line   6)
 * options, for customization:            Customization.       (line   6)
 * options, for export:                   Export options.      (line   6)
 * options, for publishing:               Publishing options.  (line   6)
@@ -4876,6 +5081,8 @@ Index
 * per file keywords:                     Per file keywords.   (line   6)
 * plain lists:                           Plain lists.         (line   6)
 * plain text external links:             External links.      (line  38)
+* presentation, of agenda items:         Presentation and sorting.
+                                                              (line   6)
 * printing sparse trees:                 Sparse trees.        (line  39)
 * priorities:                            Priorities.          (line   6)
 * priorities, of agenda items:           Sorting of agenda items.
@@ -4894,6 +5101,7 @@ Index
 * region, active:                        Structure editing.   (line  51)
 * remember.el <1>:                       Cooperation.         (line  33)
 * remember.el:                           Remember.            (line   6)
+* remote editing, from agenda:           Agenda commands.     (line 100)
 * richer text:                           Enhancing text.      (line   6)
 * RMAIL links:                           External links.      (line   6)
 * SCHEDULED keyword:                     Time stamps.         (line  30)
@@ -4905,7 +5113,6 @@ Index
 * show all, command:                     Visibility cycling.  (line  31)
 * show all, global visibility state:     Visibility cycling.  (line  22)
 * show hidden text:                      Visibility cycling.  (line   6)
-* single file summary:                   Timeline.            (line   6)
 * sorting, of agenda items:              Sorting of agenda items.
                                                               (line   6)
 * sparse tree, for deadlines:            Creating timestamps. (line  41)
@@ -4914,10 +5121,12 @@ Index
 * sparse trees:                          Sparse trees.        (line   6)
 * special keywords:                      In-buffer settings.  (line   6)
 * spreadsheet capabilities:              Table calculations.  (line   6)
-* statistics, for checkboxes:            Checkboxes.          (line  24)
+* statistics, for checkboxes:            Checkboxes.          (line  23)
 * storing links:                         Handling links.      (line   9)
 * structure editing:                     Structure editing.   (line   6)
 * structure of document:                 Document structure.  (line   6)
+* sublevels, inclusion into tags match:  Tag inheritance.     (line   6)
+* sublevels, inclusion into todo list:   Global TODO list.    (line  31)
 * subtree cycling:                       Visibility cycling.  (line  10)
 * subtree visibility states:             Visibility cycling.  (line  10)
 * subtree, cut and paste:                Structure editing.   (line   6)
@@ -4948,8 +5157,12 @@ Index
 * TeX-like syntax for sub- and superscripts: Export options.  (line  25)
 * thanks:                                History and Acknowledgments.
                                                               (line   6)
+* time grid:                             Time-of-day specifications.
+                                                              (line  26)
 * time stamps:                           Time stamps.         (line   6)
 * time, reading in minibuffer:           Creating timestamps. (line  71)
+* time-of-day specification:             Time-of-day specifications.
+                                                              (line   6)
 * time-sorted view:                      Timeline.            (line   6)
 * timeline, single file:                 Timeline.            (line   6)
 * timerange:                             Time stamps.         (line  21)
@@ -4978,6 +5191,7 @@ Index
 * visible text, printing:                Sparse trees.        (line  39)
 * VM links:                              External links.      (line   6)
 * WANDERLUST links:                      External links.      (line   6)
+* weekly agenda:                         Weekly/Daily agenda. (line   6)
 * windmove.el:                           Conflicts.           (line  33)
 * workflow states as TODO keywords:      Workflow states.     (line   6)
 * XEmacs:                                Installation.        (line   6)
@@ -5023,8 +5237,9 @@ Key Index
 * C-#:                                   Built-in table editor.
                                                               (line 155)
 * C-,:                                   Agenda files.        (line  18)
+* C-a a L:                               Timeline.            (line  10)
 * C-c !:                                 Creating timestamps. (line  21)
-* C-c #:                                 Checkboxes.          (line  56)
+* C-c #:                                 Checkboxes.          (line  55)
 * C-c $:                                 Moving subtrees.     (line  10)
 * C-c %:                                 Handling links.      (line  80)
 * C-c &:                                 Handling links.      (line  84)
@@ -5061,7 +5276,7 @@ Key Index
 * C-c `:                                 Built-in table editor.
                                                               (line 181)
 * C-c a a:                               Weekly/Daily agenda. (line   9)
-* C-c a C:                               Agenda dispatcher.   (line  29)
+* C-c a C:                               Storing searches.    (line   9)
 * C-c a M:                               Matching headline tags.
                                                               (line  15)
 * C-c a m:                               Matching headline tags.
@@ -5078,7 +5293,7 @@ Key Index
 * C-c C-c <2>:                           Processing LaTeX fragments.
                                                               (line  15)
 * C-c C-c <3>:                           Setting tags.        (line  10)
-* C-c C-c <4>:                           Checkboxes.          (line  38)
+* C-c C-c <4>:                           Checkboxes.          (line  37)
 * C-c C-c <5>:                           table.el.            (line   6)
 * C-c C-c <6>:                           Editing/debugging formulas.
                                                               (line  16)
@@ -5112,7 +5327,6 @@ Key Index
                                                               (line  20)
 * C-c C-q:                               Built-in table editor.
                                                               (line 119)
-* C-c C-r:                               Timeline.            (line  13)
 * C-c C-s <1>:                           Agenda commands.     (line 136)
 * C-c C-s:                               Creating timestamps. (line  48)
 * C-c C-t <1>:                           Clocking work time.  (line  25)
@@ -5121,7 +5335,7 @@ Key Index
 * C-c C-v:                               TODO basics.         (line  26)
 * C-c C-w:                               Creating timestamps. (line  41)
 * C-c C-x C-a:                           ARCHIVE tag.         (line  28)
-* C-c C-x C-b:                           Checkboxes.          (line  39)
+* C-c C-x C-b:                           Checkboxes.          (line  38)
 * C-c C-x C-c:                           Agenda commands.     (line 201)
 * C-c C-x C-d:                           Clocking work time.  (line  33)
 * C-c C-x C-i:                           Clocking work time.  (line  12)
@@ -5191,7 +5405,7 @@ Key Index
                                                               (line  76)
 * M-S-<left> <3>:                        Plain lists.         (line  65)
 * M-S-<left>:                            Structure editing.   (line  24)
-* M-S-<RET> <1>:                         Checkboxes.          (line  53)
+* M-S-<RET> <1>:                         Checkboxes.          (line  52)
 * M-S-<RET> <2>:                         Plain lists.         (line  52)
 * M-S-<RET>:                             Structure editing.   (line  15)
 * M-S-<right> <1>:                       Creating timestamps. (line  97)
@@ -5248,143 +5462,148 @@ Key Index
 
 
 Tag Table:
-Node: Top959
-Node: Introduction9683
-Node: Summary10098
-Node: Installation12365
-Node: Activation13743
-Node: Feedback14992
-Node: Document structure15761
-Node: Outlines16535
-Node: Headlines17195
-Node: Visibility cycling17818
-Ref: Visibility cycling-Footnote-119293
-Ref: Visibility cycling-Footnote-219351
-Node: Motion19401
-Node: Structure editing20185
-Node: Archiving22294
-Node: ARCHIVE tag22852
-Node: Moving subtrees24645
-Node: Sparse trees25686
-Ref: Sparse trees-Footnote-127665
-Ref: Sparse trees-Footnote-227757
-Node: Plain lists27872
-Ref: Plain lists-Footnote-131397
-Ref: Plain lists-Footnote-231754
-Node: Tables31936
-Node: Built-in table editor32484
-Node: Narrow columns40091
-Ref: Narrow columns-Footnote-142030
-Node: Table calculations42076
-Node: Formula syntax43396
-Ref: Formula syntax-Footnote-146301
-Node: Lisp formulas46601
-Node: Column formulas47390
-Node: Advanced features49152
-Node: Named-field formulas52406
-Node: Editing/debugging formulas53046
-Node: Appetizer54804
-Node: orgtbl-mode55907
-Node: table.el56398
-Node: Hyperlinks57375
-Node: Link format58080
-Node: Internal links59373
-Ref: Internal links-Footnote-161362
-Node: Radio targets61494
-Node: CamelCase links62209
-Node: External links62707
-Node: Handling links64838
-Ref: Handling links-Footnote-169424
-Node: Search options69661
-Ref: Search options-Footnote-171435
-Node: Custom searches71516
-Node: Remember72564
-Node: TODO items76254
-Node: TODO basics77236
-Node: TODO extensions78763
-Node: Workflow states79558
-Node: TODO types80426
-Ref: TODO types-Footnote-182084
-Node: Per file keywords82166
-Ref: Per file keywords-Footnote-183620
-Node: Priorities83821
-Node: Breaking down tasks85065
-Ref: Breaking down tasks-Footnote-185585
-Node: Checkboxes85681
-Node: Timestamps88490
-Node: Time stamps88880
-Node: Creating timestamps91977
-Node: Progress logging95323
-Node: Closing items95853
-Node: Clocking work time96648
-Ref: Clocking work time-Footnote-1100084
-Node: Tags100210
-Node: Tag inheritance100972
-Node: Setting tags101909
-Ref: Setting tags-Footnote-1105039
-Ref: Setting tags-Footnote-2105151
-Node: Tag searches105231
-Node: Agenda views106440
-Node: Agenda files107984
-Ref: Agenda files-Footnote-1108944
-Ref: Agenda files-Footnote-2109093
-Node: Agenda dispatcher109285
-Node: Weekly/Daily agenda111401
-Node: Categories112536
-Node: Time-of-day specifications113184
-Node: Calendar/Diary integration115160
-Node: Sorting of agenda items116537
-Node: Global TODO list117369
-Node: Matching headline tags119420
-Node: Timeline120363
-Node: Agenda commands121236
-Node: Embedded LaTeX127080
-Ref: Embedded LaTeX-Footnote-1128172
-Node: Math symbols128362
-Node: Subscripts and Superscripts129127
-Node: LaTeX fragments129971
-Node: Processing LaTeX fragments132040
-Node: CDLaTeX mode132986
-Ref: CDLaTeX mode-Footnote-1135470
-Node: Exporting135618
-Node: ASCII export136932
-Node: HTML export138222
-Node: XOXO export141058
-Node: iCalendar export141497
-Node: Text interpretation143320
-Node: Comment lines143799
-Node: Enhancing text144270
-Node: Export options145962
-Node: Publishing147629
-Ref: Publishing-Footnote-1148425
-Node: Configuration148621
-Node: Project alist149339
-Node: Sources and destinations150405
-Node: Selecting files150952
-Node: Publishing action151700
-Node: Publishing options152815
-Node: Publishing links154967
-Node: Project page index156480
-Node: Sample configuration157258
-Node: Simple example157750
-Node: Complex example158423
-Node: Triggering publication160499
-Node: Miscellaneous161184
-Node: Completion161818
-Node: Customization162814
-Node: In-buffer settings163399
-Node: The very busy C-c C-c key166630
-Node: Clean view168274
-Node: TTY keys170851
-Node: Interaction172460
-Node: Cooperation172857
-Node: Conflicts174724
-Node: Bugs176316
-Node: Extensions and Hacking177939
-Node: Extensions178425
-Node: Dynamic blocks179995
-Node: History and Acknowledgments181915
-Node: Index186719
-Node: Key Index209924
+Node: Top964
+Node: Introduction10057
+Node: Summary10472
+Node: Installation12739
+Node: Activation14117
+Node: Feedback15366
+Node: Document structure16135
+Node: Outlines16909
+Node: Headlines17569
+Node: Visibility cycling18192
+Ref: Visibility cycling-Footnote-119667
+Ref: Visibility cycling-Footnote-219725
+Node: Motion19775
+Node: Structure editing20559
+Node: Archiving22668
+Node: ARCHIVE tag23226
+Node: Moving subtrees25019
+Node: Sparse trees26060
+Ref: Sparse trees-Footnote-128039
+Ref: Sparse trees-Footnote-228131
+Node: Plain lists28246
+Ref: Plain lists-Footnote-131771
+Ref: Plain lists-Footnote-232128
+Node: Tables32310
+Node: Built-in table editor32858
+Node: Narrow columns40466
+Ref: Narrow columns-Footnote-142405
+Node: Table calculations42451
+Node: Formula syntax43771
+Ref: Formula syntax-Footnote-146676
+Node: Lisp formulas46976
+Node: Column formulas47765
+Node: Advanced features49527
+Node: Named-field formulas52781
+Node: Editing/debugging formulas53421
+Node: Appetizer55179
+Node: orgtbl-mode56282
+Node: table.el56773
+Node: Hyperlinks57750
+Node: Link format58455
+Node: Internal links59748
+Ref: Internal links-Footnote-161737
+Node: Radio targets61869
+Node: CamelCase links62584
+Node: External links63082
+Node: Handling links65213
+Ref: Handling links-Footnote-169799
+Node: Search options70036
+Ref: Search options-Footnote-171810
+Node: Custom searches71891
+Node: Remember72939
+Node: TODO items76629
+Node: TODO basics77611
+Node: TODO extensions79138
+Node: Workflow states79933
+Node: TODO types80801
+Ref: TODO types-Footnote-182459
+Node: Per file keywords82541
+Ref: Per file keywords-Footnote-183995
+Node: Priorities84196
+Node: Breaking down tasks85440
+Ref: Breaking down tasks-Footnote-185960
+Node: Checkboxes86056
+Node: Timestamps88792
+Node: Time stamps89182
+Node: Creating timestamps92279
+Node: Progress logging95625
+Node: Closing items96155
+Node: Clocking work time96950
+Ref: Clocking work time-Footnote-1100386
+Node: Tags100512
+Node: Tag inheritance101274
+Node: Setting tags102211
+Ref: Setting tags-Footnote-1105341
+Ref: Setting tags-Footnote-2105453
+Node: Tag searches105533
+Node: Agenda views106742
+Node: Agenda files108631
+Ref: Agenda files-Footnote-1109591
+Ref: Agenda files-Footnote-2109740
+Node: Agenda dispatcher109933
+Node: Weekly/Daily agenda111550
+Node: Calendar/Diary integration112515
+Node: Global TODO list113853
+Node: Matching headline tags115905
+Node: Timeline116849
+Node: Presentation and sorting117512
+Node: Categories118290
+Node: Time-of-day specifications118954
+Node: Sorting of agenda items120932
+Node: Agenda commands122214
+Node: Custom agenda views128102
+Node: Storing searches128710
+Node: Block agenda130622
+Node: Setting Options131852
+Node: Embedded LaTeX134539
+Ref: Embedded LaTeX-Footnote-1135631
+Node: Math symbols135821
+Node: Subscripts and Superscripts136586
+Node: LaTeX fragments137430
+Node: Processing LaTeX fragments139499
+Node: CDLaTeX mode140445
+Ref: CDLaTeX mode-Footnote-1142929
+Node: Exporting143077
+Node: ASCII export144391
+Node: HTML export145681
+Node: XOXO export148517
+Node: iCalendar export148956
+Node: Text interpretation150779
+Node: Comment lines151258
+Node: Enhancing text151729
+Node: Export options153421
+Node: Publishing155088
+Ref: Publishing-Footnote-1155884
+Node: Configuration156080
+Node: Project alist156798
+Node: Sources and destinations157864
+Node: Selecting files158411
+Node: Publishing action159159
+Node: Publishing options160274
+Node: Publishing links162426
+Node: Project page index163939
+Node: Sample configuration164717
+Node: Simple example165209
+Node: Complex example165882
+Node: Triggering publication167958
+Node: Miscellaneous168643
+Node: Completion169277
+Node: Customization170658
+Node: In-buffer settings171243
+Node: The very busy C-c C-c key174474
+Node: Clean view176118
+Node: TTY keys178695
+Node: Interaction180304
+Node: Cooperation180701
+Node: Conflicts182568
+Node: Bugs184160
+Node: Extensions and Hacking185783
+Node: Extensions186269
+Node: Dynamic blocks187839
+Node: History and Acknowledgments189766
+Node: Index194654
+Node: Key Index219013
 
 End Tag Table

File diff suppressed because it is too large
+ 375 - 273
org.el


BIN
org.pdf


+ 371 - 161
org.texi

@@ -3,12 +3,12 @@
 @setfilename ../info/org
 @settitle Org Mode Manual
 
-@set VERSION 4.45
+@set VERSION 4.46
 @set DATE August 2006
 
 @dircategory Emacs
 @direntry
-* Org Mode: (org).	outline-based notes management and organizer
+* Org Mode: (org).      outline-based notes management and organizer
 @end direntry
 
 @c Version and Contact Info
@@ -190,15 +190,26 @@ Agenda Views
 * Global TODO list::            All unfinished action items
 * Matching headline tags::      Structured information with fine-tuned search
 * Timeline::                    Time-sorted view for single file
+* Presentation and sorting::    How agenda items are prepared for display
 * Agenda commands::             Remote editing of org trees
+* Custom agenda views::         Defining special searches and views
 
 The weekly/daily agenda
 
+* Calendar/Diary integration::  Integrating Anniversaries and more
+
+Presentation and sorting
+
 * Categories::                  Not all tasks are equal
 * Time-of-day specifications::  How the agenda knows the time
-* Calendar/Diary integration::  Integrating Anniversaries and more
 * Sorting of agenda items::     The order of things
 
+Custom agenda views
+
+* Storing searches::            Type once, use often
+* Block agenda::                All the stuff you need in a single buffer
+* Setting Options::             Changing the rules
+
 Embedded LaTeX
 
 * Math symbols::                TeX macros for symbols and Greek letters
@@ -971,7 +982,7 @@ expanded on the next re-align to span the whole table width.  So, to
 create the above table, you would only type
 
 @example
-|Name|Phone|Age
+|Name|Phone|Age|
 |-
 @end example
 
@@ -2283,13 +2294,12 @@ of checkboxes to ideantify (a hierarchy of) a large number of subtasks
 @section Checkboxes
 @cindex checkboxes
 
-Every item in a plain list (@pxref{Plain lists}) can be made a
-checkbox by starting it with the string @samp{[ ]}.  This feature is
-similar to TODO items (@pxref{TODO items}), but more lightweight.
-Checkboxes are not included into the global TODO list, so they are often
-great to split a task into a number of simple steps.  Or you can use
-them in a shopping list to select the items you need to buy.  To toggle
-a checkbox, use @kbd{C-c C-c}, or try Piotr Zielinski's
+Every item in a plain list (@pxref{Plain lists}) can be made a checkbox
+by starting it with the string @samp{[ ]}.  This feature is similar to
+TODO items (@pxref{TODO items}), but more lightweight.  Checkboxes are
+not included into the global TODO list, so they are often great to split
+a task into a number of simple steps.  Or you can use them in a shopping
+list.  To toggle a checkbox, use @kbd{C-c C-c}, or try Piotr Zielinski's
 @file{org-mouse.el}.  Here is an example of a checkbox list.
 
 @example
@@ -2315,7 +2325,7 @@ that headline/item.  You have to insert the cookie yourself by typing
 either @samp{[/]} or @samp{[%]}.  In the first case you get an @samp{n
 out of m} result, in the second case you get information about the
 percentage of checkboxes checked (in the above example, this would be
-@samp{[50%]} and @samp{[33%], respectively}.
+@samp{[50%]} and @samp{[33%], respectively}).
 
 @noindent The following commands work with checkboxes:
 
@@ -2334,8 +2344,7 @@ want to toggle all boxes in the region independently, use a prefix
 argument.
 @item
 If the cursor is in a headline, toggle checkboxes in the region between
-this headline and the next.  This does @emph{not} act on the entire
-subtree, just the current entry.
+this headline and the next (so @emph{not} the entire subtree).
 @item
 If no active region, just toggle the checkbox at point.
 @end itemize
@@ -2725,6 +2734,7 @@ Tags are normal words containing letters, numbers, @samp{_}, and
 @node Tag inheritance, Setting tags, Tags, Tags
 @section Tag inheritance
 @cindex inheritance, of tags
+@cindex sublevels, inclusion into tags match
 
 @i{Tags} make use of the hierarchical structure of outline trees.  If a
 heading has a certain tag, all subheadings will inherit the tag as
@@ -2882,7 +2892,7 @@ are important for a particular date, this information must be collected,
 sorted and displayed in an organized way.
 
 Org-mode can select items based on various criteria, and display them
-in a separate buffer.  Three different views are provided:
+in a separate buffer.  Five different view types are provided:
 
 @itemize @bullet
 @item
@@ -2890,10 +2900,16 @@ an @emph{agenda} that is like a calendar and shows information
 for specific dates
 @item
 a @emph{TODO list} that covers all unfinished
-action items, and
+action items,
 @item
 a @emph{tags view} that shows information based on
-the tags associated with headlines in the outline tree.
+the tags associated with headlines in the outline tree,
+@item
+a @emph{timeline view} that shows all events in a single Org-mode file,
+in time-sorted view
+@item
+@emph{custom views} that are special tag and keyword searches and
+combinations of different views.
 @end itemize
 
 @noindent
@@ -2909,18 +2925,21 @@ edit these files remotely.
 * Global TODO list::            All unfinished action items
 * Matching headline tags::      Structured information with fine-tuned search
 * Timeline::                    Time-sorted view for single file
+* Presentation and sorting::    How agenda items are prepared for display
 * Agenda commands::             Remote editing of org trees
+* Custom agenda views::         Defining special searches and views
 @end menu
 
 @node Agenda files, Agenda dispatcher, Agenda views, Agenda views
 @section Agenda files
+@cindex agenda files
 
 The information to be shown is collected from all @emph{agenda files},
 the files listed in the variable @code{org-agenda-files}@footnote{If the
 value of that variable is not a list, but a single file name, then the
 list of agenda files will be maintained in that external file.}.  Thus even
 if you only work with a single Org-mode file, this file should be put
-into that list@footnote{When using the dispatcher pressing @kbd{1}
+into that list@footnote{When using the dispatcher, pressing @kbd{1}
 before selecting a command will actually limit the command to the
 current file, and ignore @code{org-agenda-files} until the next
 dispatcher command.}.  You can customize @code{org-agenda-files}, but
@@ -2949,8 +2968,6 @@ to visit any of them.
 @section The agenda dispatcher
 @cindex agenda dispatcher
 @cindex dispatching agenda commands
-@cindex custom agenda commands
-@cindex agenda commands, custom
 The views are created through a dispatcher that should be bound to a
 global key, for example @kbd{C-c a} (@pxref{Installation}).  In the
 following we will assume that @kbd{C-c a} is indeed how the dispatcher
@@ -2965,44 +2982,32 @@ Create a list of all TODO items (@pxref{Global TODO list}).
 @item m / M
 Create a list of headlines matching a TAGS expression (@pxref{Matching
 headline tags}).
+@item L
+Create the timeline view for the current buffer (@pxref{Timeline}).
+@item 1
+Restrict an agenda command to the current buffer.  After pressing
+@kbd{1}, you still need to press the character selecting the command.
+@item 0
+If there is an active region, restrict the following agenda command to
+the region.  Otherwise, restrict it to the current subtree.  After
+pressing @kbd{0}, you still need to press the character selecting the
+command.
 @end table
 
-You can also define custom commands that will be accessible through
-the dispatcher, just like the default commands.  Custom commands are
-global searches for tags and specific TODO keywords, or a variety of
-sparse tree creating commands (@pxref{Sparse trees}).  As sparse trees
-are only defined for a single org-mode file, these latter commands act
-on the current buffer instead of the list of agenda files.
-
-@kindex C-c a C
-Custom commands are configured in the variable
-@code{org-agenda-custom-commands}.  You can customize this variable,
-for example by pressing @kbd{C-c a C}.  You can also directly set it
-with Emacs Lisp in @file{.emacs}.  For example:
-
-@lisp
-(setq org-agenda-custom-commands
-      '(("w" todo "WAITING")
-        ("u" tags "+BOSS-URGENT")
-        ("U" tags-tree "+BOSS-URGENT")
-        ("f" occur-tree "\\<FIXME\\>")))
-@end lisp
-
-@noindent will define @kbd{C-c a w} as a global search for
-TODO entries with @samp{WAITING} as the TODO keyword, @kbd{C-c a u} as a
-global tags search for headlines marked @samp{:BOSS:} but not
-@samp{:URGENT:}, @kbd{C-c a U} to do the same search but only in the
-current buffer and display the result as a sparse tree, and @kbd{C-c a
-f} to create a sparse tree with all entries containing the word
-@samp{FIXME}.  For more information, look at the documentation string
-of the variable @code{org-agenda-custom-commands}.
+You can also define custom commands that will be accessible through the
+dispatcher, just like the default commands.  This includes the
+possibility to create extended agenda buffers that contain several
+blocks together, for example the weekly agenda, the global TODO list and
+a number of special tags matches.  @xref{Custom agenda views}.
 
 @node Weekly/Daily agenda, Global TODO list, Agenda dispatcher, Agenda views
 @section The weekly/daily agenda
 @cindex agenda
+@cindex weekly agenda
+@cindex daily agenda
 
-The purpose of the weekly/daily @emph{agenda} is to act like a page of
-a paper agenda, showing all the tasks for the current week or day.
+The purpose of the weekly/daily @emph{agenda} is to act like a page of a
+paper agenda, showing all the tasks for the current week or day.
 
 @table @kbd
 @cindex org-agenda, command
@@ -3021,78 +3026,11 @@ The commands available in the Agenda buffer are listed in @ref{Agenda
 commands}.
 
 @menu
-* Categories::                  Not all tasks are equal
-* Time-of-day specifications::  How the agenda knows the time
 * Calendar/Diary integration::  Integrating Anniversaries and more
-* Sorting of agenda items::     The order of things
 @end menu
 
-@node Categories, Time-of-day specifications, Weekly/Daily agenda, Weekly/Daily agenda
-@subsection Categories
-
-@cindex category
-In the agenda buffer, each entry is preceded by a @emph{category},
-which is derived from the file name.  The category can also be set
-with a special line anywhere in the buffer, looking like this:
-
-@example
-#+CATEGORY: Thesis
-@end example
-
-If there are several such lines in a file, each specifies the category
-for the text below it (but the first category also applies to any text
-before the first CATEGORY line).  The display in the agenda buffer looks
-best if the category is not longer than 10 characters.
-
-@node Time-of-day specifications, Calendar/Diary integration, Categories, Weekly/Daily agenda
-@subsection Time-of-Day Specifications
-
-Org-mode checks each agenda item for a time-of-day specification.  The
-time can be part of the time stamp that triggered inclusion into the
-agenda, for example as in @w{@samp{<2005-05-10 Tue 19:00>}}.  Time
-ranges can be specified with two time stamps, like
-@c
-@w{@samp{<2005-05-10 Tue 20:30>--<2005-05-10 Tue 22:15>}}.
-
-In the headline of the entry itself, a time(range) may also appear as
-plain text (like @samp{12:45} or a @samp{8:30-1pm}.  If the agenda
-integrates the Emacs diary (@pxref{Calendar/Diary integration}), time
-specifications in diary entries are recognized as well.
-
-For agenda display, Org-mode extracts the time and displays it in a
-standard 24 hour format as part of the prefix.  The example times in
-the previous paragraphs would end up in the agenda like this:
-
-@example
-    8:30-13:00 Arthur Dent lies in front of the bulldozer
-   12:45...... Ford Prefect arrives and takes Arthur to the pub
-   19:00...... The Vogon reads his poem
-   20:30-22:15 Marwin escorts the Hitchhikers to the bridge
-@end example
-
-If the agenda is in single-day mode, or for the display of today, the
-timed entries are embedded in a time grid, like
 
-@example
-    8:00...... ------------------
-    8:30-13:00 Arthur Dent lies in front of the bulldozer
-   10:00...... ------------------
-   12:00...... ------------------
-   12:45...... Ford Prefect arrives and takes Arthur to the pub
-   14:00...... ------------------
-   16:00...... ------------------
-   18:00...... ------------------
-   19:00...... The Vogon reads his poem
-   20:00...... ------------------
-   20:30-22:15 Marwin escorts the Hitchhikers to the bridge
-@end example
-
-The time grid can be turned on and off with the variable
-@code{org-agenda-use-time-grid}, and can be configured with
-@code{org-agenda-time-grid}.
-
-
-@node Calendar/Diary integration, Sorting of agenda items, Time-of-day specifications, Weekly/Daily agenda
+@node Calendar/Diary integration,  , Weekly/Daily agenda, Weekly/Daily agenda
 @subsection Calendar/Diary integration
 @cindex calendar integration
 @cindex diary integration
@@ -3123,24 +3061,6 @@ Sunrise/Sunset times, show lunar phases and to convert to other
 calendars, respectively.  @kbd{c} can be used to switch back and forth
 between calendar and agenda.
 
-@node Sorting of agenda items,  , Calendar/Diary integration, Weekly/Daily agenda
-@subsection Sorting of agenda items
-@cindex sorting, of agenda items
-@cindex priorities, of agenda items
-The entries for each day are sorted.  The default order is to first
-collect all items containing an explicit time-of-day specification.
-These entries will be shown at the beginning of the list, as a
-@emph{schedule} for the day.  After that, items remain grouped in
-categories, in the sequence given by @code{org-agenda-files}.  Within
-each category, items are sorted by priority (@pxref{Priorities}).
-
-The priority is a numerical quantity composed of the base priority
-(2000 for priority @samp{A}, 1000 for @samp{B}, and 0 for @samp{C}),
-plus additional increments for overdue scheduled or deadline items.
-
-Sorting can be customized using the variable
-@code{org-agenda-sorting-strategy}.
-
 
 @node Global TODO list, Matching headline tags, Weekly/Daily agenda, Agenda views
 @section The global TODO list
@@ -3174,7 +3094,8 @@ Remote editing of TODO items means that you can change the state of a
 TODO entry with a single key press.  The commands available in the
 TODO list are described in @ref{Agenda commands}.
 
-Nomally the global todo list simply shows all headlines with TODO
+@cindex sublevels, inclusion into todo list
+Normally the global todo list simply shows all headlines with TODO
 keywords.  This list can become very long.  There are two ways to keep
 it more compact:
 @itemize @minus
@@ -3190,7 +3111,6 @@ and omit the sublevels from the global list.  Configure the variable
 @code{org-agenda-todo-list-sublevels} to get this behavior.
 @end itemize
 
-
 @node Matching headline tags, Timeline, Global TODO list, Agenda views
 @section Matching headline tags
 @cindex matching, of tags
@@ -3212,29 +3132,24 @@ define a custom command for it (@pxref{Agenda dispatcher}).
 @item C-c a M
 Like @kbd{C-c a m}, but only select headlines that are also TODO items
 and force checking subitems (see variable
-@code{org-tags-match-list-sublevels}.
+@code{org-tags-match-list-sublevels}).
 @end table
 
 The commands available in the tags list are described in @ref{Agenda
 commands}.
 
-@node Timeline, Agenda commands, Matching headline tags, Agenda views
+@node Timeline, Presentation and sorting, Matching headline tags, Agenda views
 @section Timeline for a single file
-@cindex single file summary
-@cindex agenda, for single file
 @cindex timeline, single file
 @cindex time-sorted view
 
-The timeline is not really an agenda view, because it only summarizes
-items from a single Org-mode file.  But it also uses the agenda buffer
-and provides similar commands, so we discuss it here.  The timeline
-shows all time-stamped items in a single Org-mode file (or the
-selected part of it), in a @emph{time-sorted view}.  The main purpose of
-this command is to give an overview over events in a project.
+The timeline summarizes all time-stamped items from a single Org-mode
+file in a @emph{time-sorted view}.  The main purpose of this command is
+to give an overview over events in a project.
 
 @table @kbd
-@kindex C-c C-r
-@item C-c C-r
+@kindex C-a a L
+@item C-c a L
 Show a time-sorted view of the org file, with all time-stamped items.
 When called with a @kbd{C-u} prefix, all unfinished TODO entries
 (scheduled or not) are also listed under the current date.
@@ -3244,7 +3159,122 @@ When called with a @kbd{C-u} prefix, all unfinished TODO entries
 The commands available in the timeline buffer are listed in
 @ref{Agenda commands}.
 
-@node Agenda commands,  , Timeline, Agenda views
+
+@node Presentation and sorting, Agenda commands, Timeline, Agenda views
+@section Presentation and sorting
+@cindex presentation, of agenda items
+
+Before displaying items in an agenda view, Org-mode visually prepares
+the items and sorts them.  Each item occupies a single line.  The line
+starts with a @emph{prefix} that contains the @emph{category}
+(@pxref{Categories}) of the item and other important information.  You can
+customize the prefix using the option @code{org-agenda-prefix-format}.
+The prefix is followed by a cleaned-up version of the outline headline
+associated with the item.
+
+@menu
+* Categories::                  Not all tasks are equal
+* Time-of-day specifications::  How the agenda knows the time
+* Sorting of agenda items::     The order of things
+@end menu
+
+@node Categories, Time-of-day specifications, Presentation and sorting, Presentation and sorting
+@subsection Categories
+
+@cindex category
+The category is a broad label assigned to each agenda item.  By default,
+the category is simply derived from the file name, but you can also
+specify it with a special line in the buffer, like this:
+
+@example
+#+CATEGORY: Thesis
+@end example
+
+If there are several such lines in a file, each specifies the category
+for the text below it (but the first category also applies to any text
+before the first CATEGORY line).  The display in the agenda buffer looks
+best if the category is not longer than 10 characters.
+
+@node Time-of-day specifications, Sorting of agenda items, Categories, Presentation and sorting
+@subsection Time-of-Day Specifications
+@cindex time-of-day specification
+
+Org-mode checks each agenda item for a time-of-day specification.  The
+time can be part of the time stamp that triggered inclusion into the
+agenda, for example as in @w{@samp{<2005-05-10 Tue 19:00>}}.  Time
+ranges can be specified with two time stamps, like
+@c
+@w{@samp{<2005-05-10 Tue 20:30>--<2005-05-10 Tue 22:15>}}.
+
+In the headline of the entry itself, a time(range) may also appear as
+plain text (like @samp{12:45} or a @samp{8:30-1pm}.  If the agenda
+integrates the Emacs diary (@pxref{Calendar/Diary integration}), time
+specifications in diary entries are recognized as well.
+
+For agenda display, Org-mode extracts the time and displays it in a
+standard 24 hour format as part of the prefix.  The example times in
+the previous paragraphs would end up in the agenda like this:
+
+@example
+    8:30-13:00 Arthur Dent lies in front of the bulldozer
+   12:45...... Ford Prefect arrives and takes Arthur to the pub
+   19:00...... The Vogon reads his poem
+   20:30-22:15 Marwin escorts the Hitchhikers to the bridge
+@end example
+
+@cindex time grid
+If the agenda is in single-day mode, or for the display of today, the
+timed entries are embedded in a time grid, like
+
+@example
+    8:00...... ------------------
+    8:30-13:00 Arthur Dent lies in front of the bulldozer
+   10:00...... ------------------
+   12:00...... ------------------
+   12:45...... Ford Prefect arrives and takes Arthur to the pub
+   14:00...... ------------------
+   16:00...... ------------------
+   18:00...... ------------------
+   19:00...... The Vogon reads his poem
+   20:00...... ------------------
+   20:30-22:15 Marwin escorts the Hitchhikers to the bridge
+@end example
+
+The time grid can be turned on and off with the variable
+@code{org-agenda-use-time-grid}, and can be configured with
+@code{org-agenda-time-grid}.
+
+@node Sorting of agenda items,  , Time-of-day specifications, Presentation and sorting
+@subsection Sorting of agenda items
+@cindex sorting, of agenda items
+@cindex priorities, of agenda items
+Before being inserted into a view, the items are sorted.  How this is
+done depends on the type of view.
+@itemize @bullet
+@item
+For the daily/weekly agenda, the items for each day are sorted.  The
+default order is to first collect all items containing an explicit
+time-of-day specification.  These entries will be shown at the beginning
+of the list, as a @emph{schedule} for the day.  After that, items remain
+grouped in categories, in the sequence given by @code{org-agenda-files}.
+Within each category, items are sorted by priority (@pxref{Priorities}),
+which is composed of the base priority (2000 for priority @samp{A}, 1000
+for @samp{B}, and 0 for @samp{C}), plus additional increments for
+overdue scheduled or deadline items.
+@item 
+For the TODO list, items remain in the order of categories, but within
+each category, sorting takes place according to priority
+(@pxref{Priorities}).
+@item
+For tags matches, items are not sorted at all, but just appear in the
+sequence in which they are found in the agenda files.
+@end itemize
+
+Sorting can be customized using the variable
+@code{org-agenda-sorting-strategy}.
+
+
+@node Agenda commands, Custom agenda views, Presentation and sorting, Agenda views
 @section Commands in the agenda buffer
 @cindex commands, in agenda buffer
 
@@ -3260,6 +3290,7 @@ the other commands, the cursor needs to be in the desired line.
 
 @table @kbd
 @tsubheading{Motion}
+@cindex motion commands in agenda
 @kindex n
 @item n
 Next line (same as @key{up}).
@@ -3305,6 +3336,7 @@ logging was on (variable @code{org-log-done}) are shown in the agenda,
 as are entries that have been clocked on that day.
 
 @tsubheading{Change display}
+@cindex display changing, in agenda
 @kindex o
 @item o
 Delete other windows.
@@ -3353,6 +3385,7 @@ Display the previous dates.
 Goto today.
 
 @tsubheading{Remote editing}
+@cindex remote editing, from agenda
 
 @item 0-9
 Digit argument.
@@ -3439,6 +3472,7 @@ Stop the previously started clock.
 Cancel the currently running clock.
 
 @tsubheading{Calendar commands}
+@cindex calendar commands, from agenda
 @kindex c
 @item c
 Open the Emacs calendar and move to the date at the agenda cursor.
@@ -3492,6 +3526,176 @@ visit org files will not be removed.
 
 @end table
 
+
+@node Custom agenda views,  , Agenda commands, Agenda views
+@section Custom agenda views
+@cindex custom agenda views
+@cindex agenda views, custom
+
+Custom agenda commands serve two purposes: to store and quickly access
+frequently used TODO and tags searches, and to create special composite
+agenda buffers.  Custom agenda commands will be accessible through the
+dispatcher (@pxref{Agenda dispatcher}), just like the default commands.
+
+@menu
+* Storing searches::            Type once, use often
+* Block agenda::                All the stuff you need in a single buffer
+* Setting Options::             Changing the rules
+@end menu
+
+@node Storing searches, Block agenda, Custom agenda views, Custom agenda views
+@subsection Storing searches
+
+The first application of custom searches is the definition of keyboard
+shortcuts for frequently used searches, either creating an agenda
+buffer, or a sparse tree (the latter covering of course only the current
+buffer).
+@kindex C-c a C
+Custom commands are configured in the variable
+@code{org-agenda-custom-commands}.  You can customize this variable, for
+example by pressing @kbd{C-c a C}.  You can also directly set it with
+Emacs Lisp in @file{.emacs}.  The following example contains all valid
+search types:
+
+@lisp
+@group
+(setq org-agenda-custom-commands
+      '(("w" todo "WAITING")
+        ("W" todo-tree "WAITING")
+        ("u" tags "+BOSS-URGENT")
+        ("v" tags-todo "+BOSS-URGENT")
+        ("U" tags-tree "+BOSS-URGENT")
+        ("f" occur-tree "\\<FIXME\\>")))
+@end group
+@end lisp
+
+@noindent
+The initial single-character string in each entry defines the character
+you have to press after the dispatcher command @kbd{C-c a} in order to
+access the command.   The second parameter is the search type, followed
+by the string or regular expression to be used for the matching.  The
+example above will therefore define:
+
+@table @kbd
+@item C-c a w
+as a global search for TODO entries with @samp{WAITING} as the TODO
+keyword
+@item C-c a W
+as the same search, but only in the current buffer and displaying the
+results as a sparse tree
+@item C-c a u
+as a global tags search for headlines marked @samp{:BOSS:} but not
+@samp{:URGENT:}
+@item C-c a v
+as the same search as @kbd{C-c a u}, but limiting the search to
+headlines that are also TODO items
+@item C-c a U
+as the same search as @kbd{C-c a u}, but only in the current buffer and
+displaying the result as a sparse tree
+@item C-c a f
+to create a sparse tree (again: current buffer only) with all entries
+containing the word @samp{FIXME}.
+@end table
+
+@node Block agenda, Setting Options, Storing searches, Custom agenda views
+@subsection Block agenda
+@cindex block agenda
+@cindex agenda, with block views
+
+Another possibility is the construction of agenda views that comprise
+the results of @emph{several} commands, each of which creates a block in
+the agenda buffer.  The available commands include @code{agenda} for the
+daily or weekly agenda (as created with @kbd{C-c a a}), @code{alltodo}
+for the global todo list (as constructed with @kbd{C-c a t}), and the
+matching commands discussed above: @code{todo}, @code{tags}, and
+@code{tags-todo}.  Here are two examples:
+
+@lisp
+@group
+(setq org-agenda-custom-commands
+      '(("h" "Agenda and Home-related tasks"
+         ((agenda)
+          (tags-todo "HOME")
+          (tags "GARDEN")))
+        ("o" "Agenda and Office-related tasks"
+         ((agenda)
+          (tags-todo "WORK")
+          (tags "OFFICE")))))
+@end group
+@end lisp
+
+@noindent
+This will define @kbd{C-c a h} to create a multi-block view for stuff
+you need to attend to at home.  The resulting agenda buffer will contain
+your agenda for the current week, all TODO items that carry the tag
+@samp{HOME}, and also all lines tagged with @samp{GARDEN}.  Finally the
+command @kbd{C-c a o} provides a similar view for office tasks.
+
+
+@node Setting Options,  , Block agenda, Custom agenda views
+@subsection Setting Options for custom commands
+@cindex options, for custom agenda views
+
+Org-mode contains a number of variables regulating agenda construction
+and display.  The global variables define the behavior for all agenda
+commands, including the custom commands.  However, if you want to change
+some settings just for a single custom view, you can do so.  Setting
+options requires inserting a list of variable names and values at the
+right spot in @code{org-agenda-custom-commands}.  For example:
+
+@lisp
+@group
+(setq org-agenda-custom-commands
+      '(("w" todo "WAITING"
+         ((org-agenda-sorting-strategy '(priority-down))
+          (org-agenda-prefix-format "  Mixed: ")))
+        ("U" tags-tree "+BOSS-URGENT"
+         ((org-show-following-heading nil)
+          (org-show-hierarchy-above nil)))))
+@end group
+@end lisp
+
+@noindent
+Now the @kbd{C-c a w} command will sort the collected entries only by
+priority, and the prefix format is modified to just say @samp{  Mixed:}
+instead of giving the category of the entry.  The sparse tags tree of
+@kbd{C-c a U} will now turn out ultra-compact, because neither the
+headline hierarchy above the match, nor the headline following the match
+will be shown.
+
+For command sets creating a block agenda,
+@code{org-agenda-custom-commands} has two separate spots for setting
+options.  You can add options that should be valid for just a single
+command in the set, and options that should be valid for all commands in
+the set.  The former are just added to the command entry, the latter
+must come after the list of command entries.  Going back to the block
+agenda example (@pxref{Block agenda}), let's change the sorting strategy
+for the @kbd{C-c a h} commands to @code{priority-down}, but let's sort
+the results for GARDEN tags query in the opposite order,
+@code{priority-up}.  This would look like this:
+
+@lisp
+@group
+(setq org-agenda-custom-commands
+      '(("h" "Agenda and Home-related tasks"
+         ((agenda)
+          (tags-todo "HOME")
+          (tags "GARDEN" ((org-agenda-sorting-strategy '(priority-up)))))
+         ((org-agenda-sorting-strategy '(priority-down))))
+        ("o" "Agenda and Office-related tasks"
+         ((agenda)
+          (tags-todo "WORK")
+          (tags "OFFICE")))))
+@end group
+@end lisp
+
+As you see, the values and parenthesis setting is a little complex.
+When in doubt, use the customize interface to set this variable - it
+fully supports its structure.  Just one caveat: When setting options in
+this interface, the @emph{values} are just lisp expressions.  So if the
+value is a string, you need to add the double quotes around the value
+yourself.
+
 @node Embedded LaTeX, Exporting, Agenda views, Top
 @chapter Embedded LaTeX
 @cindex @TeX{} interpretation
@@ -4448,16 +4652,22 @@ At the beginning of a headline, complete TODO keywords.
 @item
 After @samp{\}, complete @TeX{} symbols supported by the exporter.
 @item
-After @samp{*}, complete CamelCase versions of all headlines in the
-buffer.
+After @samp{*}, complete headlines in the current buffer so that they
+can be used in search links like @samp{[[*find this headline]]}.
 @item
-After @samp{:}, complete tags used elsewhere in the buffer.
+After @samp{:}, complete tags.  The list of tags is taken from the
+variable @code{org-tag-alist} (possibly set through the @samp{#+TAGS}
+in-buffer option, @pxref{Setting tags}), or it is created dynamically
+from all tags used in the current buffer.
 @item
 After @samp{#+}, complete the special keywords like @samp{TYP_TODO} or
 @samp{OPTIONS} which set file-specific options for Org-mode.  When the
 option keyword is already complete, pressing @kbd{M-@key{TAB}} again
 will insert example settings for this keyword.
 @item
+In the line after @samp{#+STARTUP: }, complete startup keywords,
+i.e. valid keys for this line.
+@item
 Elsewhere, complete dictionary words using ispell.
 @end itemize
 @end table
@@ -4957,7 +5167,7 @@ The corresponding block writer function could look like this:
 (defun org-dblock-write:block-update-time (params)
    (let ((fmt (or (plist-get params :format) "%d. %m. %Y")))
      (insert "Last block update at: "
-	     (format-time-string fmt (current-time)))))
+             (format-time-string fmt (current-time)))))
 @end lisp
 
 If you want to make sure that all dynamic blocks are always up-to-date,
@@ -4965,7 +5175,6 @@ you could add the function @code{org-update-all-dblocks} to a hook, for
 example @code{before-save-hook}.  @code{org-update-all-dblocks} is
 written in a way that is does nothing in buffers that are not in Org-mode.
 
-
 @node History and Acknowledgments, Index, Extensions and Hacking, Top
 @appendix History and Acknowledgments
 @cindex acknowledgments
@@ -5013,7 +5222,7 @@ calculations and improved XEmacs compatibility, in particular by porting
 @item
 @i{Sacha Chua} suggested to copy some linking code from Planner.
 @item
-@i{Eddward DeVilla} proposed Checkbox statistics.
+@i{Eddward DeVilla} proposed and tested checkbox statistics.
 @item
 @i{Kees Dullemond} inspired the use of narrowed tabled columns.
 @item
@@ -5043,7 +5252,8 @@ file links, and TAGS.
 @i{Scott Otterson} sparked the introduction of descriptive text for
 links, among other things.
 @item
-@i{Pete Phillips} helped the development of the TAGS feature.
+@i{Pete Phillips} helped during the development of the TAGS feature, and
+provided frequent feedback.
 @item
 @i{T.V. Raman} reported bugs and suggested improvements.
 @item
@@ -5092,8 +5302,8 @@ linking to GNUS.
 @i{Roland Winkler} requested additional keybindings to make Org-mode
 work on a tty.
 @item
-@i{Piotr Zielinski} wrote @file{org-mouse.el} and showed how to follow
-links with mouse-1.
+@i{Piotr Zielinski} wrote @file{org-mouse.el}, proposed angenda blocks
+and contributed various ideas and code snippets.
 @end itemize
 
 

BIN
orgcard.pdf


+ 7 - 5
orgcard.tex

@@ -1,7 +1,7 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{4.45}
+\def\orgversionnumber{4.46}
 \def\year{2006}
-%
+g%
 %**start of header
 \newcount\columnsperpage
 
@@ -329,7 +329,7 @@ To set archive location for current file, add a line like$^2$:
 \key{view TODO's in sparse tree}{C-c C-v}
 \key{global TODO list in agenda mode}{C-c t$^1$}
 \key{create sparse tree with all deadlines due}{C-c C-w}
-\key{time sorted view of current org file}{C-c C-r}
+\key{time sorted view of current org file}{C-c a L}
 %\key{agenda for the week}{C-c a$^1$}
 %\key{agenda for date at cursor}{C-c C-o}
 
@@ -511,7 +511,7 @@ after  ``{\tt :}'', and dictionary words elsewhere.
 \key{toggle checkbox(es) in region/entry/at point}{C-c C-x C-b}
 \key{toggle checkbox at point}{C-c C-c}
 \metax{checkbox statistics cookies: insert {\tt [/]} or {\tt [\%]}}{}
-\key{update checkbox satistics}{C-c \#}
+\key{update checkbox statistics (\kbd{C-u} : whole file)}{C-c \#}
 
 \section{Tags}
 
@@ -568,8 +568,10 @@ after  ``{\tt :}'', and dictionary words elsewhere.
 \key{compile global TODO list}{C-c a t$^1$}
 \key{compile TODO list for specific keyword}{C-c a T$^1$}
 \key{match tags in agenda files}{C-c a m$^1$}
+\key{match tags in TODO entries}{C-c a M$^1$}
+\key{show timeline of current org file}{C-c a L$^1$}
+\key{configure custom commands}{C-c a C$^1$}
 \key{agenda for date at cursor}{C-c C-o}
-\key{show timeline of current org file}{C-c C-r}
 
 \vskip 1mm
 To set categories, add lines like$^2$:

Some files were not shown because too many files changed in this diff