2009-08-06 Carsten Dominik <carsten.dominik@gmail.com>

* org.el (org-create-formula-image): Remove the -E option for dvipng. * org-exp.el (org-default-export-plist): Respect #+BIND. (org-export-confirm-letbind): New function. * org.el (org-paste-subtree): Test the kill ring entry if it is going to be used. (org-copy-subtree): Use `org-forward-same-level'. (org-forward-same-level): Respect the `invisibe-ok' arg for back-to-heading. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-table-map-tables): Make sure cursor is back at table beginning after funcall. * org-agenda.el (org-agenda-bulk-action): Make sure parents are handled before children, and do not error if an entry is not found, probably because it hase been remove when the parent was archived or refiled. * org.el (org-ido-completing-read): Accept straight lists for completion as well as alists. * org-timer.el (org-timer-cancel-timers): Renamed from `org-timer-cancel-timers'. * org.el (org-cycle-internal-local): Fix problem with finding next invisible line. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-list.el (org-list-send-list): Call `org-list-goto-true-beginning' instead of `org-list-find-true-beginning', which does not exist. * org-timer.el (org-timer-reset-timers): Use `mapc'. (org-timer-set-timer): Do not assign to heading. * org-id.el (org-id-open): Quote function name. * org-macs.el (org-unmodified): Turn off recording undo information while running inside the macro. * org-table.el (org-table-export): Also work in file-less buffers. * org.el (org-startup-indented): New option. (org-startup-options): Add new options indent and noindent. (org-unfontify-region): Remove line-prefix and wrap-prefix properties. (org-after-demote-entry-hook, org-after-promote-entry-hook): New hooks. (org-promote, org-demote): Run the new hooks. * org-table.el (org-table-align): Replace leading \n as well. * org-exp.el (org-export-push-to-kill-ring): Remove `line-prefix' and `line-wrap' text properties. * org-compat.el (org-kill-new): New function. * org-agenda.el (org-format-agenda-item): Remove `line-prefix' and `line-wrap' text properties. * org-indent.el: New file. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-provide-todo-statistics): Tweak docstring. * org-id.el (org-id-open): Honor `org-link-frame-setup'. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-as-org): Insert the "-source" string before the extension. * org.el (org-read-date): Make sure the calendar is in the current frame. (org-set-emph-re): Remove the ? from the post-match. (org-emphasis-regexp-components): Add backslash to the postmatch class. (org-set-font-lock-defaults): Write \n instead of \xa, and make it optional so that also lines at the end of the buffers will still be matched as headlines. * org-table.el (org-table-error-on-row-ref-crossing-hline): Variable made obsolete. (org-table-relative-ref-may-cross-hline): New option. (org-table-find-row-type): Honow the new option `org-table-relative-ref-may-cross-hline'. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-table.el (org-table-cut-region, org-table-copy-region): Work on single field if no active region. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-make-header): Only insert title if one is defined. * org.el (org-make-options-regexp): Allow empty values. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-cycle-internal-local): Improved version of finding next visible line. (org-cycle-hide-drawers): Only hide drawers if this is really necessary. (outline-end-of-subtree): Make `outline-end-of-subtree' use the org-version of this function in Org-mode. We use advice to implement this change, so that future changes to this function in outline.el wil be handled properly. (org-forward-same-level, org-backward-same-level): New commands. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-remove-empty-overlays-at) (org-clean-visibility-after-subtree-move): New functons. (org-move-subtree-down): Simplify cleanup of display. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-mac-message.el (org-mac-message-get-links): Improve docstring. Make argument SELECT-OR-FLAGGED optional, default to "s". Fix the return value. (org-mac-message-insert-flagged): Simplify. * org.el (org-refile-get-location): Tamper with refile history o that history contains compete matches instead of the entered string. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-store-link): Never store a link to an inline task. * org-footnote.el (org-footnote-goto-local-insertion-point): Skip inline tasks when positioning footnotes. * org.el (org-refile): Remove the END line when archiving an inline task that does have an END line. * org-archive.el (org-archive-subtree): Remove the END line when archiving an inline task that does have an END line. * org-macs.el (org-with-limited-levels): New macro. (org-get-limited-outline-regexp): New function. * org-exp.el (org-export-format-source-code-or-example): Fix bug that did not enumerate first line. (org-export-mark-radio-links): Skip matches in links. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-activate-plain-links): Make single-match. (org-adapt-indentation): Fix docstring. * org-macs.el (org-unmodified): Turn of modification hooks while running this macro. 2009-08-06 Bastien Guerry <bzg@altern.org> * org.el (org-adapt-indentation): Slightly improve the docstring. (org-occur): Sends an error when the user inputs an empty string. (org-priority): Bugfix: the tag alignement should happen within save-excursion. 2009-08-06 Bastien Guerry <bzg@altern.org> * org.el (org-make-link-regexps): Don't exclude parentheses from `org-plain-link-re' (org-cycle-internal-local): When locally cycling, switch directly from CHILDREN to FOLDED if there is no subtree (org-cycle): Update the docstring to document the new behavior of `org-cycle-internal-local'. 2009-08-06 Nicolas Goaziou <n.goaziou@neuf.fr> (tiny change) * org-clock.el (org-clock-in): Bugfix: recognize timestamps with an abbreviated format for days. 2009-08-06 Bastien Guerry <bzg@altern.org> * org-protocol.el (org-protocol-default-template-key): New option. * org.el (org-refile): Bugfix: save-excursion before reading the refile target, otherwise cursor moves might confuse `org-refile'. * org.el (org-toggle-heading): Bugfix: correctly convert list items before the first headline. * org.el (org-provide-todo-statistics): Allow a list of TODO keywords to compute statistics against headlines containing a keyword from this list. (org-update-parent-todo-statistics): Possibly use the new allowed value of `org-provide-todo-statistics'. 2009-08-06 Bastien Guerry <bzg@altern.org> * org-timer.el: Add autoload cookie. * org.el (org-occur-link-in-agenda-files): New function. * org-timer.el (org-timer-last-timer): New variable. * org-agenda.el (org-agenda-mode-map): New key for org-timer-set-timer called from the agenda. * org.el (org-mode-map): New key for org-timer-set-timer. * org-timer.el (org-timer-reset-timers) (org-timer-show-remaining-time, org-timer-set-timer): New functions. * org-clock.el (org-show-notification): Update the docstring. * org.el (org-provide-todo-statistics): Allow new value 'all-headlines for this option, which includes entries with no TODO keywords in the todo statistics. (org-update-parent-todo-statistics): Possibly use the new 'all-headline value from `org-provide-todo-statistics'. 2009-08-06 Bastien Guerry <bzg@altern.org> * org-clock.el (org-dblock-write:clocktable): Add a new option :timestamp which allows display of timestamps in clock reports. * org.el (org-mode-map): Define new key `C-c C-*': convert a plain list to a subtree, preserving the structure of the list. (org-set-emph-re): Make the last element optional in the regexp. This regexp now matches an emphasized string at the end of a line. * org-list.el (org-list-goto-true-beginning) (org-list-make-subtree, org-list-make-subtrees): New functions. * org.el (org-eval-in-calendar): Select the right frame. (org-save-frame-excursion): Remove this macro. 2009-08-06 Bastien Guerry <bzg@altern.org> * org-list.el (org-list-beginning-re): Bugfix: don't use * when trying to find the beginning of a list. * org-exp.el (org-get-file-contents): Use a new argument: markup. When present, tell org-get-file-contents not to protect org-like lines. * org-id.el (org-id-uuid-program): New option to set the name of the uuidgen program. (org-id-method): Use `org-id-uuid-program'. (org-id-new): Use `org-id-uuid-program'. 2009-08-06 Bastien Guerry <bzg@altern.org> * org-exp.el (org-export-number-lines): Allow whitespace in code references. Allow the -r switch to remove the references in the source code even when the lines are not numbered: the labels can be explicit enough. * org.el (org-fontify-whole-heading-line): New option. (org-set-font-lock-defaults): Use the new option. * org-clock.el (org-show-notification-handler): New option. (org-show-notification): Use the new option. 2009-08-06 Bastien Guerry <bzg@altern.org> * org.el (org-eval-in-calendar): Fix a bug about calendar navigation when `calendar-setup' value is 'calendar-only. 2009-08-06 Bastien Guerry <bzg@altern.org> * org.el (orgstruct++-mode): Fix typo in docstring. (org-insert-link): Clean up: (or (...)) => (...) (org-insert-link): Use TAB for stored links completion. 2009-08-06 Bastien Guerry <bzg@altern.org> * org.el (org-get-refile-targets): Fix bug: don't ignore case when building the list of targets. * org-remember.el (org-remember-delete-empty-lines-at-end): New option. (org-remember-handler): Use the new option. 2009-08-06 James TD Smith <ahktenzero@mohorovi.cc> * org.el (org-tags-sort-function): New option for sorting tags. (org-set-tags): Use the new option to sort tags. * org-plot.el (org-plot/gnuplot): Run with an idle timer to avoid premature deletion of the data when using org-plot in a script. 2009-08-06 Bastien Guerry <bzg@altern.org> * org-clock.el (org-clock-in-prepare-hook): New hook. (org-clock-in): Use this new hook. 2009-08-06 Bastien Guerry <bzg@altern.org> * org.el (org-special-ctrl-a/e): Explicitely bind the value 'reversed for this option to the "true line boundary first" behavior. (org-tags-match-list-sublevels): Document the 'indented value for this variable. * org-latex.el (org-export-latex-first-lines): Fix problem with publishing the region. * org-exp.el (org-export-format-source-code-or-example): Fix bad line numbering when exporting examples in HTML. 2009-08-06 James TD Smith <ahktenzero@mohorovi.cc> * org-colview.el (org-format-time-period): Formats a time in fractional days as days, hours, mins, seconds. (org-columns-display-here): Add special handling for SINCE and SINCE_IA to format for display. * org.el (org-time-since): Add a function to get the time since an org timestamp. (org-entry-properties): Add two new special properties: SINCE and SINCE_IA. These give the time since any active or inactive timestamp in an entry. (org-special-properties): Add SINCE, SINCE_IA. (org-tags-sort-function): Add custom declaration for tags sorting function. (org-set-tags): Sort tags if org-tags-sort-function is set 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-clock.el (org-clock-goto): Find hidden headlines as well. * org.el (org-narrow-to-subtree): Find hidden headlines as well. * org-plot.el (org-plot/add-options-to-plist): Add timeind option. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-publish.el (org-publish-remove-all-timestamps): New function. (org-publish-all): Remove all timestamp files if `org-publish-all' is called with a prefix argument. * org-list.el (org-indent-item): Fix typo. (org-item-indent-positions): Normalize ordered bullet. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-macs.el (org-set-local): Make a local variable, do not make the variable buffer-local! * org-latex.el (org-export-as-latex): Call `org-install-letbind'. * org-exp.el (org-infile-export-plist): Read BIND lines. (org-install-letbind): New function. (org-export-as-org, org-export-preprocess-string): Call `org-install-letbind'. * org-list.el (org-list-demote-modify-bullet): New option. (org-first-list-item-p): Save point. (org-fix-bullet-type): New optional argument FORCE-BULLET. (org-indent-item): Honor `org-list-demote-modify-bullet'. (org-item-indent-positions): Return bullet types along with indentation. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-show-entry): Hide drawers. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-footnote.el (org-footnote-auto-adjust): New option. (org-footnote-auto-adjust-maybe): New function. (org-footnote-new, org-footnote-delete): Call `org-footnote-auto-adjust-maybe'. * org.el (org-startup-options): Add new footnote-related keywords. * org-publish.el (org-publish-timestamp-filename): Additional arguments PUB-DIR and PUB-FUNC, which are included in the hash. (org-publish-needed-p): Additional arguments PUB-DIR PUB-FUNC TRUE-PUB-DIR. Pass them through to `org-publish-timestamp-filename'. (org-publish-update-timestamp): Additional arguments PUB-DIR and PUB-FUNC, which are included in the hash. (org-publish-file): Delay timestamp test until the publishing function is known. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-bulk-action): Add scheduling and setting the deadline. * org.el (org-read-date-final-answer): New variable. (org-read-date): Store the final answer string, including the date from the calendar, for reuse by agenda bulk commands. * org-publish.el (org-publish-attachment): Fix publishing of attachments. * org-latex.el (org-export-latex-quotation-marks): Fix export of quotation makrs in parenthesis. (org-remove-initial-hash): New function. (org-export-latex-preprocess): Fix bug with infinite loop if environment is not properly closed. * org-table.el (org-table-get-remote-range): Find #+TBLNAME also when indented. * org.el (org-fontify-meta-lines-and-blocks): Make #+TBLNAME highlight also when indented. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-footnote.el (org-footnote-renumber-fn:N): New command. (org-footnote-action): Offer renumbering. * org.el (org-cycle): Honor the `integrate' value of org-cycle-include-plain-lists'. * org-list.el (org-cycle-include-plain-lists): New allowed value `internal'. Improve the docstring. * org.el (org-set-autofill-regexps): Improve the paragraph-start regexp to work better with LaTeX commands. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-inline-image-extensions): Add ps and eps extensions. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-write-agenda): Make sure org-icalendar is loaded. * org.el (org-map-entries): No longer force `org-tags-match-list-sublevels' to t during a todo-only tags search. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-low-levels): Allow user-defined environment. (org-export-latex-subcontent): Handle user-defined environment. * org-agenda.el (org-agenda-view-mode-dispatch): Add more keys to the View dispatcher. * org.el (org-hide-block-toggle): Use `org-make-overlay' instead of `make-overlay'. * org-latex.el (org-export-as-pdf): Protect match data during call to shell-quote-argument. * org-agenda.el (org-agenda-mode-map): Modify bulk action keys. (org-agenda-view-mode-dispatch): New function. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-mode): Reset list of marks. (org-agenda-mode-map): Define new keys for refile and bulk action. (org-agenda-menu): Add menu itesm for refile and bulk action. (org-agenda-refile): New function. (org-agenda-set-tags): Optional arguments TAG and ONOFF. (org-agenda-marked-entries): New variable. (org-agenda-bulk-select, org-agenda-remove-bulk-action-overlays) (org-agenda-remove-all-bulk-action-marks) (org-agenda-bulk-action): New functions/commands. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-get-file-contents): Protect org-like lines in included files. (org-export-format-source-code-or-example): Remove newlines. * org-latex.el (org-export-latex-links): Check for no-description marking. * org-exp.el (org-export-preprocess-apply-macros): Switch macro argument separator back to comma. (org-export-normalize-links): Mark links without description. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-infile-export-plist): Fix bug in macro processing. * org-agenda.el (org-agenda-clock-out): Update line after clocking out. (org-agenda-highlight-todo): Fix bug with highlighting. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-set-font-lock-defaults): Adapt formatting to capture new alignment strings. * org-table.el (orgtbl-self-insert-command): Add yas/expand to command list. (org-table-align): Check for forced align type. * org.el (org-self-insert-command): Add yas/expand to command list. * org-clock.el (org-clock-in-hook): New hook. (org-clock-in): Run `org-clock-in-hook. (org-clock-out-hook): New hook. (org-clock-out): Run `org-clock-out-hook. (org-clock-cancel-hook): New hook. (org-clock-cancel): Run `org-clock-cancel-hook. (org-clock-goto-hook): New hook. (org-clock-goto): Run `org-clock-goto-hook. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-store-link): Better default description for link to Org-mode headline. * org-exp.el (org-export-generic): Autoload the generic exporter function. (org-export): Implement the `g' key for the generic exporter. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-table.el (orgtbl-setup): Add a binding for `S-iso-lefttab', and for zbacktab'. * org-exp.el (org-infile-export-plist): Get macros also from #+SETUPFILE. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-colview.el (org-columns-capture-view): Protect vertical bars in column values. (org-columns-capture-view): Exclude comment and archived trees. * org-colview-xemacs.el (org-columns-capture-view): Protect vertical bars in column values. (org-columns-capture-view): Exclude comment and archived trees. * org.el (org-quote-vert): New function. * org-latex.el (org-export-latex-verbatim-wrap): New option. * org-exp.el (org-export-format-source-code-or-example): Use `org-export-latex-verbatim-wrap'. * org.el (org-clone-subtree-with-time-shift): Also shift inactive time stamps. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp-blocks.el: New file. * org-remember.el (org-remember-templates): Allow the headline element to be a function. (org-remember-apply-template): If the headline is a function, call it to get the true function. * org-clock.el (org-clock-menu): New function. (org-clock-update-mode-line): Update help string. (org-clock-modify-effort-estimate): New function. (org-clock-mark-default-task): New function. * org.el (org-hh:mm-string-to-minutes): Also take just a number of minutes as input. (org-org-menu): Add new clocking stuff. (org-clock-is-active): New function. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-open-non-existing-files): Improve docstring. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-icalendar.el (org-icalendar-include-bbdb-anniversaries): New option. (org-export-icalendar): Call `org-bbdb-anniv-export-ical'. * org-bbdb.el (org-bbdb-anniv-export-ical): New function. * org-list.el (org-get-checkbox-statistics-face): Use the new faces. * org-faces.el (org-checkbox-statistics-todo) (org-checkbox-statistics-done): New faces. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-use-verb): New variable. (org-export-latex-emph-format): Prefer \texttt over \verb when org-export-latex-use-verb is set. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-remember.el (org-remember-handler): Abort remember if the buffer is empty. * org-exp.el (org-export-format-source-code-or-example): Run `org-src-mode-hook'. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-indent-line-function): Fix indentation of +#end lines. 2009-08-06 Tassilo Horn <tassilo@member.fsf.org> * org-gnus.el (org-gnus-store-link): Require message.el in org-gnus-store-link. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-src.el: New file, split out of org.el * org-macs.el (org-replace-match-keep-properties): New function. * org-exp.el (org-export-mark-blockquote-verse-center): Better preprocessing of center and quote and verse blocks. * org-list.el (org-list-end): Respect the stored "original" indentation when determining the end of the list. * org-exp.el (org-export-replace-src-segments-and-examples): Remember indentation correctly. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-clock.el (org-clock-update-mode-line): Apply face org-mode-line-clock. * org-faces.el (org-mode-line-clock): New face. 2009-08-06 Tassilo Horn <tassilo@member.fsf.org> * org-gnus.el (org-gnus-store-link): Fix bug where `org-gnus-store-link' used wrong subject when called in an article buffer. Patch provided by fengli AT gmail DOT com. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-format-source-code-or-example): Remember the original indentation of source code snippets and examples. * org-latex.el (org-export-as-latex): Relocate the table of contents. * org.el (org-ctrl-c-ctrl-c): Update clock lines. * org-agenda.el (org-run-agenda-series): Scope global options also when creating the agenda buffer. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-adapt-indentation): Improve documentation. (org-insert-property-drawer): Respect org-adapt-indentation when inserting the drawer. (org-remove-flyspell-overlays-in): New function. (org-do-emphasis-faces, org-activate-plain-links) (org-activate-code, org-fontify-meta-lines-and-blocks) (org-activate-angle-links, org-activate-footnote-links) (org-activate-bracket-links, org-activate-dates) (org-activate-target-links, org-activate-tags): Remove flyspell overlays. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-edit-src-save): New function. * org-clock.el (org-clock-out-switch-to-state): New option. (org-clock-out): Honor `org-clock-out-switch-to-state'. * org-compat.el (org-compatible-face): Improve macro. * org.el (org-global-properties-fixed): Add default for CLOCK_MODELINE_TOTAL. * org-clock.el (org-clock-sum): Accept lists and strigs as tstart andd tend. (org-clock-sum-current-item): Optional argument TSTART, pass it to org-clock-sum. (org-clock-get-sum-start): New function. * org.el (org-startup-options): New keywords blockhide and blockshow. (org-mode): Add new invisibility spec. (org-set-startup-visibility): Hide block on startup if so desired. (org-hide-block-startup): New option. (org-block-regexp): New constant. (org-hide-block-overlays): New variable. (org-block-map, org-hide-block-toggle-all, org-hide-block-all) (org-show-block-all, org-hide-block-toggle-maybe) (org-hide-block-toggle): New functions. (org-edit-src-exit): Do not quote lines starting with # and no + behind it. (org-auto-repeat-maybe): Add LAST_REPEAT properter for a repeating entry. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-buffer-property-keys): Add Effort property for completion. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-clock.el (org-clock-sum-current-item): Fix positioning bug when retrieving total clocked time in the subtree. * org.el (org-quoting-blocks): New variable. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-table.el (org-table-store-formulas) (org-table-get-stored-formulas, org-table-fix-formulas) (org-table-edit-formulas, orgtbl-ctrl-c-ctrl-c) (orgtbl-gather-send-defs): Allow indented #+TBLFM line. * org.el (org-fontify-meta-lines, org-ctrl-c-ctrl-c): Allow indented #+TBLFM line. * org-footnote.el (org-footnote-goto-local-insertion-point): Allow indented #+TBLFM line. * org-colview.el (org-dblock-write:columnview): Allow indented #+TBLFM line. * org-colview-xemacs.el (org-dblock-write:columnview): Allow indented #+TBLFM line. * org-clock.el (org-dblock-write:clocktable): Allow indented #+TBLFM line. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-format-source-code-or-example): Make editing indented blocks work correctly. * org.el (org-edit-src-nindent): New variable. (org-edit-src-code, org-edit-fixed-width-region) (org-edit-src-find-region-and-lang, org-edit-src-exit): Make editing indented blocks work correctly. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-replace-src-segments-and-examples): FInd indented blocks. (org-export-format-source-code-or-example): Fix indentation of blocks. (org-export-remove-indentation): New function. (org-export-select-backend-specific-text): Allow backend-specific code to be indented. (org-export-mark-blockquote-verse-center): Allow markers to be indented. * org.el (org-fontify-meta-lines): New function. (org-set-font-lock-defaults): Call the new fontification function. * org-faces.el (org-meta-line): New face (org-block): New face. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-treat-insert-todo-heading-as-state-change) (org-treat-S-cursor-todo-selection-as-state-change): New variables. (org-insert-todo-heading): Honor `org-treat-insert-todo-heading-as-state-change'. (org-shiftright, org-shiftleft): Honor `org-treat-S-cursor-todo-selection-as-state-change'. (org-inhibit-logging): New variable. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-remove-subtree-entries-from-agenda): Reduce range for marker position checking. * org-latex.el (org-export-latex-first-lines): Fix bug when exporting a region. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-push-to-kill-ring): Protect using x-set-selection, because that does not always work. * org-agenda.el (org-agenda-list): Apply the new face `org-agenda-date-today'. * org-faces.el (org-agenda-date-today): New face. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-to-appt): Turn off restriction when creating appointments. * org-latex.el (org-export-latex-low-levels): Fix customization type. * org.el (org-priority, org-shiftup, org-shiftdown): Disable priority commands. * org-agenda.el (org-agenda-priority): Disable priority commands. * org.el (org-enable-priority-commands): New option. * org-colview-xemacs.el (org-columns-compute) (org-columns-number-to-string): Fix problems with empty fields. * org-colview.el (org-columns-compute) (org-columns-number-to-string): Fix problems with empty fields. * org-exp.el (org-export-push-to-kill-ring): New function. (org-export-copy-to-kill-ring): New option. * org-latex.el (org-export-as-latex): Call `org-export-push-to-kill-ring'. * org-exp.el (org-export-show-temporary-export-buffer): New option. * org-latex.el (org-export-as-latex): Use `org-export-show-temporary-export-buffer'. * org-exp.el (org-export-show-temporary-export-buffer): New option. (org-export-push-to-kill-ring): New function. * org-colview.el (org-columns-compile-map): New variable. (org-columns-new, org-columns-compute) (org-columns-number-to-string, org-columns-uncompile-format) (org-columns-compile-format): Implement new operators. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-plist-vars): Add :xml-declaration. * org-list.el (org-update-checkbox-count): Make property dependent. * org.el (org-hierarchical-todo-statistics): New option. (org-update-parent-todo-statistics): Modified to handle recursive statistics. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-publish.el (org-publish): Make this function behave correctly in interactive use when called with a prefix argument. * org.el (org-todo-statistics-hook): New hook. (org-update-parent-todo-statistics): Use new hook. (org-log-into-drawer): New function. (org-add-log-setup): Use the new `org-log-into-drawer' function to determine if we should be logging into a drawer. (org-log-into-drawer): Update docstring. (org-default-properties): Add LOG_INTO_DRAWER as a property. * org-list.el (org-checkbox-statistics-hook): New hook. (org-update-checkbox-count-maybe): Use new hook. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-edit-src-code, org-edit-fixed-width-region): Use a better bufer-generating mechanism. (org-edit-src-find-buffer): New function. * org-icalendar.el (org-print-icalendar-entries): Don't check for archive tag, this is already done by `org-agenda-skip'. data while constructing lost of tags. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-preprocess-apply-macros): Use semicolon as argument separator in macros. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-after-sorting-entries-or-items-hook): New hook. (org-sort-entries-or-items): Run the new hook. (org-after-refile-insert-hook): New hook. (org-refile): Run `org-after-refile-insert-hook'. * org-agenda.el (org-agenda-get-progress): Never take time of day from headline when displaying progress. * org-latex.el (org-export-latex-complex-heading-re): New variable. (org-export-as-latex): Force the correct regexp in the preprocessor buffer. (org-export-latex-set-initial-vars): Set `org-export-latex-complex-heading-re'. * org-agenda.el (org-agenda-start-with-log-mode): New option. (org-agenda-mode): Use `org-agenda-start-with-log-mode'. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-tables-centered): New option. (org-export-latex-tables): Use `org-export-latex-tables-centered'. * org-exp.el (org-export-as-org): New command. (org-export-as-org): New command. * org-publish.el (org-publish-org-to-org): New function. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-yank): Just call `org-yank-generic'. (org-yank-generic): New function, containing the formaer functionality of `org-yank'. * org-latex.el (org-export-latex-not-done-keywords) (org-export-latex-done-keywords): New variables. (org-export-latex-todo-keyword-markup): New option. (org-export-latex-set-initial-vars): Remember the TODO keywords. (org-export-latex-keywords-maybe): Apply the TODO markup. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-infile-export-plist): Add more default macros. (org-export-preprocess-apply-macros): Process macro arguments. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-icalendar.el (org-icalendar-include-todo): New allowedvalue `unblocked'. (org-print-icalendar-entries): Respect the new value of `org-icalendar-include-todo'. * org.el (org-link-try-special-completion) (org-file-complete-link): New functions. (org-insert-link): Add special completion support for some link types. * org-bbdb.el (org-bbdb-complete-link): New function. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-list.el (org-update-checkbox-count): Allow recursive statistics. (org-hierarchical-checkbox-statistics): New option. * org.el (org-cycle): Remove erraneous space character. * org-icalendar.el (org-icalendar-timezone): Initialize from environment. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-autoload): Fix autoloading of ascii export functions. (org-modules): Add org-special-blocks. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-icalendar.el (org-start-icalendar-file): Use the new option. (org-ical-timezone): New option. * org-exp.el (org-export-get-coderef-format): Use the description is present. * org.el (org-sort-entries-or-items): Improve docstring, and make better implementation for time sorting. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-edit-src-persistent-message): New option. (org-edit-src-code, org-edit-fixed-width-region): Use the new option. * org-clock.el (org-clock-insert-selection-line): Fix prefious patch. * org.el (org-edit-src-code, org-edit-fixed-width-region): Use separate buffer instead of indirect buffer to edit source code. (org-edit-src-exit): Make this function work with the new setup. * org-clock.el (org-clock-insert-selection-line): Make sure tasks are properly fontified before shown in the selection menu. * org.el (org-fontify-like-in-org-mode): New function. * org-latex.el (org-export-latex-links): Use the property list to retrieve the default image attributes. * org-exp.el (org-export-plist-vars): Add a new option. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export, org-export-visible): Support ASCII export to buffer (org-export-normalize-links): Do not protect the description if it is explicitly given. * org-list.el (org-reset-checkbox-state-subtree): Moved here from org-checklist.el. (org-reset-checkbox-state-subtree): Call `org-reset-checkbox-state-subtree'. * org-remember.el (org-select-remember-template): For the selection of a valid template. * org-latex.el (org-export-region-as-latex): Supply the force-no-subtree argument. (org-export-as-latex): Provide better limits when exporting the first line. When exporting to string, we still want the first lines. (org-export-latex-first-lines): New argument END, to force the end of the region. (org-export-region-as-latex): Use the property list. (org-export-as-latex): * org-colview-xemacs.el (org-columns-remove-overlays) (org-columns): Fix call to `local-variable-p'. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-after-blockquotes-hook): New hook. (org-export-latex-preprocess): Run the new hook. * org-exp.el (org-export-preprocess-after-blockquote-hook): New hook. (org-export-preprocess-string): Run the new hook. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-macs.el (org-check-external-command): New defsubst. * org.el (org-mode-map): New key for reload. (org-format-latex): Better error message when external programs are not available. * org-agenda.el (org-agenda-mode-map): Bind `org-reload'. * org.el (org-sort-entries-or-items): Explicit sorting function for priorities, needed for XEmacs compatibility. * org-remember.el (org-remember-apply-template): Improve auto-save behavior. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-preprocess): Also protect environments ending in a star. * org-list.el (org-at-item-p): Fix regular expression. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-end-of-subtree): Improve speed. * org-agenda.el (org-agenda-get-timestamps) (org-agenda-get-progress, org-agenda-get-deadlines) (org-agenda-get-scheduled, org-agenda-get-blocks): Optimizations, in particular, wait as long as possible to collect the tags. (org-stuck-projects): Improve docstring. * org.el (org-store-link): No errors when getting custom id before first headline. (org-get-tags-at): Use `org-up-heading-safe' when getting tags. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-prepare-agenda-buffers): Catch a throw to nextfile. * org-protocol.el: Remove dependency on url.el. (org-protocol-unhex-compound, org-protocol-open-source): Remove dependency on url.el. * org-latex.el (org-export-as-pdf): Use `org-latex-to-pdf-process'. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-latex-to-pdf-process): New option. * org-agenda.el (org-agenda-skip-additional-timestamps-same-entry): New option. (org-agenda-get-timestamps): Honor `org-agenda-skip-additional-timestamps-same-entry'. * org-clock.el (org-clock-goto-may-find-recent-task): New option. (org-clock-goto): Find recent task only if `org-clock-goto-may-find-recent-task' allows it. * org-exp.el (org-export-remove-or-extract-drawers): Handle empty drawers, and drawers that are missing the :END: line. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-clock.el (org-clock-goto): Go to recently clocked task if no clock is running. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-update-parent-todo-statistics): Check for STATISTICS_FROM property. * org-list.el (org-update-checkbox-count): Check for STATISTICS_FROM property. * org.el (org-tab-first-hook) (org-tab-after-check-for-table-hook) (org-tab-after-check-for-cycling-hook): New hooks. (org-cycle-internal-global, org-cycle-internal-local): New functions, split out from `org-cycle'. (org-cycle): Call the new hooks. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-preprocess-string): Reset the list of preferred targets for each run of the preprocessor. * org.el (org-refile-target-verify-function): Improve documentation. (org-get-refile-targets): Respect point being moved by the verification function. * org-latex.el (org-export-latex-timestamp-keyword-markup): New option. (org-export-latex-keywords): Use new option. * org.el (org-rear-nonsticky-at): New defsubst. (org-activate-plain-links, org-activate-angle-links) (org-activate-footnote-links, org-activate-bracket-links) (org-activate-dates, org-activate-target-links) (org-activate-tags): Place the rear-nonsticky properties at the correct location. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-protocol.el (server-edit): Declare `server-edit'. (org-protocol-unhex-string, org-protocol-unhex-compound): New functions. (org-protocol-check-filename-for-protocol): Call `server-edit'. * org.el (org-default-properties): New default properteis for completion. * org-exp.el (org-export-add-subtree-options): Add new properties for subtree export. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-id.el (org-id-get-with-outline-path-completion): Turn off org-refile-target-verify-function for the duration of the command. * org.el (org-link-to-org-use-id): New possible value `create-if-interactive-and-no-custom-id'. (org-store-link): Use custom IDs. (org-link-search): Find custom ID properties from #link. (org-default-properties): Add CUSTOM_ID for property completion. (org-refile-target-verify-function): New option. (org-goto): Turn off org-refile-target-verify-function for the duration of the command. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-preferred-target-alist): New variable. (org-export-define-heading-targets): Find the new CUSTOM_ID property. (org-export-target-internal-links): Target the custom ids when possible. * org-latex.el (org-export-latex-preprocess): Better regexp for matching latex macros with arguments. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-remember.el (org-remember-handler): Allow filing to non-org files. 2009-08-06 Magnus Henoch <magnus.henoch@gmail.com> * org-table.el (org-table-fix-formulas): Do not change references to remote tables. (org-table-get-remote-range): Convert standard coordinates to RC format. * org-latex.el (org-export-latex-keywords): Fix regexp bug. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-compat.el (org-sha1-string): Function removed. * org.el (org-refile-allow-creating-parent-nodes): New option. (org-refile-get-location): New argument NEW-NODES. (org-refile): Call `org-refile-get-location' with the new argument. (org-refile-get-location): Arrange for adding a new child. (org-refile-new-child): New function. * org-clock.el: Fix a number of docstrings. (org-clock-find-position): New argument FIND-UNCLOSED to make the function find an unclosed clock in the entry. (org-clock-in): Call `org-clock-find-position' with the new argument if we might be resuming a clock. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-display-custom-times): New variable. (org-export-latex-timestamp-markup): New option. (org-export-latex-set-initial-vars): Remember the local value of `org-display-custom-times'. (org-export-latex-content): Process time stamps. (org-export-latex-time-stamps): New function. * org-macs.el (org-maybe-intangible): Add intangible property again to invisible text. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-default-export-plist): Handle undefined variables. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-sort-entries-or-items): Match TODO keywrds case-sensitively, when sorting. (org-priority): Do not match TODO keywords with wrong case. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-todo): Honor the NOBLOCKING property. * org-agenda.el (org-agenda-dim-blocked-tasks): Honor the NOBLOCKING property. * org.el (org-scan-tags): Fix bug in tag scanner 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-modules): Mark obsolete packages. * org-html.el: New file, split out from org-exp.el. * org-icalendar.el: New file, split out from org-exp.el. * org-xoxo.el: New file, split out from org-exp.el. * org-ascii.el: New file, split out from org-exp.el. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-compat.el (org-find-library-name): New function. * org.el (org-pre-cycle-hook): New hook. (org-cycle): Call the new hook in appropriate places. (org-reload): Only reload files that have been loaded before. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-set-font-lock-defaults): Enforxe space or line end after todo keyword. (org-todo): When changing TODO state, do matching case-sensitively. (org-map-continue-from): New variable. (org-scan-tags): Respect values in `org-map-continue-from'. (org-reload): Make XEmacs compatible. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-protocol.el (org-protocol-flatten-greedy): New function. (org-protocol-flatten): New function. * org.el (org-open-link-from-string): Pass reference buffer to `org-open-at-point'. (org-open-at-point): New optional argument `reference-buffer'. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-scan-tags): Make tag scan find headline in first line, 2nd attempt. (org-get-refile-targets): Add the naked file name. (org-refile): Store as top-level entry when only file name was given. * org-agenda.el (org-agenda-get-progress): Fix regexp bug. * org.el (org-block-todo-from-children-or-siblings-or-parent): Renamed from org-block-todo-from-children-or-siblings, and enhanced to look for the parent's status as well. * org-agenda.el (org-agenda-log-mode-add-notes): New option. (org-agenda-get-progress): Add first notes line to log entry if so desired. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-cleanup-fancy-diary-hook): New hook. (org-agenda-cleanup-fancy-diary): Call the new hook. * org-remember.el (org-remember-apply-template): Take the default for the annotation from the :annotation property. * org-mac-message.el (org-mac-message-get-link): Remove the quotes. (org-mac-message-get-link): Return the result. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-refile-get-location): Add file name only if not already included in outline path. * org-faces.el (org-n-level-faces): Fix customization type from number to integer. * org-exp.el (org-export-headline-levels): Fix customization type from number to integer. * org-agenda.el (org-agenda-confirm-kill) (org-agenda-custom-commands-local-options) (org-timeline-show-empty-dates, org-agenda-ndays) (org-agenda-start-on-weekday, org-scheduled-past-days): Fix customization type from number to integer. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-protocol.el: Declare some functions. * org-agenda.el (org-agenda-compare-effort): Honor `org-sort-agenda-noeffort-is-high'. (org-agenda-filter-by-tag, org-agenda-filter-make-matcher) (org-agenda-compare-effort): Implement the "?" operator for finding entries without effort setting. * org.el (org-extract-attributes-from-string): New function. * org-exp.el (org-export-splice-attributes): New function. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-mouse.el: XEmacs compatibility fixes * org.el (org-modules): Add org-inlinetasks.el (org-cycle): Implement limiting level on cycling. (org-move-subtree-down): Fix bug with swapping subtrees at end of buffer. * org-inlinetask.el: New file. * org-protocol.el: New file. * org.el (org-emphasis-regexp-components): Allow braces in emphasis pre and post match. * org-footnote.el (org-footnote-normalize): When only dorting, do not insert inline notes at the end. * org.el (org-require-autoloaded-modules): Add org-docbook.el. * org-docbook.el: New file. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-reftex-citation): New command. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-cmp-user-defined): New option. (org-sorting-choice, org-agenda-sorting-strategy): Add the new sorting options. (org-entries-lessp): Apply the new sorting option. * org.el (org-block-todo-from-children-or-siblings): Fix bug in blocker code, when an older sibling has children. * org-mac-message.el (org-mac-message-get-link): Improve getting links from multiple selected messages. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-remember.el (org-remember-finalize): Do not set buffer file name to nil. (org-remember-handler): Mark buffer as unmodified. (org-remember-handler): Delete backup file and show message about remaining backup files. (org-remember-auto-remove-backup-files): New option. * org.el (org-store-link): Use buffer name as link description in w3-mode buffers. (org-ido-switchb): Fix argument bug for completion. * org-remember.el (org-remember-apply-template): Set local variable `auto-save-visited-file-name' instead of global one. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-get-todos): Fix bug with match-data. (org-agenda-get-todos): Mark file tags as inherited. (org-agenda-list): Always search diary lines for a time. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-feed.el: New file. * org-exp.el (org-export-as-html): Close local lists depending on indentation, also when starting a table. * org-remember.el (org-remember-backup-directory) (org-remember-backup-name): New internal variable. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-clock.el (org-clock-out-if-current): Make buffer detection work in indirect buffers as well. * org.el (org-emphasis-regexp-components): Add the exxclamation mark to the post-emphasis characters. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-read-date-minibiffer-septup-hook): New hook. (org-read-date): Run the new hook. * org-mac-message.el (org-mac-flagged-mail): New group. (org-mac-mail-account): New variable. (org-mac-create-flagged-mail, org-mac-insert-flagged-mail): New commands. * org-remember.el (org-remember-backup-directory): New variable. (org-remember-apply-template): Write file to backup directory. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-mouse.el (org-mouse-todo-menu): New function. (org-mouse-todo-keywords): Function removed. (org-mouse-context-menu): Use `org-mouse-todo-menu'. * org-table.el (org-table-beginning-of-field) (org-table-end-of-field): New commands (org-table-previous-field, org-table-beginning-of-field): Better error messages. (orgtbl-setup): Include `M-a' and `M-e'. * org.el (org-backward-sentence, org-forward-sentence): New commands. * org-colview.el (org-colview-initial-truncate-line-value): New variable. (org-columns-remove-overlays): Restore the value of `truncate-lines'. (org-columns): Remember the value of `truncate-lines'. * org-colview-xemacs.el (org-colview-initial-truncate-line-value): New variable. (org-columns-remove-overlays): Restore the value of `truncate-lines'. (org-columns): Remember the value of `truncate-lines'. * org.el (org-columns-skip-arrchived-trees): New option. * org-agenda.el (org-agenda-export-html-style): Define color for org-agenda-done face. (org-search-view, org-agenda-get-todos, org-agenda-get-progress) (org-agenda-get-deadlines, org-agenda-get-scheduled): Use new face. * org.el (org-scan-tags): Use the new face. * org-faces.el (org-agenda-done): New face. * org.el (org-scan-tags): Test the value org `org-tags-match-list-sublevels'. (org-tags-match-list-sublevels): New allowed value: indented. * org-latex.el (org-export-latex-make-header): Apply macros in header. * org-exp.el (org-export-apply-macros-in-string): New function. * org-latex.el (org-export-latex-list-parameters): Fix bug with the definition of a checked box. * org-clock.el (org-clock-find-position): Fix drawer indentations. * org-latex.el (org-export-latex-low-levels): More options for how to process lower levels in LaTeX. (org-export-latex-subcontent): Better treatment for lists as a means of publishing lower levels. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-set-font-lock-defaults): Use new checkbox face. * org-faces.el (org-checkbox): New face. * org-exp.el (org-export-html-preprocess): Only create LaTeX fragement images if there is an export file. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-stuck-projects): Document that the subtree of projects that are not stuck will now be searched for stuck sub-projects. (org-agenda-skip-entry-when-regexp-matches) (org-agenda-skip-entry-when-regexp-matches-in-subtree): New functions. (org-agenda-list-stuck-projects): Use `org-agenda-skip-entry-when-regexp-matches-in-subtree'. * org-latex.el (org-export-latex-preprocess): Improve export of verses. * org-exp.el (org-export-as-html): Implement centering as a div rather than a paragraph. Do a better job with line-end in verse environments. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-open-at-point): Fix tags searches by mouse click. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-preprocess): Implement the centering markup. * org-exp.el (org-export-mark-blockquote-verse-center): Renamed from `org-export-mark-blockquote-and-verse'. (org-export-as-html): Implement the centering markup. * org-latex.el (org-export-latex-tables): Fix vertical lines in tables. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-read-date-history): New variable. (org-read-date): Use new history variable. (org-toggle-heading): Fix bug when used before first headline. (org-store-log-note): Remove drawer if empty while note is aborted. (org-remove-empty-drawer-at): New function. (org-check-after-date): New command. (org-sparse-tree): New sparse tree command "a". * org-exp.el (org-export-as-ascii): Improve export of plain lists. 2009-08-06 Bastien Guerry <bzg@altern.org> * org.el (org-toggle-fixed-width-section): Bug fix: insert a column and a space, not only a column. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-emphasis-alist): Better defaults for verbose emphasis. (org-export-latex-emph-format): New function. (org-export-latex-fontify): Call `org-export-latex-emph-format'. * org-agenda.el (org-agenda-menu): Add new commands to menu. (org-agenda-do-date-later, org-agenda-do-date-earlier) (org-agenda-date-later-minutes, org-agenda-date-earlier-minutes) (org-agenda-date-later-hours, org-agenda-date-earlier-hours): New commands. * org.el (org-timestamp-change): Move end-time along with start time. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-target-internal-links) (org-export-as-html): Protect links specified as #name. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-clone-subtree-with-time-shift): New command. * org-latex.el (org-export-latex-special-chars) (org-export-latex-treat-sub-super-char): Fix subscript export. * org-exp.el (org-create-multibrace-regexp): Do not add backslashes to the class. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-colview.el (org-columns-map): Better functions for moving up and down a row, even if `truncate-line' is nil. * org.el (org-insert-todo-heading): Make sure the keyword is inserted at the correct position. * org-publish.el (org-publish-project-alist) (org-publish-projects, org-publish-org-index): Change default anme for the index of file names to "sitemap.org". * org-latex.el (org-export-latex-tables): Use `org-split-string', for Emacs 21 compatibility. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-log-mode-items): Improve docstring. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-page-description) (org-export-page-keywords): New variables. (org-export-plist-vars): Add entries for :keywords and :description. (org-infile-export-plist): Parse for new keywords. (org-get-current-options): Add new keywords (org-export-as-html): Publish description and keywords. * org-agenda.el (org-agenda-add-entry-text-descriptive-links): New option. (org-agenda-add-entry-text): Honor `org-agenda-add-entry-text-descriptive-links'. * org-latex.el (org-export-latex-preprocess): Make all external preprocess functions use a PARAMETER arg. * org-exp.el (org-export-preprocess-string) (org-export-select-backend-specific-text) (org-export-format-source-code-or-example) (org-format-org-table-html): Support docbook export. (org-export-preprocess-string): Make all external preprocess functions use a PARAMETER arg. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-html-style-include-scripts): New option. (org-export-plist-vars): Add new option `org-export-html-style-include-scripts'. (org-export-as-html): Honor new option `org-export-html-style-include-scripts'. (org-export-html-scripts, org-export-html-style-default): Fix xml issues with the Safari browser. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-publish.el (org-publish-attachment): Only copy file when the directories differ. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-clock.el (org-clocktable-steps): Use inactive time stamps for clocktable steps. * org.el (org-additional-option-like-keywords): Add two more keywords. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-format-source-code-or-example): Mark temporary buffer unmodified, so that it will be killed even if mode like message mode has decided to assign a file name. * org.el (org-scan-tags): Improve tag inheritance. (org-scan-tags, org-make-tags-matcher): Make tag comparison case-sensitive. (org-scan-tags): Use the internal tags list instead of creating it from scratch. (org-trust-scanner-tags, org-scanner-tags): New variables. (org-scan-tags): Set `org-scanner-tags'. (org-get-tags-at): Take advantage of `org-trust-scanner-tags'. (org-map-entries): Document the possible speedup using scanner tags. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-add-planning-info): Fix bug with looking for keyword only at column 0. * org-agenda.el (org-agenda-custom-commands-local-options): Add option for tags filter preset. (org-prepare-agenda): Store filter preset as a property on the filter variable. (org-finalize-agenda): Call the filter, if there is a preset. (org-agenda-filter-by-tag): Filter again after clearing the filter, when there still is a preset. (org-agenda-filter-make-matcher, org-agenda-set-mode-name): Include the preset filter. (org-agenda-redo): Apply the filter again, also the preset filter. * org-exp.el (org-export-as-html): Use IDs in the correct way. * org.el (org-uuidgen-p): New funtion. * org-agenda.el (org-agenda-fontify-priorities): New default value `cookies'. (org-agenda-fontify-priorities): Renamed from org-fontify-priorities. * org.el (org-set-font-lock-defaults): Call `org-font-lock-add-priority-faces'. (org-font-lock-add-priority-faces): New function. * org-faces.el: (org-set-tag-faces): New option. (org-priority-faces): New variable. * org-exp.el (org-export-as-html): Add a "content" div around the entire content of the body tag. (org-export-html-get-bibliography): New function. (org-export-html-validation-link): New variable. (org-export-as-html): Add validation link to exported page. * org.el (org-match-sparse-tree): Renamed from `org-tags-sparse-tree'. (org-tags-sparse-tree): New alias. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-get-valid-level): Catch the case where the level change is nil. * org-clock.el (org-clock-find-position): Better indentation of new clock drawers. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-quit): Delete window only when the frame-setup was not `current-window'. * org.el (org-tag-persistent-alist): New option. (org-startup-options): Add keyword `noptag'. (org-fast-todo-selection): Handle :newline correctly. (org-set-tags): Handle :newline correctly. (org-fast-tag-selection): Handle :newline correctly. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-as-ascii): Reverse link buffer before outputting it. (org-export-ascii-push-links): Fix bug with pussing links into the export buffer. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-archive.el (org-archive-subtree): Do not add 1 to level if pasting at top level. * org-bbdb.el: Improve documentation. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-list.el (org-insert-item): Only consider insert empty lines is `org-empty-line-terminates-plain-lists' is not nil. * org.el (org-blank-before-new-entry): Mention the dependence on `org-empty-line-terminates-plain-lists' in the docstring. * org-publish.el (org-publish-get-project-from-filename): New optional argument UP. Only find the top project if UP is set. (org-publish-current-project): Find the top encloding project. * org-agenda.el (org-agenda-before-write-hook) (org-agenda-add-entry-text-maxlines): New options. (org-write-agenda): Run the new hook in the temporary buffer. (org-agenda-add-entry-text): New function. (org-write-agenda): Implement PDF export, using ps2pdf. * org.el (org-global-properties-fixed, org-global-properties): Improve documentation string. * org-exp.el (org-export-ascii-links-to-notes): New option. (org-export-as-ascii): Handle links better. (org-export-ascii-wrap, org-export-ascii-push-links): New functions. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda): Make prefix arg optional. (org-agenda-search-headline-for-time): New option. (org-format-agenda-item): Honor `org-agenda-search-headline-for-time'. * org-table.el (orgtbl-self-insert-command): Cluster undo for 20 characters. * org.el (org-self-insert-cluster-for-undo): New option. (org-self-insert-command): Cluster undo for 20 characters. (org-self-insert-command-undo-counter): New variable. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-as-html): Fix problem with closing colone example. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-as-latex) (org-export-latex-first-lines): Avoid modification flag when adding or removing text properties. (org-export-latex-fontify): Catch error when org-emph-alist has entries that are not defined for LaTeX export. * org-export-latex.el: renamed to org-latex.el * org-latex.el: renamed from org-export-latex.el * org.el (orgstruct++-mode): New function. (turn-on-orgstruct++): Call `orgstruct++-mode'. (org-context-p): Allow detecting item context after the first line of an item. (orgstruct-make-binding): Detect if item-body context should be seen. (orgstruct-is-++): New variable. (org-add-planning-info): Catch the case when there is no planning info yet and the call does not want to add anything, only maybe tries to remove something. (org-special-ctrl-a/e): All value to be a cons cell with separate settings for `C-a. and `C-e'. (org-beginning-of-line, org-end-of-line): Honor separate values for `C-a' and `C-e'. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-reload): New command. 2009-08-06 Carsten Dominik <carsten.dominik@gmail.com> * org.texi (Publishing action): Improve documentation of file names when publishing to the source directory. (Clean view): Document `org-indent-mode'. (Clocking work time): Add documentation for the new :timetamp option when creating a clock report. (Paragraphs): Fix many typos. (Plain lists): Remove duplicate explanation about the `C-c *' command. (Literal examples): Update to reflect the new behavior of the -n -r -k switches when exporting source code examples. (Structure editing): Add information about `C-c *', converting a plain list into a list of Org items. (Remember): Small rephrasing of the paragraph describing remember.el. Also mentioned that remember.el is part of Emacs 23, not Emacs 22. (Clocking work time): Add documentation about displaying the current clocking time against the effort estimate. Also add a footnote about using `org-clock-in-prepare-hook' to add an effort estimate on the fly, just before clocking it. (Footnotes): Document automatic renumbering and sorting. (Agenda commands): Document new bulk commands. (Plain lists): Document new behavior of `org-cycle-include-plain-lists'. Hyphenation only in TeX. (Clocking work time): Document the key to update effort estimates. (Clocking work time): Document the clock time display. (Structure editing, TODO basics): Document new variables. (Column attributes): Document new colciew operators. (Publishing options): Document :xml-declaration. (Tracking TODO state changes): Document the LOG_INTO_DRAWER property. (Literal examples): Document the new implementation for editing source code. (Publishing action): Mention the new publishing function, to publish an Org source file. (Publishing links): Mention how to link to an Org source file. (Macro replacement): Document new macros. (Handling links): Document type-specific completion when inserting links. (Structure editing, Plain lists): Improve documentation on sorting. (Internal links): Document custom ids for links. (Handling links): Document custom ids for links. (CSS support): Document new class. (Refiling notes): Document the possibility to create new nodes during refiling. (Agenda commands): Document the "?" operator to find tasks without effort setting. (Exporting agenda information): Section moved. (RSS Feeds): New section. (Built-in table editor): Document M-e and M-a navigate inside table field. (Stuck projects): Docment that projects identified as un-stuck will still be searchd for stuck sub-projects. (Paragraphs): Document centering. (Creating timestamps, Agenda commands): Document new behavior when changing time stamps. (Structure editing): Document the new command `org-clone-subtree-with-time-shift'. (Publishing): Refresh this chapter. (Export options, Export options, In-buffer settings): Document the new keywords. (Matching tags and properties): Collect all documentation about tags/property matches here. (Setting tags): Document `org-tag-persistent-alist'. (Weekly/daily agenda): New section. (Orgstruct mode): Describe `orgstruct++-mode'. (Drawers): Mention the LOGBOOK drawer. (Export options, Sectioning structure): Document the #+LEATEX_HEADER in-buffer setting. (Bugs): Section removed. (Hooks): New section. (Add-on packages): Moved here from old location. (Context-sensitive commands): New section. (Setting tags): Document newline option. (Global TODO list, Matching tags and properties): Mention more variables. (Checkboxes): Update to changed command behavior.
author: Carsten Dominik 2009-08-06 09:14:10 +0000
committer: Carsten Dominik 2009-08-06 09:14:10 +0000
commit: c8d0cf5ca023b996beb0ca15f7b054951acf9c7e (patch)
tree: b1c465c4840dd899dc51ea577a3f5f70c4079e71 /doc/misc
parent: 8c914fdb1828b576dd66fd4ef546c32d62252c06 (diff)
download: emacs-c8d0cf5ca023b996beb0ca15f7b054951acf9c7e.tar.gz
emacs-c8d0cf5ca023b996beb0ca15f7b054951acf9c7e.zip
2 files changed, 2855 insertions, 1472 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index f9ec9a6f6e7..6f847d6d86d 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,86 @@
+2009-08-06  Carsten Dominik  <carsten.dominik@gmail.com>
+        * org.texi (Publishing action): Improve documentation of file
+        names when publishing to the source directory.
+        (Clean view): Document `org-indent-mode'.
+        (Clocking work time): Add documentation for the
+        new :timetamp option when creating a clock report.
+        (Paragraphs): Fix many typos.
+        (Plain lists): Remove duplicate explanation about the
+        `C-c *' command.
+        (Literal examples): Update to reflect the new behavior
+        of the -n -r -k switches when exporting source code examples.
+        (Structure editing): Add information about `C-c *',
+        converting a plain list into a list of Org items.
+        (Remember): Small rephrasing of the paragraph
+        describing remember.el.  Also mentioned that remember.el is part
+        of Emacs 23, not Emacs 22.
+        (Clocking work time): Add documentation about
+        displaying the current clocking time against the effort estimate.
+        Also add a footnote about using `org-clock-in-prepare-hook' to add
+        an effort estimate on the fly, just before clocking it.
+        (Footnotes): Document automatic renumbering and
+        sorting.
+        (Agenda commands): Document new bulk commands.
+        (Plain lists): Document new behavior of
+        `org-cycle-include-plain-lists'.
+         Hyphenation only in TeX.
+        (Clocking work time): Document the key to update effort
+        estimates.
+        (Clocking work time): Document the clock time display.
+        (Structure editing, TODO basics): Document new
+        variables.
+        (Column attributes): Document new colciew operators.
+        (Publishing options): Document :xml-declaration.
+        (Tracking TODO state changes): Document the
+        LOG_INTO_DRAWER property.
+        (Literal examples): Document the new implementation for
+        editing source code.
+        (Publishing action): Mention the new publishing
+        function, to publish an Org source file.
+        (Publishing links): Mention how to link to an Org source file.
+        (Macro replacement): Document new macros.
+        (Handling links): Document type-specific completion
+        when inserting links.
+        (Structure editing, Plain lists): Improve documentation
+        on sorting.
+        (Internal links): Document custom ids for links.
+        (Handling links): Document custom ids for links.
+        (CSS support): Document new class.
+        (Refiling notes): Document the possibility to create new nodes
+        during refiling.
+        (Agenda commands): Document the "?" operator to find
+        tasks without effort setting.
+        (Exporting agenda information): Section moved.
+        (RSS Feeds): New section.
+        (Built-in table editor): Document M-e and M-a navigate
+        inside table field.
+        (Stuck projects): Docment that projects identified as
+        un-stuck will still be searchd for stuck sub-projects.
+        (Paragraphs): Document centering.
+        (Creating timestamps, Agenda commands): Document new
+        behavior when changing time stamps.
+        (Structure editing): Document the new command
+        `org-clone-subtree-with-time-shift'.
+        (Publishing): Refresh this chapter.
+        (Export options, Export options, In-buffer settings):
+        Document the new keywords.
+        (Matching tags and properties): Collect all
+        documentation about tags/property matches here.
+        (Setting tags): Document `org-tag-persistent-alist'.
+        (Weekly/daily agenda): New section.
+        (Orgstruct mode): Describe `orgstruct++-mode'.
+        (Drawers): Mention the LOGBOOK drawer.
+        (Export options, Sectioning structure): Document the
+        #+LEATEX_HEADER in-buffer setting.
+        (Bugs): Section removed.
+        (Hooks): New section.
+        (Add-on packages): Moved here from old location.
+        (Context-sensitive commands): New section.
+        (Setting tags): Document newline option.
+        (Global TODO list, Matching tags and properties):
+        Mention more variables.
+        (Checkboxes): Update to changed command behavior.
 2009-08-02  Eric Yu  <sucode@gmail.com>  (tiny change)
        * speedbar.texi (Basic Key Bindings): Fix typo.
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index aad349567fb..cc7ff28bbec 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.21b
+@set VERSION 6.29c
-@set DATE February 2009
+@set DATE August 2009
 @c Version and Contact Info
 @set MAINTAINERSITE @uref{http://orgmode.org,maintainers webpage}
@@ -16,6 +16,21 @@
 @finalout
 @c Macro definitions
+@iftex
+@c @hyphenation{time-stamp time-stamps time-stamp-ing time-stamp-ed}
+@end iftex
+@macro Ie {}
+I.e.,
+@end macro
+@macro ie {}
+i.e.,
+@end macro
+@macro Eg {}
+E.g.,
+@end macro
+@macro eg {}
+e.g.,
+@end macro
 @c Subheadings inside a table.
 @macro tsubheading{text}
@@ -28,7 +43,7 @@
 @end macro
 @copying
-This manual is for Org (version @value{VERSION}).
+This manual is for Org version @value{VERSION}.
 Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
@@ -93,11 +108,11 @@ license to the document, as described in section 6 of the license.
 * Exporting::                   Sharing and publishing of notes
 * Publishing::                  Create a web site of linked Org files
 * Miscellaneous::               All the rest which did not fit elsewhere
-* Extensions::                  Add-ons for Org mode
 * Hacking::                     How to hack your way around
 * History and Acknowledgments::  How Org came into being
 * Main Index::                  An index of Org's concepts and features
 * Key Index::                   Key bindings and where they are described
+* Variable Index::              Variables mentioned in the manual
 @detailmenu
 --- The Detailed Node Listing ---
@@ -121,6 +136,7 @@ Document Structure
 * Sparse trees::                Matches embedded in context
 * Plain lists::                 Additional structure within an entry
 * Drawers::                     Tucking stuff away
+* Blocks::                      Folding blocks
 * Footnotes::                   How footnotes are defined in Org's syntax
 * Orgstruct mode::              Structure editing outside Org
@@ -132,11 +148,11 @@ Archiving
 Tables
 * Built-in table editor::       Simple tables
-* Narrow columns::              Stop wasting space in tables
+* Column width and alignment::  Overrule the automatic settings
 * Column groups::               Grouping to trigger vertical lines
 * Orgtbl mode::                 The table editor as minor mode
 * The spreadsheet::             The table editor has spreadsheet capabilities
-* Org Plot::                    Plotting from org tables
+* Org-Plot::                    Plotting from org tables
 The spreadsheet
@@ -237,10 +253,12 @@ Capture
 * Remember::                    Capture new tasks/ideas with little interruption
 * Attachments::                 Add files to tasks.
+* RSS Feeds::                   Getting input from RSS feeds
+* Protocols::                   External (@eg Browser) access to Emacs and Org
 Remember
-* Setting up Remember::         Some code for .emacs to get things going
+* Setting up Remember for Org:: Some code for .emacs to get things going
 * Remember templates::          Define the outline of different note types
 * Storing notes::               Directly get the note to where it belongs
 * Refiling notes::              Moving a note or task to a project
@@ -253,6 +271,7 @@ Agenda Views
 * 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
+* Exporting Agenda Views::
 * Agenda column view::          Using column view for collected entries
 The built-in agenda views
@@ -275,15 +294,13 @@ 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
-* Exporting Agenda Views::      Writing agendas to files
-* Using the agenda elsewhere::  Using agenda information in other programs
-Embedded LaTeX
+Embedded La@TeX{}
-* Math symbols::                TeX macros for symbols and Greek letters
+* Math symbols::                @TeX{} macros for symbols and Greek letters
 * Subscripts and superscripts::  Simple syntax for raising/lowering text
 * LaTeX fragments::             Complex formulas made easy
-* Processing LaTeX fragments::  Previewing LaTeX processing
+* Processing LaTeX fragments::  Previewing La@TeX{} processing
 * CDLaTeX mode::                Speed up entering of formulas
 Exporting
@@ -294,7 +311,8 @@ Exporting
 * The export dispatcher::       How to access exporter commands
 * ASCII export::                Exporting to plain ASCII
 * HTML export::                 Exporting to HTML
-* LaTeX and PDF export::        Exporting to LaTeX, and processing to PDF
+* LaTeX and PDF export::        Exporting to La@TeX{}, and processing to PDF
+* DocBook export::              Exporting to DocBook
 * XOXO export::                 Exporting to XOXO
 * iCalendar export::            Exporting in iCalendar format
@@ -310,33 +328,45 @@ Markup rules
 * Include files::               Include the contents of a file during export
 * Tables exported::             Tables are exported richly
 * Inlined images::              How to inline images during export
-* Footnote markup::
+* Footnote markup::             ASCII representation of footnotes
 * Emphasis and monospace::      To bold or not to bold
 * TeX macros and LaTeX fragments::  Create special, rich export.
 * Horizontal rules::            A line across the page
 * Comment lines::               Some lines will not be exported
+* Macro replacement::           Global replacement of place holders
 HTML export
 * HTML Export commands::        How to invoke HTML export
 * Quoting HTML tags::           Using direct HTML in Org mode
 * Links::                       Transformation of links for HTML
+* Tables in HTML export::       How to modify the formatting of tables
 * Images in HTML export::       How to insert figures into HTML output
 * Text areas in HTML export::   An alternative way to show an example
 * CSS support::                 Changing the appearance of the output
 * Javascript support::          Info and Folding in a web browser
-LaTeX and PDF export
+La@TeX{} and PDF export
 * LaTeX/PDF export commands::   Which key invokes which commands
-* Quoting LaTeX code::          Incorporating literal LaTeX code
+* Quoting LaTeX code::          Incorporating literal La@TeX{} code
-* Sectioning structure::        Changing sectioning in LaTeX output
+* Sectioning structure::        Changing sectioning in La@TeX{} output
-* Tables in LaTeX export::      Options for exporting tables to LaTeX
+* Tables in LaTeX export::      Options for exporting tables to La@TeX{}
-* Images in LaTeX export::      How to insert figures into LaTeX output
+* Images in LaTeX export::      How to insert figures into La@TeX{} output
+DocBook export
+* DocBook export commands::     How to invoke DocBook export
+* Quoting DocBook code::        Incorporating DocBook code in Org files
+* Recursive sections::          Recursive sections in DocBook
+* Tables in DocBook export::    Tables are exported as HTML tables
+* Images in DocBook export::    How to insert figures into DocBook output
+* Special characters::          How to handle special characters
 Publishing
 * Configuration::               Defining projects
+* Uploading files::             How to get files up on the server
 * Sample configuration::        Example projects
 * Triggering publication::      Publication commands
@@ -364,24 +394,22 @@ Miscellaneous
 * Clean view::                  Getting rid of leading stars in the outline
 * TTY keys::                    Using Org on a tty
 * Interaction::                 Other Emacs packages
-* Bugs::                        Things which do not work perfectly
 Interaction with other packages
 * Cooperation::                 Packages Org cooperates with
 * Conflicts::                   Packages that lead to conflicts
-Extensions
-* Extensions in the contrib directory::  These come with the Org distro
-* Other extensions::            These you have to find on the web.
 Hacking
+* Hooks::                       Who to reach into Org's internals
+* Add-on packages::             Available extensions
 * Adding hyperlink types::      New custom link types
-* Tables in arbitrary syntax::  Orgtbl for LaTeX and other programs
+* Context-sensitive commands::  How to add functionality to such commands
+* Tables in arbitrary syntax::  Orgtbl for La@TeX{} and other programs
 * Dynamic blocks::              Automatically filled blocks
 * Special agenda views::        Customized views
+* Extracting agenda information::  Postprocessing of agenda information
 * Using the property API::      Writing programs that use entry properties
 * Using the mapping API::       Mapping over all or selected entries
@@ -420,7 +448,7 @@ implemented on top of Outline mode, which makes it possible to keep the
 content of large files well structured.  Visibility cycling and
 structure editing help to work with the tree.  Tables are easily created
 with a built-in table editor.  Org supports TODO items, deadlines,
-time stamps, and scheduling.  It dynamically compiles entries into an
+timestamps, and scheduling.  It dynamically compiles entries into an
 agenda that utilizes and smoothly integrates much of the Emacs calendar
 and diary.  Plain text URL-like links connect to websites, emails,
 Usenet messages, BBDB entries, and any files related to the projects.
@@ -429,14 +457,14 @@ structured ASCII file, as HTML, or (TODO and agenda items only) as an
 iCalendar file.  It can also serve as a publishing tool for a set of
 linked web pages.
-An important design aspect that distinguishes Org from for example
+An important design aspect that distinguishes Org from, for example,
-Planner/Muse is that it encourages to store every piece of information
+Planner/Muse is that it encourages you to store every piece of information
 only once.  In Planner, you have project pages, day pages and possibly
 other files, duplicating some information such as tasks.  In Org,
-you only have notes files.  In your notes you mark entries as tasks,
+you only have notes files.  In your notes you mark entries as tasks, and
-label them with tags and timestamps.  All necessary lists like a
+label them with tags and timestamps.  All necessary lists, like a
 schedule for the day, the agenda for a meeting, tasks lists selected by
-tags etc are created dynamically when you need them.
+tags, etc., are created dynamically when you need them.
 Org keeps simple things simple.  When first fired up, it should
 feel like a straightforward, easy to use outliner.  Complexity is not
@@ -445,18 +473,19 @@ it.  Org is a toolbox and can be used in different ways, for
 example as:
 @example
-@r{@bullet{} outline extension with visibility cycling and structure editing}
+@r{@bullet{} an outline extension with visibility cycling and structure editing}
-@r{@bullet{} ASCII system and table editor for taking structured notes}
+@r{@bullet{} an ASCII system and table editor for taking structured notes}
-@r{@bullet{} ASCII table editor with spreadsheet-like capabilities}
+@r{@bullet{} an ASCII table editor with spreadsheet-like capabilities}
-@r{@bullet{} TODO list editor}
+@r{@bullet{} a TODO list editor}
-@r{@bullet{} full agenda and planner with deadlines and work scheduling}
+@r{@bullet{} a full agenda and planner with deadlines and work scheduling}
-@r{@bullet{} environment to implement David Allen's GTD system}
+@pindex GTD, Getting Things Done
+@r{@bullet{} an environment to implement David Allen's GTD system}
 @r{@bullet{} a basic database application}
-@r{@bullet{} simple hypertext system, with HTML and LaTeX export}
+@r{@bullet{} a simple hypertext system, with HTML and La@TeX{} export}
-@r{@bullet{} publishing tool to create a set of interlinked webpages}
+@r{@bullet{} a publishing tool to create a set of interlinked webpages}
 @end example
-Org's automatic, context sensitive table editor with spreadsheet
+Org's automatic, context-sensitive table editor with spreadsheet
 capabilities can be integrated into any major mode by activating the
 minor Orgtbl mode.  Using a translation step, it can be used to maintain
 tables in arbitrary file types, for example in La@TeX{}.  The structure
@@ -466,7 +495,7 @@ the minor Orgstruct mode.
 @cindex FAQ
 There is a website for Org which provides links to the newest
 version of Org, as well as additional information, frequently asked
-questions (FAQ), links to tutorials etc.  This page is located at
+questions (FAQ), links to tutorials, etc@.  This page is located at
 @uref{http://orgmode.org}.
 @page
@@ -482,8 +511,8 @@ XEmacs package, please skip this section and go directly to
 @ref{Activation}.}
 If you have downloaded Org from the Web, either as a distribution @file{.zip}
-or @file{.tar} file, or as a GIT archive, you must take the following steps
+or @file{.tar} file, or as a Git archive, you must take the following steps
-to install it: Go into the unpacked Org distribution directory and edit the
+to install it: go into the unpacked Org distribution directory and edit the
 top section of the file @file{Makefile}.  You must set the name of the Emacs
 binary (likely either @file{emacs} or @file{xemacs}), and the paths to the
 directories where local Lisp and Info files are kept.  If you don't have
@@ -518,11 +547,23 @@ make
 @end example
 @noindent If you are running Org from the distribution directory, this is
-all.  If you want to install into the system directories, use
+all.  If you want to install Org into the system directories, use (as
+administrator)
 @example
 make install
+@end example
+Installing Info files is system dependent, because of differences in the
+@file{install-info} program.  In Debian it copies the info files into the
+correct directory and modifies the info directory file.  In many other
+systems, the files need to be copied to the correct directory separately, and
+@file{install-info} then only modifies the directory file.  Check your system
+documentation to find out which of the following commands you need:
+@example
 make install-info
+make install-info-debian
 @end example
 @noindent Then add to @file{.emacs}:
@@ -542,16 +583,16 @@ Do not forget to activate Org as described in the following section.
 @cindex key bindings, global
 @iftex
-@b{Important:} @i{If you use copy-and-paste to copy lisp code from the
+@b{Important:} @i{If you use copy-and-paste to copy Lisp code from the
-PDF documentation as viewed by some PDF viewers to your .emacs file, the
+PDF documentation as viewed by some PDF viewers to your @file{.emacs} file, the
-single quote character comes out incorrectly and the code will not work.
+single-quote character comes out incorrectly and the code will not work.
-You need to fix the single quotes by hand, or copy from Info
+You need to fix the single-quotes by hand, or copy from Info
 documentation.}
 @end iftex
 Add the following lines to your @file{.emacs} file.  The last three lines
 define @emph{global} keys for the commands @command{org-store-link},
-@command{org-agenda}, and @command{org-iswitchb} - please choose suitable
+@command{org-agenda}, and @command{org-iswitchb}---please choose suitable
 keys yourself.
 @lisp
@@ -565,7 +606,7 @@ keys yourself.
 Furthermore, you must activate @code{font-lock-mode} in Org
 buffers, because significant functionality depends on font-locking being
 active.  You can do this with either one of the following two lines
-(XEmacs user must use the second option):
+(XEmacs users must use the second option):
 @lisp
 (global-font-lock-mode 1)                     ; for all buffers
 (add-hook 'org-mode-hook 'turn-on-font-lock)  ; Org buffers only
@@ -580,18 +621,21 @@ like this:
 MY PROJECTS    -*- mode: org; -*-
 @end example
+@vindex org-insert-mode-line-in-empty-file
 @noindent which will select Org mode for this buffer no matter what
 the file's name is.  See also the variable
 @code{org-insert-mode-line-in-empty-file}.
-Many commands in Org work on the region if the region is active.  To make use
+Many commands in Org work on the region if the region is @i{active}.  To make
-of this, you need to have @code{transient-mark-mode} (@code{zmacs-regions} in
+use of this, you need to have @code{transient-mark-mode}
-XEmacs) turned on.  In Emacs 23 this is the default, in Emacs 22 you need to
+(@code{zmacs-regions} in XEmacs) turned on.  In Emacs 23 this is the default,
-do this yourself with
+in Emacs 22 you need to do this yourself with
 @lisp
 (transient-mark-mode 1)
 @end lisp
+@noindent If you do not like @code{transient-mark-mode}, you can create an
+active region by using the mouse to select a region, or pressing
+@kbd{C-@key{SPC}} twice before moving the cursor.
 @node Feedback, Conventions, Activation, Introduction
 @section Feedback
@@ -601,7 +645,7 @@ do this yourself with
 @cindex author
 If you find problems with Org, or if you have questions, remarks, or ideas
-about it, please mail to the Org mailing list @code{emacs-orgmode@@gnu.org}.
+about it, please mail to the Org mailing list @email{emacs-orgmode@@gnu.org}.
 If you are not a member of the mailing list, your mail will be reviewed by a
 moderator and then passed through to the list.
@@ -624,21 +668,21 @@ small example file helps, along with clear information about:
 @cindex backtrace of an error
 If working with Org produces an error with a message you don't
 understand, you may have hit a bug.  The best way to report this is by
-providing, in addition to what was mentioned above, a @emph{Backtrace}.
+providing, in addition to what was mentioned above, a @emph{backtrace}.
 This is information from the built-in debugger about where and how the
 error occurred.  Here is how to produce a useful backtrace:
 @enumerate
 @item
-Start a fresh Emacs or XEmacs, and make sure that it will load the
+Reload uncompiled versions of all Org-mode Lisp files.  The backtrace
-original Lisp code in @file{org.el} instead of the compiled version in
+contains much more information if it is produced with uncompiled code.
-@file{org.elc}.  The backtrace contains much more information if it is
+To do this, use
-produced with uncompiled code.  To do this, either rename @file{org.elc}
-to something else before starting Emacs, or ask Emacs explicitly to load
-@file{org.el} by using the command line
 @example
-emacs -l /path/to/org.el
+C-u M-x org-reload RET
 @end example
+@noindent
+or select @code{Org -> Refresh/Reload -> Reload Org uncompiled} from the
+menu.
 @item
 Go to the @code{Options} menu and select @code{Enter Debugger on Error}
 (XEmacs has this option in the @code{Troubleshooting} sub-menu).
@@ -677,7 +721,7 @@ special meaning are written with all capitals.
 @cindex document structure
 @cindex structure of document
-Org is based on outline mode and provides flexible commands to
+Org is based on Outline mode and provides flexible commands to
 edit the structure of the document.
 @menu
@@ -690,6 +734,7 @@ edit the structure of the document.
 * Sparse trees::                Matches embedded in context
 * Plain lists::                 Additional structure within an entry
 * Drawers::                     Tucking stuff away
+* Blocks::                      Folding blocks
 * Footnotes::                   How footnotes are defined in Org's syntax
 * Orgstruct mode::              Structure editing outside Org
 @end menu
@@ -706,12 +751,13 @@ of this structure is achieved by folding (hiding) large parts of the
 document to show only the general document structure and the parts
 currently being worked on.  Org greatly simplifies the use of
 outlines by compressing the entire show/hide functionality into a single
-command @command{org-cycle}, which is bound to the @key{TAB} key.
+command, @command{org-cycle}, which is bound to the @key{TAB} key.
 @node Headlines, Visibility cycling, Outlines, Document Structure
 @section Headlines
 @cindex headlines
 @cindex outline tree
+@vindex org-special-ctrl-a/e
 Headlines define the structure of an outline tree.  The headlines in
 Org start with one or more stars, on the left margin@footnote{See
@@ -731,8 +777,9 @@ of @kbd{C-a} and @kbd{C-e} in headlines.}.  For example:
 @noindent Some people find the many stars too noisy and would prefer an
 outline that has whitespace followed by a single star as headline
-starters.  @ref{Clean view} describes a setup to realize this.
+starters.  @ref{Clean view}, describes a setup to realize this.
+@vindex org-cycle-separator-lines
 An empty line after the end of a subtree is considered part of it and
 will be hidden when the subtree is folded.  However, if you leave at
 least two empty lines, one empty line will remain visible after folding
@@ -766,6 +813,8 @@ Org uses just two commands, bound to @key{TAB} and
 '-----------------------------------'
 @end example
+@vindex org-cycle-emulate-tab
+@vindex org-cycle-global-at-bob
 The cursor must be on a headline for this to work@footnote{see, however,
 the option @code{org-cycle-emulate-tab}.}.  When the cursor is at the
 beginning of the buffer and the first line is not a headline, then
@@ -821,8 +870,13 @@ negative then go up that many levels.  With a @kbd{C-u} prefix, do not remove
 the previously used indirect buffer.
 @end table
+@vindex org-startup-folded
+@cindex @code{overview}, STARTUP keyword
+@cindex @code{content}, STARTUP keyword
+@cindex @code{showall}, STARTUP keyword
 When Emacs first visits an Org file, the global state is set to
-OVERVIEW, i.e. only the top level headlines are visible.  This can be
+OVERVIEW, @ie only the top level headlines are visible.  This can be
 configured through the variable @code{org-startup-folded}, or on a
 per-file basis by adding one of the following lines anywhere in the
 buffer:
@@ -833,6 +887,7 @@ buffer:
 #+STARTUP: showall
 @end example
+@cindex property, VISIBILITY
 @noindent
 Furthermore, any entries with a @samp{VISIBILITY} property (@pxref{Properties
 and Columns}) will get their visibility adapted accordingly.  Allowed values
@@ -841,7 +896,7 @@ for this property are @code{folded}, @code{children}, @code{content}, and
 @table @kbd
 @kindex C-u C-u @key{TAB}
 @item C-u C-u @key{TAB}
-Switch back to the startup visibility of the buffer, i.e. whatever is
+Switch back to the startup visibility of the buffer, @ie whatever is
 requested by startup options and @samp{VISIBILITY} properties in individual
 entries.
 @end table
@@ -874,6 +929,7 @@ Backward to higher level heading.
 Jump to a different place without changing the current outline
 visibility.  Shows the document structure in a temporary buffer, where
 you can use the following keys to find your destination:
+@vindex org-goto-auto-isearch
 @example
 @key{TAB}         @r{Cycle visibility.}
 @key{down} / @key{up}   @r{Next/previous visible headline.}
@@ -886,7 +942,9 @@ u            @r{One level up.}
 0-9          @r{Digit argument.}
 q            @r{Quit}
 @end example
-See also the variable@code{org-goto-interface}.
+@vindex org-goto-interface
+@noindent
+See also the variable @code{org-goto-interface}.
 @end table
 @node Structure editing, Archiving, Motion, Document Structure
@@ -904,6 +962,7 @@ See also the variable@code{org-goto-interface}.
 @table @kbd
 @kindex M-@key{RET}
 @item M-@key{RET}
+@vindex org-M-RET-may-split-line
 Insert new heading with same level as current.  If the cursor is in a
 plain list item, a new item is created (@pxref{Plain lists}).  To force
 creation of a new headline, use a prefix argument, or first press @key{RET}
@@ -914,7 +973,7 @@ customize the variable @code{org-M-RET-may-split-line}.}.  If the
 command is used at the beginning of a headline, the new headline is
 created before the current line.  If at the beginning of any other line,
 the content of that line is made the new heading.  If the command is
-used at the end of a folded subtree (i.e. behind the ellipses at the end
+used at the end of a folded subtree (@ie behind the ellipses at the end
 of a headline), then a headline like the current one will be inserted
 after the end of the subtree.
 @kindex C-@key{RET}
@@ -924,7 +983,9 @@ current heading, the new heading is placed after the body instead of before
 it.  This command works from anywhere in the entry.
 @kindex M-S-@key{RET}
 @item M-S-@key{RET}
-Insert new TODO entry with same level as current heading.
+@vindex org-treat-insert-todo-heading-as-state-change
+Insert new TODO entry with same level as current heading.  See also the
+variable @code{org-treat-insert-todo-heading-as-state-change}.
 @kindex C-S-@key{RET}
 @item C-S-@key{RET}
 Insert new TODO entry with same level as current heading.  Like
@@ -951,7 +1012,7 @@ level).
 Move subtree down (swap with next subtree of same level).
 @kindex C-c C-x C-w
 @item C-c C-x C-w
-Kill subtree, i.e. remove it from buffer but save in kill ring.
+Kill subtree, @ie remove it from buffer but save in kill ring.
 With a numeric prefix argument N, kill N sequential subtrees.
 @kindex C-c C-x M-w
 @item C-c C-x M-w
@@ -965,6 +1026,8 @@ also be specified with a numeric prefix argument, or by yanking after a
 headline marker like @samp{****}.
 @kindex C-y
 @item C-y
+@vindex org-yank-adjusted-subtrees
+@vindex org-yank-folded-subtrees
 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
@@ -975,6 +1038,14 @@ previously visible.  Any prefix argument to this command will force a normal
 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-x c
+@item C-c C-x c
+Clone a subtree by making a number of sibling copies of it.  You will be
+prompted for the number of copies to make, and you can also specify if any
+timestamps in the entry should be shifted.  This can be useful, for example,
+to create a number of tasks related to a series of lectures to prepare.  For
+more details, see the docstring of the command
+@code{org-clone-subtree-with-time-shift}.
 @kindex C-c C-w
 @item C-c C-w
 Refile entry or region to a different location.  @xref{Refiling notes}.
@@ -983,18 +1054,19 @@ Refile entry or region to a different location.  @xref{Refiling notes}.
 Sort same-level entries.  When there is an active region, all entries in the
 region will be sorted.  Otherwise the children of the current headline are
 sorted.  The command prompts for the sorting method, which can be
-alphabetically, numerically, by time (using the first time stamp in each
+alphabetically, numerically, by time (first timestamp with active preferred,
-entry), by priority, or by TODO keyword (in the sequence the keywords have
+creation time, scheduled time, deadline time), by priority, by TODO keyword
-been defined in the setup).  Reverse sorting is possible as well.  You can
+(in the sequence the keywords have been defined in the setup) or by the value
-also supply your own function to extract the sorting key.  With a @kbd{C-u}
+of a property.  Reverse sorting is possible as well.  You can also supply
-prefix, sorting will be case-sensitive.  With two @kbd{C-u C-u} prefixes,
+your own function to extract the sorting key.  With a @kbd{C-u} prefix,
-duplicate entries will also be removed.
+sorting will be case-sensitive.  With two @kbd{C-u C-u} prefixes, duplicate
+entries will also be removed.
 @kindex C-x n s
 @item C-x n s
 Narrow buffer to current subtree.
 @kindex C-x n w
 @item C-x n w
-Widen buffer to remove a narrowing.
+Widen buffer to remove narrowing.
 @kindex C-c *
 @item C-c *
 Turn a normal line or plain list item into a headline (so that it becomes a
@@ -1007,8 +1079,8 @@ headline, remove the stars from all headlines in the region.
 @cindex region, active
 @cindex active region
-@cindex Transient mark mode
+@cindex transient mark mode
-When there is an active region (Transient mark mode), promotion and
+When there is an active region (Transient Mark mode), promotion and
 demotion work on all headlines in the region.  To select a region of
 headlines, it is best to place both point and mark at the beginning of a
 line, mark at the beginning of the first headline, and point at the line
@@ -1039,25 +1111,33 @@ A headline that is marked with the ARCHIVE tag (@pxref{Tags}) stays at
 its location in the outline tree, but behaves in the following way:
 @itemize @minus
 @item
+@vindex org-cycle-open-archived-trees
 It does not open when you attempt to do so with a visibility cycling
 command (@pxref{Visibility cycling}).  You can force cycling archived
 subtrees with @kbd{C-@key{TAB}}, or by setting the option
 @code{org-cycle-open-archived-trees}.  Also normal outline commands like
 @code{show-all} will open archived subtrees.
 @item
+@vindex org-sparse-tree-open-archived-trees
 During sparse tree construction (@pxref{Sparse trees}), matches in
 archived subtrees are not exposed, unless you configure the option
 @code{org-sparse-tree-open-archived-trees}.
 @item
+@vindex org-agenda-skip-archived-trees
 During agenda view construction (@pxref{Agenda Views}), the content of
 archived trees is ignored unless you configure the option
 @code{org-agenda-skip-archived-trees}, in which case these trees will always
 be included.  In the agenda you can press the @kbd{v} key to get archives
 temporarily included.
 @item
+@vindex org-export-with-archived-trees
 Archived trees are not exported (@pxref{Exporting}), only the headline
 is.  Configure the details using the variable
 @code{org-export-with-archived-trees}.
+@item
+@vindex org-columns-skip-arrchived-trees
+Archived trees are excluded from column view unless the variable
+@code{org-columns-skip-arrchived-trees} is configured to @code{nil}.
 @end itemize
 The following commands help managing the ARCHIVE tag:
@@ -1096,12 +1176,15 @@ the entry with the heading @samp{Archive} and the tag @samp{ARCHIVE}
 (@pxref{ARCHIVE tag}).  The entry becomes a child of that sibling and in this
 way retains a lot of its original context, including inherited tags and
 approximate position in the outline.
+@kindex C-c $
 @kindex C-c C-x C-s
+@itemx C-c $
 @item C-c C-x C-s
+@vindex org-archive-location
 Archive the subtree starting at the cursor position to the location
 given by @code{org-archive-location}.  Context information that could be
-lost like the file name, the category, inherited tags, and the TODO
+lost, like the file name, the category, inherited tags, and the TODO
-state will be store as properties in the entry.
+state will be stored as properties in the entry.
 @kindex C-u C-c C-x C-s
 @item C-u C-c C-x C-s
 Check if any direct children of the current headline could be moved to
@@ -1125,17 +1208,20 @@ using this method is @emph{strongly} deprecated as it is incompatible
 with the outline structure of the document.  The correct method for
 setting multiple archive locations in a buffer is using properties.}:
+@cindex #+ARCHIVE
 @example
 #+ARCHIVE: %s_done::
 @end example
+@cindex property, ARCHIVE
 @noindent
 If you would like to have a special ARCHIVE location for a single entry
 or a (sub)tree, give the entry an @code{:ARCHIVE:} property with the
 location as the value (@pxref{Properties and Columns}).
+@vindex org-archive-save-context-info
 When a subtree is moved, it receives a number of special properties that
-record context information like the file from where the entry came, it's
+record context information like the file from where the entry came, its
 outline path the archiving time etc.  Configure the variable
 @code{org-archive-save-context-info} to adjust the amount of information
 added.
@@ -1147,6 +1233,10 @@ added.
 @cindex folding, sparse trees
 @cindex occur, command
+@vindex org-show-hierarchy-above
+@vindex org-show-following-heading
+@vindex org-show-siblings
+@vindex org-show-entry-below
 An important feature of Org mode is the ability to construct @emph{sparse
 trees} for selected information in an outline tree, so that the entire
 document is folded as much as possible, but the selected information is made
@@ -1165,19 +1255,21 @@ commands can be accessed through a dispatcher:
 This prompts for an extra key to select a sparse-tree creating command.
 @kindex C-c / r
 @item C-c / r
+@vindex org-remove-highlights-with-change
 Occur.  Prompts for a regexp and shows a sparse tree with all matches.  If
 the match is in a headline, the headline is made visible.  If the match is in
 the body of an entry, headline and body are made visible.  In order to
 provide minimal context, also the full hierarchy of headlines above the match
 is shown, as well as the headline following the match.  Each match is also
 highlighted; the highlights disappear when the buffer is changed by an
-editing command@footnote{depending on the option
+editing command@footnote{This depends on the option
 @code{org-remove-highlights-with-change}}, or by pressing @kbd{C-c C-c}.
 When called with a @kbd{C-u} prefix argument, previous highlights are kept,
 so several calls to this command can be stacked.
 @end table
 @noindent
+@vindex org-agenda-custom-commands
 For frequently used sparse trees of specific search strings, you can
 use the variable @code{org-agenda-custom-commands} to define fast
 keyboard access to specific sparse trees.  These commands will then be
@@ -1236,6 +1328,7 @@ separator @samp{ :: } to separate the description @emph{term} from the
 description.
 @end itemize
+@vindex org-empty-line-terminates-plain-lists
 Items belonging to the same list must have the same indentation on the first
 line.  In particular, if an ordered list reaches number @samp{10.}, then the
 2--digit numbers must be written left-aligned with the other numbers in the
@@ -1261,16 +1354,17 @@ Here is an example:
   Important actors in this film are:
   - @b{Elijah Wood} :: He plays Frodo
   - @b{Sean Austin} :: He plays Sam, Frodo's friend.  I still remember
-     him very well from his role as Mikey Walsh in the Goonies.
+     him very well from his role as Mikey Walsh in @i{The Goonies}.
 @end group
 @end example
-Org supports these lists by tuning filling and wrapping commands to
+Org supports these lists by tuning filling and wrapping commands to deal with
-deal with them correctly@footnote{Org only changes the filling
+them correctly@footnote{Org only changes the filling settings for Emacs.  For
-settings for Emacs.  For XEmacs, you should use Kyle E. Jones'
+XEmacs, you should use Kyle E. Jones' @file{filladapt.el}.  To turn this on,
-@file{filladapt.el}.  To turn this on,  put into @file{.emacs}:
+put into @file{.emacs}: @code{(require 'filladapt)}}, and by exporting them
-@code{(require 'filladapt)}}, and by exporting them properly
+properly (@pxref{Exporting}).  Since indentation is what governs the
-(@pxref{Exporting}).
+structure of these lists, many structural constructs like @code{#+BEGIN_...}
+blocks can be indented to signal that they should be part of a list item.
 The following commands act on items when the cursor is in the first line
 of an item (the line with the bullet or number).
@@ -1278,16 +1372,19 @@ of an item (the line with the bullet or number).
 @table @kbd
 @kindex @key{TAB}
 @item @key{TAB}
-Items can be folded just like headline levels if you set the variable
+@vindex org-cycle-include-plain-lists
-@code{org-cycle-include-plain-lists}.  The level of an item is then
+Items can be folded just like headline levels.  Normally this works only if
-given by the indentation of the bullet/number.  Items are always
+the cursor is on a plain list item.  For more details, see the variable
-subordinate to real headlines, however; the hierarchies remain
+@code{org-cycle-include-plain-lists}. to @code{integrate}, plain list items
-completely separated.
+will be treated like low-level.  The level of an item is then given by the
+indentation of the bullet/number.  Items are always subordinate to real
+headlines, however; the hierarchies remain completely separated.
 If @code{org-cycle-include-plain-lists} has not been set, @key{TAB}
 fixes the indentation of the current line in a heuristic way.
 @kindex M-@key{RET}
 @item M-@key{RET}
+@vindex org-M-RET-may-split-line
 Insert new item at current level.  With a prefix argument, force a new
 heading (@pxref{Structure editing}).  If this command is used in the middle
 of a line, the line is @emph{split} and the rest of the line becomes the new
@@ -1305,6 +1402,7 @@ Insert a new item with a checkbox (@pxref{Checkboxes}).
 @item S-@key{up}
 @itemx S-@key{down}
 @cindex shift-selection-mode
+@vindex org-support-shift-select
 Jump to the previous/next item in the current list, but only if
 @code{org-support-shift-select} is off.  If not, you can still use paragraph
 jumping commands like @kbd{C-@key{up}} and @kbd{C-@key{down}} to quite
@@ -1341,19 +1439,30 @@ region when calling this, all lines will be converted to list items.  If the
 first line already was a list item, any item markers will be removed from the
 list.  Finally, even without an active region, a normal line will be
 converted into a list item.
+@kindex C-c *
+@item C-c *
+Turn a plain list item into a headline (so that it becomes a subheading at
+its location). @xref{Structure editing}, for a detailed explanation.
 @kindex S-@key{left}
 @kindex S-@key{right}
 @item S-@key{left}/@key{right}
+@vindex org-support-shift-select
 This command also cycles bullet styles when the cursor in on the bullet or
 anywhere in an item line, details depending on
 @code{org-support-shift-select}.
+@kindex C-c ^
+@item C-c ^
+Sort the plain list.  You will be prompted for the sorting method:
+numerically, alphabetically, by time, or by custom function.
 @end table
-@node Drawers, Footnotes, Plain lists, Document Structure
+@node Drawers, Blocks, Plain lists, Document Structure
 @section Drawers
 @cindex drawers
+@cindex #+DRAWERS
 @cindex visibility cycling, drawers
+@vindex org-drawers
 Sometimes you want to keep information associated with an entry, but you
 normally don't want to see it.  For this, Org mode has @emph{drawers}.
 Drawers need to be configured with the variable
@@ -1370,24 +1479,44 @@ look like this:
   After the drawer.
 @end example
-Visibility cycling (@pxref{Visibility cycling}) on the headline will
+Visibility cycling (@pxref{Visibility cycling}) on the headline will hide and
-hide and show the entry, but keep the drawer collapsed to a single line.
+show the entry, but keep the drawer collapsed to a single line.  In order to
-In order to look inside the drawer, you need to move the cursor to the
+look inside the drawer, you need to move the cursor to the drawer line and
-drawer line and press @key{TAB} there.  Org mode uses a drawer for
+press @key{TAB} there.  Org mode uses the @code{PROPERTIES} drawer for
-storing properties (@pxref{Properties and Columns}), and another one for
+storing properties (@pxref{Properties and Columns}), and you can also arrange
-storing clock times (@pxref{Clocking work time}).
+for state change notes (@pxref{Tracking TODO state changes}) and clock times
+(@pxref{Clocking work time}) to be stored in a drawer @code{LOGBOOK}.
-@node Footnotes, Orgstruct mode, Drawers, Document Structure
+@node Blocks, Footnotes, Drawers, Document Structure
+@section Blocks
+@vindex org-hide-block-startup
+@cindex blocks, folding
+Org-mode uses begin...end blocks for various purposes from including source
+code examples (@pxref{Literal examples}) to capturing time logging
+information (@pxref{Clocking work time}).  These blocks can be folded and
+unfolded by pressing TAB in the begin line.  You can also get all blocks
+folded at startup by configuring the variable @code{org-hide-block-startup}
+or on a per-file basis by using
+@cindex @code{hideblocks}, STARTUP keyword
+@cindex @code{nohideblocks}, STARTUP keyword
+@example
+#+STARTUP: hideblocks
+#+STARTUP: nohideblocks
+@end example
+@node Footnotes, Orgstruct mode, Blocks, Document Structure
 @section Footnotes
 @cindex footnotes
-Org-mode supports the creation of footnotes.  In contrast to the
+Org mode supports the creation of footnotes.  In contrast to the
-@file{footnote.el} package, Org-mode's footnotes are designed for work on a
+@file{footnote.el} package, Org mode's footnotes are designed for work on a
 larger document, not only for one-off documents like emails.  The basic
-syntax is similar to the one used by @file{footnote.el}, i.e. a footnote is
+syntax is similar to the one used by @file{footnote.el}, @ie a footnote is
 defined in a paragraph that is started by a footnote marker in square
 brackets in column 0, no indentation allowed.  If you need a paragraph break
-inside a footnote, use the LaTeX idiom @samp{\par}.  The footnote reference
+inside a footnote, use the La@TeX{} idiom @samp{\par}.  The footnote reference
 is simply the marker in square brackets, inside text.  For example:
 @example
@@ -1396,20 +1525,22 @@ The Org homepage[fn:1] now looks a lot better than it used to.
 [fn:1] The link is: http://orgmode.org
 @end example
-Org-mode extends the number-based syntax to @emph{named} footnotes and
+Org mode extends the number-based syntax to @emph{named} footnotes and
 optional inline definition.  Using plain numbers as markers (as
 @file{footnote.el} does) is supported for backward compatibility, but not
-encouraged because of possible conflicts with LaTeX snippets @pxref{Embedded
+encouraged because of possible conflicts with La@TeX{} snippets (@pxref{Embedded
-LaTeX}.  Here are the valid references:
+LaTeX}).  Here are the valid references:
 @table @code
 @item [1]
-A plain numeric footnote marker.
+A plain numeric footnote marker.  Compatible with @file{footnote.el}, but not
+recommended because somthing like @samp{[1]} could easily be part of a code
+snippet.
 @item [fn:name]
 A named footnote reference, where @code{name} is a unique label word, or, for
 simplicity of automatic creation, a number.
 @item [fn:: This is the inline definition of this footnote]
-A LaTeX-like anonymous footnote where the definition is given directly at the
+A La@TeX{}-like anonymous footnote where the definition is given directly at the
 reference point.
 @item [fn:name: a definition]
 An inline definition of a footnote, which also specifies a name for the note.
@@ -1417,7 +1548,8 @@ Since Org allows multiple references to the same note, you can then use
 @code{[fn:name]} to create additional references.
 @end table
-Footnote labels can be created automatically, or you create names yourself.
+@vindex org-footnote-auto-label
+Footnote labels can be created automatically, or you can create names yourself.
 This is handled by the variable @code{org-footnote-auto-label} and its
 corresponding @code{#+STARTUP} keywords, see the docstring of that variable
 for details.
@@ -1432,6 +1564,9 @@ The footnote action command.
 When the cursor is on a footnote reference, jump to the definition.  When it
 is at a definition, jump to the (first) reference.
+@vindex org-footnote-define-inline
+@vindex org-footnote-section
+@vindex org-footnote-auto-adjust
 Otherwise, create a new footnote.  Depending on the variable
 @code{org-footnote-define-inline}@footnote{The corresponding in-buffer
 setting is: @code{#+STARTUP: fninline} or @code{#+STARTUP: nofninline}}, the
@@ -1445,7 +1580,13 @@ options is offered:
 s   @r{Sort the footnote definitions by reference sequence.  During editing,}
    @r{Org makes no effort to sort footnote definitions into a particular}
    @r{sequence.  If you want them sorted, use this command, which will}
-    @r{also move entries according to @code{org-footnote-section}.}
+    @r{also move entries according to @code{org-footnote-section}.  Automatic}
+    @r{sorting after each insertion/deletion can be configured using the}
+    @r{variable @code{org-footnote-auto-adjust}.}
+r   @r{Renumber the simple @code{fn:N} footnotes.  Automatic renumbering}
+    @r{after each insertion/deletion can be configured using the variable}
+    @r{@code{org-footnote-auto-adjust}.}
+S   @r{Short for first @code{r}, then @code{s} action.}
 n   @r{Normalize the footnotes by collecting all definitions (including}
    @r{inline definitions) into a special section, and then numbering them}
    @r{in sequence.  The references will then also be numbers.  This is}
@@ -1455,6 +1596,11 @@ n   @r{Normalize the footnotes by collecting all definitions (including}
 d   @r{Delete the footnote at point, and all definitions of and references}
    @r{to it.}
 @end example
+Depending on the variable @code{org-footnote-auto-adjust}@footnote{the
+corresponding in-buffer options are @code{fnadjust} and @code{nofnadjust}.},
+renumbering and sorting footnotes can be automatic after each insertion or
+deletion.
 @kindex C-c C-c
 @item C-c C-c
 If the cursor is on a footnote reference, jump to the definition.  If it is a
@@ -1463,7 +1609,7 @@ location with a prefix argument, offer the same menu as @kbd{C-c C-x f}.
 @kindex C-c C-o
 @kindex mouse-1
 @kindex mouse-2
-@item C-c C-c  @r{or} mouse-1/2
+@item C-c C-o  @r{or} mouse-1/2
 Footnote labels are also links to the corresponding definition/reference, and
 you can use the usual commands to follow these links.
 @end table
@@ -1474,22 +1620,24 @@ you can use the usual commands to follow these links.
 @cindex minor mode for structure editing
 If you like the intuitive way the Org mode structure editing and list
-formatting works, you might want to use these commands in other modes
+formatting works, you might want to use these commands in other modes like
-like Text mode or Mail mode as well.  The minor mode Orgstruct mode
+Text mode or Mail mode as well.  The minor mode @code{orgstruct-mode} makes
-makes this possible.  You can always toggle the mode with @kbd{M-x
+this possible.   Toggle the mode with @kbd{M-x orgstruct-mode}, or
-orgstruct-mode}.  To turn it on by default, for example in Mail mode,
+turn it on by default, for example in Mail mode, with one of:
-use
 @lisp
 (add-hook 'mail-mode-hook 'turn-on-orgstruct)
+(add-hook 'mail-mode-hook 'turn-on-orgstruct++)
 @end lisp
-When this mode is active and the cursor is on a line that looks to
+When this mode is active and the cursor is on a line that looks to Org like a
-Org like a headline of the first line of a list item, most
+headline or the first line of a list item, most structure editing commands
-structure editing commands will work, even if the same keys normally
+will work, even if the same keys normally have different functionality in the
-have different functionality in the major mode you are using.  If the
+major mode you are using.  If the cursor is not in one of those special
-cursor is not in one of those special lines, Orgstruct mode lurks
+lines, Orgstruct mode lurks silently in the shadow.  When you use
-silently in the shadow.
+@code{orgstruct++-mode}, Org will also export indentation and autofill
+settings into that mode, and detect item context after the first line of an
+item.
 @node Tables, Hyperlinks, Document Structure, Top
 @chapter Tables
@@ -1509,14 +1657,14 @@ calculator).
 @menu
 * Built-in table editor::       Simple tables
-* Narrow columns::              Stop wasting space in tables
+* Column width and alignment::  Overrule the automatic settings
 * Column groups::               Grouping to trigger vertical lines
 * Orgtbl mode::                 The table editor as minor mode
 * The spreadsheet::             The table editor has spreadsheet capabilities
-* Org Plot::                    Plotting from org tables
+* Org-Plot::                    Plotting from org tables
 @end menu
-@node Built-in table editor, Narrow columns, Tables, Tables
+@node Built-in table editor, Column width and alignment, Tables, Tables
 @section The built-in table editor
 @cindex table editor, built-in
@@ -1550,6 +1698,8 @@ create the above table, you would only type
 fields.  Even faster would be to type @code{|Name|Phone|Age} followed by
 @kbd{C-c @key{RET}}.
+@vindex org-enable-table-editor
+@vindex org-table-auto-blank-field
 When typing text into a field, Org treats @key{DEL},
 @key{Backspace}, and all character keys in a special way, so that
 inserting and deleting avoids shifting other fields.  Also, when
@@ -1594,6 +1744,13 @@ Re-align, move to previous field.
 Re-align the table and move down to next row.  Creates a new row if
 necessary.  At the beginning or end of a line, @key{RET} still does
 NEWLINE, so it can be used to split a table.
+@c
+@kindex M-a
+@item M-a
+Move to beginning of the current table field, or on to the previous field.
+@kindex M-e
+@item M-e
+Move to end of the current table field, or on to the next field.
 @tsubheading{Column and row editing}
 @kindex M-@key{left}
@@ -1650,9 +1807,9 @@ argument, alphabetic sorting will be case-sensitive.
 @tsubheading{Regions}
 @kindex C-c C-x M-w
 @item C-c C-x M-w
-Copy a rectangular region from a table to a special clipboard.  Point
+Copy a rectangular region from a table to a special clipboard.  Point and
-and mark determine edge fields of the rectangle.  The process ignores
+mark determine edge fields of the rectangle.  If there is no active region,
-horizontal separator lines.
+copy just the current field.  The process ignores horizontal separator lines.
 @c
 @kindex C-c C-x C-w
 @item C-c C-x C-w
@@ -1683,7 +1840,7 @@ field is made blank, and the content is appended to the field above.
 @cindex calculations, in tables
 @cindex region, active
 @cindex active region
-@cindex Transient mark mode
+@cindex transient mark mode
 @kindex C-c +
 @item C-c +
 Sum the numbers in the current column, or in the rectangle defined by
@@ -1692,24 +1849,26 @@ be inserted with @kbd{C-y}.
 @c
 @kindex S-@key{RET}
 @item S-@key{RET}
+@vindex org-table-copy-increment
 When current field is empty, copy from first non-empty field above.  When not
 empty, copy current field down to next row and move cursor along with it.
 Depending on the variable @code{org-table-copy-increment}, integer field
 values will be incremented during copy.  Integers that are too large will not
 be incremented.  Also, a @code{0} prefix argument temporarily disables the
-increment.  This key is also used by CUA mode (@pxref{Cooperation}).
+increment.  This key is also used by shift-selection and related modes
+(@pxref{Conflicts}).
 @tsubheading{Miscellaneous}
 @kindex C-c `
 @item C-c `
-Edit the current field in a separate window.  This is useful for fields
+Edit the current field in a separate window.  This is useful for fields that
-that are not fully visible (@pxref{Narrow columns}).  When called with a
+are not fully visible (@pxref{Column width and alignment}).  When called with
-@kbd{C-u} prefix, just make the full field visible, so that it can be
+a @kbd{C-u} prefix, just make the full field visible, so that it can be
 edited in place.
 @c
 @item M-x org-table-import
-Import a file as a table.  The table should be TAB- or whitespace
+Import a file as a table.  The table should be TAB or whitespace
-separated.  Useful, for example, to import a spreadsheet table or data
+separated.  Use, for example, to import a spreadsheet table or data
 from a database, because these programs generally can write
 TAB-separated text files.  This command works by inserting the file into
 the buffer and then converting the region to a table.  Any prefix
@@ -1721,14 +1880,15 @@ buffer, selecting the pasted text with @kbd{C-x C-x} and then using the
 @kbd{C-c |} command (see above under @i{Creation and conversion}).
 @c
 @item M-x org-table-export
-Export the table, by default as a TAB-separated file.  Useful for data
+@vindex org-table-export-default-format
+Export the table, by default as a TAB-separated file.  Use for data
 exchange with, for example, spreadsheet or database programs.  The format
 used to export the file can be configured in the variable
 @code{org-table-export-default-format}.  You may also use properties
 @code{TABLE_EXPORT_FILE} and @code{TABLE_EXPORT_FORMAT} to specify the file
 name and the format for table export in a subtree.  Org supports quite
 general formats for exported tables.  The exporter format is the same as the
-format used by Orgtbl radio tables, see @ref{Translator functions} for a
+format used by Orgtbl radio tables, see @ref{Translator functions}, for a
 detailed description.
 @end table
@@ -1743,11 +1903,15 @@ it off with
 @noindent Then the only table command that still works is
 @kbd{C-c C-c} to do a manual re-align.
-@node Narrow columns, Column groups, Built-in table editor, Tables
+@node Column width and alignment, Column groups, Built-in table editor, Tables
-@section Narrow columns
+@section Column width and alignment
 @cindex narrow columns in tables
+@cindex alignment in tables
+The width of columns is automatically determined by the table editor.  And
+also the alignment of a column is determined automatically from the fraction
+of number-like versus non-number fields in the column.
-The width of columns is automatically determined by the table editor.
 Sometimes a single field or a few fields need to carry more text,
 leading to inconveniently wide columns.  To limit@footnote{This feature
 does not work on XEmacs.} the width of a column, one field anywhere in
@@ -1771,12 +1935,13 @@ value.
 @noindent
 Fields that are wider become clipped and end in the string @samp{=>}.
 Note that the full text is still in the buffer, it is only invisible.
-To see the full text, hold the mouse over the field - a tool-tip window
+To see the full text, hold the mouse over the field---a tool-tip window
 will show the full content.  To edit such a field, use the command
 @kbd{C-c `} (that is @kbd{C-c} followed by the backquote).  This will
 open a new window with the full field.  Edit it and finish with @kbd{C-c
 C-c}.
+@vindex org-startup-align-all-tables
 When visiting a file containing a table with narrowed columns, the
 necessary character hiding has not yet happened, and the table needs to
 be aligned before it looks nice.  Setting the option
@@ -1789,7 +1954,12 @@ on a per-file basis with:
 #+STARTUP: noalign
 @end example
-@node Column groups, Orgtbl mode, Narrow columns, Tables
+If you would like to overrule the automatic alignment of number-rich columns
+to the right and of string-rich column to the left, you and use @samp{<r>} or
+@samp{<l>} in a similar fashion.  You may also combine alignment and field
+width like this: @samp{<l10>}.
+@node Column groups, Orgtbl mode, Column width and alignment, Tables
 @section Column groups
 @cindex grouping columns in tables
@@ -1845,7 +2015,7 @@ construct La@TeX{} tables with the underlying ease and power of
 Orgtbl mode, including spreadsheet capabilities.  For details, see
 @ref{Tables in arbitrary syntax}.
-@node The spreadsheet, Org Plot, Orgtbl mode, Tables
+@node The spreadsheet, Org-Plot, Orgtbl mode, Tables
 @section The spreadsheet
 @cindex calculations, in tables
 @cindex spreadsheet capabilities
@@ -1894,26 +2064,24 @@ combination like @code{B3}, meaning the 2nd field in the 3rd row.
 @noindent
 Org also uses another, more general operator that looks like this:
 @example
-@@row$column
+@@@var{row}$@var{column}
 @end example
 @noindent
-Column references can be absolute like @samp{1}, @samp{2},...@samp{N},
+Column references can be absolute like @samp{1}, @samp{2},...@samp{@var{N}},
 or relative to the current column like @samp{+1} or @samp{-2}.
 The row specification only counts data lines and ignores horizontal
 separator lines (hlines).  You can use absolute row numbers
-@samp{1}...@samp{N}, and row numbers relative to the current row like
+@samp{1}...@samp{@var{N}}, and row numbers relative to the current row like
 @samp{+3} or @samp{-1}.  Or specify the row relative to one of the
 hlines: @samp{I} refers to the first hline@footnote{Note that only
 hlines are counted that @emph{separate} table lines.  If the table
 starts with a hline above the header, it does not count.}, @samp{II} to
-the second etc.  @samp{-I} refers to the first such line above the
+the second, etc@.  @samp{-I} refers to the first such line above the
 current line, @samp{+I} to the first such line below the current line.
 You can also write @samp{III+2} which is the second data line after the
-third hline in the table.  Relative row numbers like @samp{-3} will not
+third hline in the table.
-cross hlines if the current line is too close to the hline.  Instead,
-the value directly at the hline is used.
 @samp{0} refers to the current row and column.  Also, if you omit
 either the column or the row part of the reference, the current
@@ -1926,8 +2094,8 @@ Org's references with @emph{signed} numbers are floating
 references because the same reference operator can reference different
 fields depending on the field being calculated by the formula.
-As a special case references like @samp{$LR5} and @samp{$LR12} can be used to
+As a special case, references like @samp{$LR5} and @samp{$LR12} can be used
-refer in a stable way to the 5th and 12th field in the last row of the
+to refer in a stable way to the 5th and 12th field in the last row of the
 table.
 Here are a few examples:
@@ -1972,7 +2140,9 @@ see the @samp{E} mode switch below).  If there are no non-empty fields,
 @cindex references, named
 @cindex name, of column or field
 @cindex constants, in calculations
+@cindex #+CONSTANTS
+@vindex org-table-formula-constants
 @samp{$name} is interpreted as the name of a column, parameter or
 constant.  Constants are defined globally through the variable
 @code{org-table-formula-constants}, and locally (for the file) through a
@@ -1983,13 +2153,15 @@ line like
 @end example
 @noindent
+@vindex constants-unit-system
+@pindex constants.el
 Also properties (@pxref{Properties and Columns}) can be used as
-constants in table formulas: For a property @samp{:Xyz:} use the name
+constants in table formulas: for a property @samp{:Xyz:} use the name
 @samp{$PROP_Xyz}, and the property will be searched in the current
 outline entry and in the hierarchy above it.  If you have the
 @file{constants.el} package, it will also be used to resolve constants,
 including natural constants like @samp{$h} for Planck's constant, and
-units like @samp{$km} for kilometers@footnote{@file{Constant.el} can
+units like @samp{$km} for kilometers@footnote{@file{constants.el} can
 supply the values of constants in two different unit systems, @code{SI}
 and @code{cgs}.  Which one is used depends on the value of the variable
 @code{constants-unit-system}.  You can use the @code{#+STARTUP} options
@@ -2005,6 +2177,7 @@ numbers.
 @cindex references, to a different table
 @cindex name, of column or field
 @cindex constants, in calculations
+@cindex #+TBLNAME
 You may also reference constants, fields and ranges from a different table,
 either in the current file or even in a different file.  The syntax is
@@ -2018,7 +2191,8 @@ where NAME can be the name of a table in the current file as set by a
 @code{#+TBLNAME: NAME} line before the table.  It can also be the ID of an
 entry, even in a different file, and the reference then refers to the first
 table in that entry.  REF is an absolute field or range reference as
-described above, valid in the referenced table.
+described above for example @code{@@3$3} or @code{$somename}, valid in the
+referenced table.
 @node Formula syntax for Calc, Formula syntax for Lisp, References, The spreadsheet
 @subsection Formula syntax for Calc
@@ -2040,11 +2214,12 @@ like @samp{vmean} and @samp{vsum}.
 @cindex format specifier
 @cindex mode, for @file{calc}
+@vindex org-calc-default-modes
 A formula can contain an optional mode string after a semicolon.  This
 string consists of flags to influence Calc and other modes during
 execution.  By default, Org uses the standard Calc modes (precision
 12, angular units degrees, fraction and symbolic modes off).  The display
-format, however, has been changed to @code{(float 5)} to keep tables
+format, however, has been changed to @code{(float 8)} to keep tables
 compact.  The default settings can be configured using the variable
 @code{org-calc-default-modes}.
@@ -2056,6 +2231,7 @@ F S           @r{fraction and symbolic modes}
 N             @r{interpret all fields as numbers, use 0 for non-numbers}
 T             @r{force text interpretation}
 E             @r{keep empty fields in ranges}
+L             @r{literal}
 @end example
 @noindent
@@ -2088,22 +2264,22 @@ if($1<20,teen,string(""))  @r{``teen'' if age $1 less than 20, else empty}
 It is also possible to write a formula in Emacs Lisp; this can be useful
 for string manipulation and control structures, if Calc's
-functionality is not enough.  If a formula starts with a single quote
+functionality is not enough.  If a formula starts with a single-quote
-followed by an opening parenthesis, then it is evaluated as a lisp form.
+followed by an opening parenthesis, then it is evaluated as a Lisp form.
 The evaluation should return either a string or a number.  Just as with
 @file{calc} formulas, you can specify modes and a printf format after a
 semicolon.  With Emacs Lisp forms, you need to be conscious about the way
 field references are interpolated into the form.  By default, a
-reference will be interpolated as a Lisp string (in double quotes)
+reference will be interpolated as a Lisp string (in double-quotes)
 containing the field.  If you provide the @samp{N} mode switch, all
 referenced elements will be numbers (non-number fields will be zero) and
 interpolated as Lisp numbers, without quotes.  If you provide the
 @samp{L} flag, all fields will be interpolated literally, without quotes.
-I.e., if you want a reference to be interpreted as a string by the Lisp
+@Ie{}, if you want a reference to be interpreted as a string by the Lisp
-form, enclose the reference operator itself in double quotes, like
+form, enclose the reference operator itself in double-quotes, like
 @code{"$3"}.  Ranges are inserted as space-separated fields, so you can
 embed them in list or vector syntax.  A few examples, note how the
-@samp{N} mode is used when we do computations in lisp.
+@samp{N} mode is used when we do computations in Lisp.
 @example
 @r{Swap the first two characters of the content of column 1}
@@ -2125,15 +2301,16 @@ press @key{TAB} or @key{RET} or @kbd{C-c C-c} with the cursor still in
 the field, the formula will be stored as the formula for this field,
 evaluated, and the current field replaced with the result.
+@cindex #+TBLFM
 Formulas are stored in a special line starting with @samp{#+TBLFM:}
 directly below the table.  If you typed the equation in the 4th field of
 the 3rd data line in the table, the formula will look like
 @samp{@@3$4=$1+$2}.  When inserting/deleting/swapping column and rows
 with the appropriate commands, @i{absolute references} (but not relative
 ones) in stored formulas are modified in order to still reference the
-same field.  Of cause this is not true if you edit the table structure
+same field.  Of course this is not true if you edit the table structure
-with normal editing commands - then you must fix the equations yourself.
+with normal editing commands---then you must fix the equations yourself.
-The left hand side of a formula may also be a named field (@pxref{Advanced
+The left-hand side of a formula may also be a named field (@pxref{Advanced
 features}), or a last-row reference like @samp{$LR3}.
 Instead of typing an equation into the field, you may also use the
@@ -2143,8 +2320,8 @@ following command
 @kindex C-u C-c =
 @item C-u C-c =
 Install a new formula for the current field.  The command prompts for a
-formula, with default taken from the @samp{#+TBLFM:} line, applies
+formula with default taken from the @samp{#+TBLFM:} line, applies
-it to the current field and stores it.
+it to the current field, and stores it.
 @end table
 @node Column formulas, Editing and debugging formulas, Field formulas, The spreadsheet
@@ -2154,20 +2331,21 @@ it to the current field and stores it.
 Often in a table, the same formula should be used for all fields in a
 particular column.  Instead of having to copy the formula to all fields
-in that column, Org allows to assign a single formula to an entire
+in that column, Org allows you to assign a single formula to an entire
 column.  If the table contains horizontal separator hlines, everything
 before the first such line is considered part of the table @emph{header}
 and will not be modified by column formulas.
 To assign a formula to a column, type it directly into any field in the
 column, preceded by an equal sign, like @samp{=$1+$2}.  When you press
-@key{TAB} or @key{RET} or @kbd{C-c C-c} with the cursor still in the
+@key{TAB} or @key{RET} or @kbd{C-c C-c} with the cursor still in the field,
-field, the formula will be stored as the formula for the current column,
+the formula will be stored as the formula for the current column, evaluated
-evaluated and the current field replaced with the result.  If the field
+and the current field replaced with the result.  If the field contains only
-contains only @samp{=}, the previously stored formula for this column is
+@samp{=}, the previously stored formula for this column is used.  For each
-used.  For each column, Org will only remember the most recently
+column, Org will only remember the most recently used formula.  In the
-used formula.  In the @samp{TBLFM:} line, column formulas will look like
+@samp{#+TBLFM:} line, column formulas will look like @samp{$4=$1+$2}.  The left-hand
-@samp{$4=$1+$2}.
+side of a column formula cannot currently be the name of column, it
+must be the numeric column reference.
 Instead of typing an equation into the field, you may also use the
 following command:
@@ -2178,7 +2356,7 @@ following command:
 Install a new formula for the current column and replace current field with
 the result of the formula.  The command prompts for a formula, with default
 taken from the @samp{#+TBLFM} line, applies it to the current field and
-stores it.  With a numeric prefix argument(e.g. @kbd{C-5 C-c =}) the command
+stores it.  With a numeric prefix argument(@eg @kbd{C-5 C-c =}) the command
 will apply it to that many consecutive fields in the current column.
 @end table
@@ -2187,6 +2365,7 @@ will apply it to that many consecutive fields in the current column.
 @cindex formula editing
 @cindex editing, of table formulas
+@vindex org-table-use-standard-references
 You can edit individual formulas in the minibuffer or directly in the
 field.  Org can also prepare a special buffer with all active
 formulas of a table.  When offering a formula for editing, Org
@@ -2201,7 +2380,7 @@ if possible.  If you prefer to only work with the internal format (like
 @item C-c =
 @itemx C-u C-c =
 Edit the formula associated with the current column/field in the
-minibuffer.  See @ref{Column formulas} and @ref{Field formulas}.
+minibuffer.  See @ref{Column formulas}, and @ref{Field formulas}.
 @kindex C-u C-u C-c =
 @item C-u C-u C-c =
 Re-insert the active formula (either a
@@ -2215,7 +2394,7 @@ referenced by the reference at the cursor position in the formula.
 @kindex C-c @}
 @item C-c @}
 Toggle the display of row and column numbers for a table, using
-overlays.  These are updated each time the table is aligned, you can
+overlays.  These are updated each time the table is aligned; you can
 force it with @kbd{C-c C-c}.
 @kindex C-c @{
 @item C-c @{
@@ -2244,13 +2423,13 @@ Toggle all references in the formula editor between standard (like
 @code{B3}) and internal (like @code{@@3$2}).
 @kindex @key{TAB}
 @item @key{TAB}
-Pretty-print or indent lisp formula at point.  When in a line containing
+Pretty-print or indent Lisp formula at point.  When in a line containing
-a lisp formula, format the formula according to Emacs Lisp rules.
+a Lisp formula, format the formula according to Emacs Lisp rules.
 Another @key{TAB} collapses the formula back again.  In the open
-formula, @key{TAB} re-indents just like in Emacs lisp mode.
+formula, @key{TAB} re-indents just like in Emacs Lisp mode.
 @kindex M-@key{TAB}
 @item M-@key{TAB}
-Complete Lisp symbols, just like in Emacs lisp mode.
+Complete Lisp symbols, just like in Emacs Lisp mode.
 @kindex S-@key{up}
 @kindex S-@key{down}
 @kindex S-@key{left}
@@ -2258,7 +2437,7 @@ Complete Lisp symbols, just like in Emacs lisp mode.
 @item S-@key{up}/@key{down}/@key{left}/@key{right}
 Shift the reference at point.  For example, if the reference is
 @code{B3} and you press @kbd{S-@key{right}}, it will become @code{C3}.
-This also works for relative references, and for hline references.
+This also works for relative references and for hline references.
 @kindex M-S-@key{up}
 @kindex M-S-@key{down}
 @item M-S-@key{up}/@key{down}
@@ -2275,14 +2454,14 @@ Turn the coordinate grid in the table on and off.
 @end table
 Making a table field blank does not remove the formula associated with
-the field, because that is stored in a different line (the @samp{TBLFM}
+the field, because that is stored in a different line (the @samp{#+TBLFM}
-line) - during the next recalculation the field will be filled again.
+line)---during the next recalculation the field will be filled again.
 To remove a formula from a field, you have to give an empty reply when
 prompted for the formula, or to edit the @samp{#+TBLFM} line.
 @kindex C-c C-c
 You may edit the @samp{#+TBLFM} directly and re-apply the changed
-equations with @kbd{C-c C-c} in that line, or with the normal
+equations with @kbd{C-c C-c} in that line or with the normal
 recalculation commands in the table.
 @subsubheading Debugging formulas
@@ -2301,8 +2480,8 @@ field.  Detailed information will be displayed.
 @cindex updating, table
 Recalculation of a table is normally not automatic, but needs to be
-triggered by a command.  See @ref{Advanced features} for a way to make
+triggered by a command.  See @ref{Advanced features}, for a way to make
-recalculation at least semi-automatically.
+recalculation at least semi-automatic.
 In order to recalculate a line of a table or the entire table, use the
 following commands:
@@ -2366,7 +2545,7 @@ makes use of these features:
 @end group
 @end example
-@noindent @b{Important}: Please note that for these special tables,
+@noindent @b{Important}: please note that for these special tables,
 recalculating the table with @kbd{C-u C-c *} will only affect rows that
 are marked @samp{#} or @samp{*}, and fields that have a formula assigned
 to the field itself.  The column formulas are not applied in rows with
@@ -2410,8 +2589,8 @@ Do not export this line.  Useful for lines that contain the narrowing
 @samp{<N>} markers.
 @end table
-Finally, just to whet your appetite on what can be done with the
+Finally, just to whet your appetite for what can be done with the
-fantastic @file{calc} package, here is a table that computes the Taylor
+fantastic @file{calc.el} package, here is a table that computes the Taylor
 series of degree @code{n} at location @code{x} for a couple of
 functions.
@@ -2431,16 +2610,16 @@ functions.
 @end group
 @end example
-@page
+@node Org-Plot,  , The spreadsheet, Tables
-@node Org Plot,  , The spreadsheet, Tables
+@section Org-Plot
-@section Org Plot
 @cindex graph, in tables
 @cindex plot tables using gnuplot
+@cindex #+PLOT
-Org Plot can produce 2D and 3D graphs of information stored in org tables
+Org-Plot can produce 2D and 3D graphs of information stored in org tables
 using @file{Gnuplot} @uref{http://www.gnuplot.info/} and @file{gnuplot-mode}
 @uref{http://cars9.uchicago.edu/~ravel/software/gnuplot-mode.html}.  To see
-this in action ensure that you have both Gnuplot and Gnuplot-mode installed
+this in action, ensure that you have both Gnuplot and Gnuplot mode installed
 on your system, then call @code{org-plot/gnuplot} on the following table.
 @example
@@ -2456,18 +2635,18 @@ on your system, then call @code{org-plot/gnuplot} on the following table.
 @end group
 @end example
-Notice that Org Plot is smart enough to apply the tables headers as labels.
+Notice that Org Plot is smart enough to apply the table's headers as labels.
 Further control over the labels, type, content, and appearance of plots can
-be exercised through the @code{#+Plot:} lines preceding a table.  See below
+be exercised through the @code{#+PLOT:} lines preceding a table.  See below
-for a complete list of Org plot options.  For more information and examples
+for a complete list of Org-plot options.  For more information and examples
-see the org-plot tutorial at
+see the Org-plot tutorial at
 @uref{http://orgmode.org/worg/org-tutorials/org-plot.php}.
 @subsubheading Plot Options
 @table @code
 @item set
-Specify any @file{gnuplot} option to be set when graphing.
+Specify any @command{gnuplot} option to be set when graphing.
 @item title
 Specify the title of the plot.
@@ -2476,9 +2655,9 @@ Specify the title of the plot.
 Specify which column of the table to use as the @code{x} axis.
 @item deps
-Specify the columns to graph as a lisp style list, surrounded by parenthesis
+Specify the columns to graph as a Lisp style list, surrounded by parentheses
 and separated by spaces for example @code{dep:(3 4)} to graph the third and
-fourth columns (defaults to graphing all other columns aside from the ind
+fourth columns (defaults to graphing all other columns aside from the @code{ind}
 column).
 @item type
@@ -2486,32 +2665,32 @@ Specify whether the plot will be @code{2d}, @code{3d}, or @code{grid}.
 @item with
 Specify a @code{with} option to be inserted for every col being plotted
-(e.g. @code{lines}, @code{points}, @code{boxes}, @code{impulses}, etc...).
+(@eg @code{lines}, @code{points}, @code{boxes}, @code{impulses}, etc...).
 Defaults to @code{lines}.
 @item file
-If you want to plot to a file specify the @code{"path/to/desired/output-file"}.
+If you want to plot to a file, specify @code{"@var{path/to/desired/output-file}"}.
 @item labels
-List of labels to be used for the deps (defaults to column headers if they
+List of labels to be used for the deps (defaults to the column headers if
-exist).
+they exist).
 @item line
-Specify an entire line to be inserted in the gnuplot script.
+Specify an entire line to be inserted in the Gnuplot script.
 @item map
 When plotting @code{3d} or @code{grid} types, set this to @code{t} to graph a
 flat mapping rather than a @code{3d} slope.
 @item timefmt
-Specify format of org-mode timestamps as they will be parsed by gnuplot.
+Specify format of Org-mode timestamps as they will be parsed by Gnuplot.
 Defaults to @samp{%Y-%m-%d-%H:%M:%S}.
 @item script
-If you want total control you can specify a script file (place the file name
+If you want total control, you can specify a script file (place the file name
-between double quotes) which will be used to plot.  Before plotting, every
+between double-quotes) which will be used to plot.  Before plotting, every
 instance of @code{$datafile} in the specified script will be replaced with
-the path to the generated data file.  Note even if you set this option you
+the path to the generated data file.  Note: even if you set this option, you
 may still want to specify the plot type, as that can impact the content of
 the data file.
 @end table
@@ -2546,6 +2725,7 @@ clickable links.  The general link format, however, looks like this:
 [[link][description]]       @r{or alternatively}           [[link]]
 @end example
+@noindent
 Once a link in the buffer is complete (all brackets present), Org
 will change the display so that @samp{description} is displayed instead
 of @samp{[[link][description]]} and @samp{link} is displayed instead of
@@ -2570,14 +2750,24 @@ internal structure of all links, use the menu entry
 @cindex links, internal
 @cindex targets, for links
-If the link does not look like a URL, it is considered to be internal in
+@cindex property, CUSTOM_ID
-the current file.  Links such as @samp{[[My Target]]} or @samp{[[My
+If the link does not look like a URL, it is considered to be internal in the
-Target][Find my target]]} lead to a text search in the current file.
+current file.  The most important case is a link like
-The link can be followed with @kbd{C-c C-o} when the cursor is on the
+@samp{[[#my-custom-id]]} which will link to the entry with the
-link, or with a mouse click (@pxref{Handling links}).  The preferred
+@code{CUSTOM_ID} property @samp{my-custom-id}.  Such custom IDs are very good
-match for such a link is a dedicated target: the same string in double
+for HTML export (@pxref{HTML export}) where they produce pretty section
-angular brackets.  Targets may be located anywhere; sometimes it is
+links.  You are responsible yourself to make sure these custom IDs are unique
-convenient to put them into a comment line. For example
+in a file.
+Links such as @samp{[[My Target]]} or @samp{[[My Target][Find my target]]}
+lead to a text search in the current file.
+The link can be followed with @kbd{C-c C-o} when the cursor is on the link,
+or with a mouse click (@pxref{Handling links}).  Links to custom IDs will
+point to the corresponding headline.  The preferred match for a text link is
+a @i{dedicated target}: the same string in double angular brackets.  Targets
+may be located anywhere; sometimes it is convenient to put them into a
+comment line. For example
 @example
 # <<My Target>>
@@ -2589,12 +2779,16 @@ text before the first headline is usually not exported, so the first such
 target should be after the first headline, or in the line directly before the
 first headline.}.
-If no dedicated target exists, Org will search for the words in the
+If no dedicated target exists, Org will search for the words in the link.  In
-link.  In the above example the search would be for @samp{my target}.
+the above example the search would be for @samp{my target}.  Links starting
-Links starting with a star like @samp{*My Target} restrict the search to
+with a star like @samp{*My Target} restrict the search to
-headlines.  When searching, Org mode will first try an exact match, but
+headlines@footnote{To insert a link targeting a headline, in-buffer
-then move on to more and more lenient searches.  For example, the link
+completion can be used.  Just type a star followed by a few optional letters
-@samp{[[*My Targets]]} will find any of the following:
+into the buffer and press @kbd{M-@key{TAB}}.  All headlines in the current
+buffer will be offered as completions.  @xref{Handling links}, for more
+commands creating links.}.  When searching, Org mode will first try an
+exact match, but then move on to more and more lenient searches.  For
+example, the link @samp{[[*My Targets]]} will find any of the following:
 @example
 ** My targets
@@ -2602,11 +2796,6 @@ then move on to more and more lenient searches.  For example, the link
 ** my 20 targets are
 @end example
-To insert a link targeting a headline, in-buffer completion can be used.
-Just type a star followed by a few optional letters into the buffer and
-press @kbd{M-@key{TAB}}.  All headlines in the current buffer will be
-offered as completions.  @xref{Handling links}, for more commands
-creating links.
 Following a link pushes a mark onto Org's own mark ring.  You can
 return to the previous position with @kbd{C-c &}.  Using this command
@@ -2650,7 +2839,7 @@ cursor on or at a target.
 @cindex USENET links
 @cindex SHELL links
 @cindex Info links
-@cindex elisp links
+@cindex Elisp links
 Org supports links to files, websites, Usenet and email messages,
 BBDB database entries and links to both IRC conversations and their
@@ -2664,9 +2853,9 @@ file:/home/dominik/images/jupiter.jpg     @r{file, absolute path}
 /home/dominik/images/jupiter.jpg          @r{same as above}
 file:papers/last.pdf                      @r{file, relative path}
 ./papers/last.pdf                         @r{same as above}
-file:projects.org                         @r{another org file}
+file:projects.org                         @r{another Org file}
-file:projects.org::some words             @r{text search in org file}
+file:projects.org::some words             @r{text search in Org file}
-file:projects.org::*task title            @r{heading search in org file}
+file:projects.org::*task title            @r{heading search in Org file}
 id:B7423F4D-2E8A-471B-8810-C40F074717E9   @r{Link to heading by ID}
 news:comp.emacs                           @r{Usenet link}
 mailto:adent@@galaxy.net                   @r{Mail link}
@@ -2684,7 +2873,7 @@ gnus:group#id                             @r{Gnus article link}
 bbdb:R.*Stallman                          @r{BBDB link (with regexp)}
 irc:/irc.com/#emacs/bob                   @r{IRC link}
 shell:ls *.org                            @r{A shell command}
-elisp:org-agenda                          @r{Interactive elisp command}
+elisp:org-agenda                          @r{Interactive Elisp command}
 elisp:(find-file-other-frame "Elisp.org") @r{Elisp form to evaluate}
 @end example
@@ -2703,12 +2892,12 @@ button.  If there is no description at all and the link points to an
 image,
 that image will be inlined into the exported HTML file.
-@cindex angular brackets, around links
+@cindex square brackets, around links
 @cindex plain text external links
 Org also finds external links in the normal text and activates them
 as links.  If spaces must be part of the link (for example in
 @samp{bbdb:Richard Stallman}), or if you need to remove ambiguities
-about the end of the link, enclose them in angular brackets.
+about the end of the link, enclose them in square brackets.
 @node Handling links, Using links outside Org, External links, Hyperlinks
 @section Handling links
@@ -2724,58 +2913,87 @@ insert it into an Org file, and to follow the link.
 Store a link to the current location.  This is a @emph{global} command (you
 must create the key binding yourself) which can be used in any buffer to
 create a link.  The link will be stored for later insertion into an Org
-buffer (see below).
+buffer (see below).  What kind of link will be created depends on the current
+buffer:
+@b{Org-mode buffers}@*
 For Org files, if there is a @samp{<<target>>} at the cursor, the link points
-to the target.  Otherwise it points to the current headline, either by text
+to the target.  Otherwise it points to the current headline, which will also
-(unsafe), or, if @file{org-id.el} is loaded and @code{org-link-to-org-use-id}
+be the description.
-is set, by ID property.
+@vindex org-link-to-org-use-id
-For VM, Rmail, Wanderlust, MH-E, Gnus and BBDB buffers, the link will
+@cindex property, CUSTOM_ID
-indicate the current article/entry.  For W3 and W3M buffers, the link goes to
+@cindex property, ID
-the current URL.  For IRC links, if you set the variable
+If the headline has a @code{CUSTOM_ID} property, a link to this custom ID
-@code{org-irc-link-to-logs} to non-nil then @kbd{C-c l} will store a
+will be stored.  In addition or alternatively (depending on the value of
-@samp{file:/} style link to the relevant point in the logs for the current
+@code{org-link-to-org-use-id}), a globally unique @code{ID} property will be
-conversation.  Otherwise an @samp{irc:/} style link to the user/channel/server
+created and/or used to construct a link.  So using this command in Org
-under the point will be stored.
+buffers will potentially create two links: a human-readable from the custom
+ID, and one that is globally unique and works even if the entry is moved from
+file to file.  Later, when inserting the link, you need to decide which one
+to use.
+@b{Email/News clients: VM, Rmail, Wanderlust, MH-E, Gnus}@*
+Pretty much all Emacs mail clients are supported.  The link will point to the
+current article, or, in some GNUS buffers, to the group.  The description is
+constructed from the author and the subject.
+@b{Web browsers: W3 and W3M}@*
+Here the link will be the current URL, with the page title as description.
+@b{Contacts: BBDB}@*
+Links created in a BBDB buffer will point to the current entry.
+@b{Chat: IRC}@*
+@vindex org-irc-link-to-logs
+For IRC links, if you set the variable @code{org-irc-link-to-logs} to
+@code{t}, a @samp{file:/} style link to the relevant point in the logs for
+the current conversation is created.  Otherwise an @samp{irc:/} style link to
+the user/channel/server under the point will be stored.
+@b{Other files}@*
 For any other files, the link will point to the file, with a search string
 (@pxref{Search options}) pointing to the contents of the current line.  If
 there is an active region, the selected words will form the basis of the
 search string.  If the automatically created link is not working correctly or
 accurately enough, you can write custom functions to select the search string
-and to do the search for particular file types - see @ref{Custom searches}.
+and to do the search for particular file types---see @ref{Custom searches}.
-The key binding @kbd{C-c l} is only a suggestion - see @ref{Installation}.
+The key binding @kbd{C-c l} is only a suggestion---see @ref{Installation}.
 @c
 @kindex C-c C-l
 @cindex link completion
 @cindex completion, of links
 @cindex inserting links
 @item C-c C-l
-Insert a link.  This prompts for a link to be inserted into the buffer.  You
+@vindex org-keep-stored-link-after-insertion
-can just type a link, using text for an internal link, or one of the link
+Insert a link@footnote{ Note that you don't have to use this command to
-type prefixes mentioned in the examples above.  All links stored during the
+insert a link.  Links in Org are plain text, and you can type or paste them
-current session are part of the history for this prompt, so you can access
+straight into the buffer.  By using this command, the links are automatically
-them with @key{up} and @key{down} (or @kbd{M-p/n}).  Completion, on the other
+enclosed in double brackets, and you will be asked for the optional
-hand, will help you to insert valid link prefixes like @samp{http:} or
+descriptive text.}.  This prompts for a link to be inserted into the buffer.
-@samp{ftp:}, including the prefixes defined through link abbreviations
+You can just type a link, using text for an internal link, or one of the link
-(@pxref{Link abbreviations}).  The link will be inserted into the
+type prefixes mentioned in the examples above.  The link will be inserted
-buffer@footnote{After insertion of a stored link, the link will be removed
+into the buffer@footnote{After insertion of a stored link, the link will be
-from the list of stored links.  To keep it in the list later use, use a
+removed from the list of stored links.  To keep it in the list later use, use
-triple @kbd{C-u} prefix argument to @kbd{C-c C-l}, or configure the option
+a triple @kbd{C-u} prefix argument to @kbd{C-c C-l}, or configure the option
 @code{org-keep-stored-link-after-insertion}.}, along with a descriptive text.
 If some text was selected when this command is called, the selected text
-becomes the default description.@* Note that you don't have to use this
+becomes the default description.
-command to insert a link.  Links in Org are plain text, and you can type
-or paste them straight into the buffer.  By using this command, the links are
+@b{Inserting stored links}@*
-automatically enclosed in double brackets, and you will be asked for the
+All links stored during the
-optional descriptive text.
+current session are part of the history for this prompt, so you can access
-@c
+them with @key{up} and @key{down} (or @kbd{M-p/n}).
-@c  If the link is a @samp{file:} link and
-@c the linked file is located in the same directory as the current file or
+@b{Completion support}@* Completion with @key{TAB} will help you to insert
-@c a subdirectory of it, the path of the file will be inserted relative to
+valid link prefixes like @samp{http:} or @samp{ftp:}, including the prefixes
-@c the current directory.
+defined through link abbreviations (@pxref{Link abbreviations}).  If you
-@c
+press @key{RET} after inserting only the @var{prefix}, Org will offer
+specific completion support for some link types@footnote{This works by
+calling a special function @code{org-PREFIX-complete-link}.}  For
+example, if you type @kbd{file @key{RET}}, file name completion (alternative
+access: @kbd{C-u C-c C-l}, see below) will be offered, and after @kbd{bbdb
+@key{RET}} you can complete contact names.
 @kindex C-u C-c C-l
 @cindex file name completion
 @cindex completion, of file names
@@ -2783,7 +3001,7 @@ optional descriptive text.
 When @kbd{C-c C-l} is called with a @kbd{C-u} prefix argument, a link to
 a file will be inserted and you may use file name completion to select
 the name of the file.  The path to the file is inserted relative to the
-directory of the current org file, if the linked file is in the current
+directory of the current Org file, if the linked file is in the current
 directory or in a sub-directory of it, or if the path is written relative
 to the current directory using @samp{../}.  Otherwise an absolute path
 is used, if possible with @samp{~/} for your home directory.  You can
@@ -2796,13 +3014,14 @@ link and description parts of the link.
 @cindex following links
 @kindex C-c C-o
 @kindex RET
-@item C-c C-o
+@item C-c C-o @r{or} @key{RET}
+@vindex org-file-apps
 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
 cursor is on an internal link, this commands runs the corresponding search.
 When the cursor is on a TAG list in a headline, it creates the corresponding
-TAGS view.  If the cursor is on a time stamp, it compiles the agenda for that
+TAGS view.  If the cursor is on a timestamp, it compiles the agenda for that
 date.  Furthermore, it will visit text and remote files in @samp{file:} links
 with Emacs and select a suitable application for local non-text files.
 Classification of files is based on file extension only.  See option
@@ -2815,10 +3034,11 @@ opening in Emacs, use a @kbd{C-u C-u} prefix.
 @item mouse-2
 @itemx mouse-1
 On links, @kbd{mouse-2} will open the link just as @kbd{C-c C-o}
-would.  Under Emacs 22, also @kbd{mouse-1} will follow a link.
+would.  Under Emacs 22, @kbd{mouse-1} will also follow a link.
 @c
 @kindex mouse-3
 @item mouse-3
+@vindex org-display-internal-link-with-indirect-buffer
 Like @kbd{mouse-2}, but force file links to be opened with Emacs, and
 internal links to be displayed in another window@footnote{See the
 variable @code{org-display-internal-link-with-indirect-buffer}}.
@@ -2881,9 +3101,11 @@ abbreviated link looks like this
 @end example
 @noindent
-where the tag is optional.  Such abbreviations are resolved according to
+@vindex org-link-abbrev-alist
-the information in the variable @code{org-link-abbrev-alist} that
+where the tag is optional.  The @i{linkword} must be a word; letter, numbers,
-relates the linkwords to replacement text.  Here is an example:
+@samp{-}, and @samp{_} are allowed here.  Abbreviations are resolved
+according to the information in the variable @code{org-link-abbrev-alist}
+that relates the linkwords to replacement text.  Here is an example:
 @lisp
 @group
@@ -2908,14 +3130,18 @@ doing besides Emacs hacking with @code{[[ads:Dominik,C]]}.
 If you need special abbreviations just for a single Org buffer, you
 can define them in the file with
+@cindex #+LINK
 @example
 #+LINK: bugzilla  http://10.1.2.9/bugzilla/show_bug.cgi?id=
 #+LINK: google    http://www.google.com/search?q=%s
 @end example
 @noindent
-In-buffer completion @pxref{Completion} can be used after @samp{[} to
+In-buffer completion (@pxref{Completion}) can be used after @samp{[} to
-complete link abbreviations.
+complete link abbreviations.  You may also define a function
+@code{org-PREFIX-complete-link} that implements special (@eg completion)
+support for inserting such a link with @kbd{C-c C-l}.  Such a function should
+not accept any arguments, and return the full link with prefix.
 @node Search options, Custom searches, Link abbreviations, Hyperlinks
 @section Search options in file links
@@ -2973,11 +3199,13 @@ a search for @samp{find me} in the current file, just as
 The default mechanism for creating search strings and for doing the
 actual search related to a file link may not work correctly in all
-cases.  For example, BibTeX database files have many entries like
+cases.  For example, Bib@TeX{} database files have many entries like
 @samp{year="1993"} which would not result in good search strings,
-because the only unique identification for a BibTeX entry is the
+because the only unique identification for a Bib@TeX{} entry is the
 citation key.
+@vindex org-create-file-search-functions
+@vindex org-execute-file-search-functions
 If you come across such a problem, you can write custom functions to set
 the right search string for a particular file type, and to do the search
 for the string in the file.  Using @code{add-hook}, these functions need
@@ -3044,29 +3272,33 @@ agenda buffers with the @kbd{t} command key (@pxref{Agenda commands}).
 @item C-u C-c C-t
 Select a specific keyword using completion or (if it has been set up)
 the fast selection interface.  For the latter, you need to assign keys
-to TODO states, see @ref{Per-file keywords} and @ref{Setting tags} for
+to TODO states, see @ref{Per-file keywords}, and @ref{Setting tags}, for
 more information.
 @kindex S-@key{right}
 @kindex S-@key{left}
+@vindex org-treat-S-cursor-todo-selection-as-state-change
 @item S-@key{right}
 @itemx S-@key{left}
 Select the following/preceding TODO state, similar to cycling.  Useful
 mostly if more than two TODO states are possible (@pxref{TODO
-extensions}).  See also @ref{Conflicts} for a discussion of the interaction
+extensions}).  See also @ref{Conflicts}, for a discussion of the interaction
-with @code{shift-selection-mode}.
+with @code{shift-selection-mode}.  See also the variable
+@code{org-treat-S-cursor-todo-selection-as-state-change}.
 @kindex C-c C-v
 @kindex C-c / t
 @cindex sparse tree, for TODO
 @item C-c C-v
 @itemx C-c / t
-View TODO items in a @emph{sparse tree} (@pxref{Sparse trees}).  Folds
+@vindex org-todo-keywords
-the entire buffer, but shows all TODO items and the headings hierarchy
+View TODO items in a @emph{sparse tree} (@pxref{Sparse trees}).  Folds the
-above them.  With a prefix argument, search for a specific TODO.  You will be
+entire buffer, but shows all TODO items and the headings hierarchy above
+them.  With a prefix argument, search for a specific TODO.  You will be
 prompted for the keyword, and you can also give a list of keywords like
-@code{KWD1|KWD2|...}.  With numeric prefix argument N, show the tree for the
+@code{KWD1|KWD2|...} to list entries that match any one of these keywords.
-Nth keyword in the variable @code{org-todo-keywords}.  With two prefix
+With numeric prefix argument N, show the tree for the Nth keyword in the
-arguments, find all TODO and DONE entries.
+variable @code{org-todo-keywords}.  With two prefix arguments, find all TODO
+and DONE entries.
 @kindex C-c a t
 @item C-c a t
 Show the global TODO list.  Collects the TODO items from all agenda
@@ -3080,6 +3312,7 @@ Insert a new TODO entry below the current one.
 @end table
 @noindent
+@vindex org-todo-state-tags-triggers
 Changing a TODO state can also trigger tag changes.  See the docstring of the
 option @code{org-todo-state-tags-triggers} for details.
@@ -3087,6 +3320,7 @@ option @code{org-todo-state-tags-triggers} for details.
 @section Extended use of TODO keywords
 @cindex extended TODO keywords
+@vindex org-todo-keywords
 By default, marked TODO entries have one of only two states: TODO and
 DONE.  Org mode allows you to classify TODO items in more complex ways
 with @emph{TODO keywords} (stored in @code{org-todo-keywords}).  With
@@ -3135,7 +3369,7 @@ define many keywords, you can use in-buffer completion
 (@pxref{Completion}) or even a special one-key selection scheme
 (@pxref{Fast access to TODO states}) to insert these words into the
 buffer.  Changing a TODO state can be logged with a timestamp, see
-@ref{Tracking TODO state changes} for more information.
+@ref{Tracking TODO state changes}, for more information.
 @node TODO types, Multiple sets in one file, Workflow states, TODO extensions
 @subsection TODO keywords as types
@@ -3214,7 +3448,7 @@ These keys jump from one TODO subset to the next.  In the above example,
 @kbd{S-@key{<left>}} and @kbd{S-@key{<right>}} and walk through @emph{all}
 keywords from all sets, so for example @kbd{S-@key{<right>}} would switch
 from @code{DONE} to @code{REPORT} in the example above.  See also
-@ref{Conflicts} for a discussion of the interaction with
+@ref{Conflicts}, for a discussion of the interaction with
 @code{shift-selection-mode}.
 @end table
@@ -3224,7 +3458,7 @@ from @code{DONE} to @code{REPORT} in the example above.  See also
 If you would like to quickly change an entry to an arbitrary TODO state
 instead of cycling through the states, you can set up keys for
 single-letter access to the states.  This is done by adding the section
-key after each keyword, in parenthesis.  For example:
+key after each keyword, in parentheses.  For example:
 @lisp
 (setq org-todo-keywords
@@ -3233,10 +3467,11 @@ key after each keyword, in parenthesis.  For example:
        (sequence "|" "CANCELED(c)")))
 @end lisp
+@vindex org-fast-tag-selection-include-todo
 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
+@code{org-fast-tag-selection-include-todo}, it allows you to change the TODO
 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.}
@@ -3245,6 +3480,9 @@ unique keys across both sets of keywords.}
 @subsection Setting up keywords for individual files
 @cindex keyword options
 @cindex per-file keywords
+@cindex #+TODO
+@cindex #+TYP_TODO
+@cindex #+SEQ_TODO
 It can be very useful to use different aspects of the TODO mechanism in
 different files.  For file-local settings, you need to add special lines
@@ -3254,9 +3492,10 @@ need one of the following lines, starting in column zero anywhere in the
 file:
 @example
-#+SEQ_TODO: TODO FEEDBACK VERIFY | DONE CANCELED
+#+TODO: TODO FEEDBACK VERIFY | DONE CANCELED
 @end example
-or
+@noindent (you may also write @code{#+SEQ_TODO} to be explicit about the
+interpretation, but it means the same as @code{#+TODO}), or
 @example
 #+TYP_TODO: Fred Sara Lucy Mike | DONE
 @end example
@@ -3264,9 +3503,9 @@ or
 A setup for using several sets in parallel would be:
 @example
-#+SEQ_TODO: TODO | DONE
+#+TODO: TODO | DONE
-#+SEQ_TODO: REPORT BUG KNOWNCAUSE | FIXED
+#+TODO: REPORT BUG KNOWNCAUSE | FIXED
-#+SEQ_TODO: | CANCELED
+#+TODO: | CANCELED
 @end example
 @cindex completion, of option keywords
@@ -3288,6 +3527,9 @@ for the current buffer.}.
 @subsection Faces for TODO keywords
 @cindex faces, for TODO keywords
+@vindex org-todo @r{(face)}
+@vindex org-done @r{(face)}
+@vindex org-todo-keyword-faces
 Org mode highlights TODO keywords with special faces: @code{org-todo}
 for keywords indicating that an item still has to be acted upon, and
 @code{org-done} for keywords indicating that an item is finished.  If
@@ -3313,6 +3555,8 @@ necessary, define a special face and use that.
 @cindex TODO dependencies
 @cindex dependencies, of TODO states
+@vindex org-enforce-todo-dependencies
+@cindex property, ORDERED
 The structure of Org files (hierarchy and lists) makes it easy to define TODO
 dependencies.  Usually, a parent TODO task should not be marked DONE until
 all subtasks (defined as children tasks) are marked as DONE.  And sometimes
@@ -3341,17 +3585,25 @@ example:
 @table @kbd
 @kindex C-c C-x o
 @item C-c C-x o
-Toggle the @code{ORDERED} property of the current entry.
+@vindex org-track-ordered-property-with-tag
+@cindex property, ORDERED
+Toggle the @code{ORDERED} property of the current entry.  A property is used
+for this behavior because this should be local to the current entry, not
+inherited like a tag.  However, if you would like to @i{track} the value of
+this property with a tag for better visibility, customize the variable
+@code{org-track-ordered-property-with-tag}.
 @kindex C-u C-u C-u C-c C-t
 @item C-u C-u C-u C-c C-t
-Change TODO state, circumventin any state blocking.
+Change TODO state, circumventing any state blocking.
 @end table
+@vindex org-agenda-dim-blocked-tasks
 If you set the variable @code{org-agenda-dim-blocked-tasks}, TODO entries
 that cannot be closed because of such dependencies will be shown in a dimmed
 font or even made invisible in agenda views (@pxref{Agenda Views}).
 @cindex checkboxes and TODO dependencies
+@vindex org-enforce-todo-dependencies
 You can also block changes of TODO states by looking at checkboxes
 (@pxref{Checkboxes}).  If you set the variable
 @code{org-enforce-todo-checkbox-dependencies}, an entry that has unchecked
@@ -3367,7 +3619,7 @@ module @file{org-depend.el}.
 @cindex progress logging
 @cindex logging, of progress
-Org mode can automatically record a time stamp and possibly a note when
+Org mode can automatically record a timestamp and possibly a note when
 you mark a TODO item as DONE, or even each time you change the state of
 a TODO item.  This system is highly configurable, settings can be on a
 per-keyword basis and can be localized to a file or even a subtree.  For
@@ -3413,14 +3665,27 @@ giving you an overview of what has been done.
 @node Tracking TODO state changes,  , Closing items, Progress logging
 @subsection Tracking TODO state changes
+@cindex drawer, for state change recording
-When TODO keywords are used as workflow states (@pxref{Workflow
-states}), you might want to keep track of when a state change occurred
+@vindex org-log-states-order-reversed
-and maybe take a note about this change.  Since it is normally too much
+@vindex org-log-into-drawer
-to record a note for every state, Org mode expects configuration on a
+@cindex property, LOG_INTO_DRAWER
-per-keyword basis for this.  This is achieved by adding special markers
+When TODO keywords are used as workflow states (@pxref{Workflow states}), you
-@samp{!} (for a time stamp) and @samp{@@} (for a note) in parenthesis
+might want to keep track of when a state change occurred and maybe take a
-after each keyword.  For example, with the setting
+note about this change.  You can either record just a timestamp, or a
+time-stamped note for a change.  These records will be inserted after the
+headline as an itemized list, newest first@footnote{See the variable
+@code{org-log-states-order-reversed}}.  When taking a lot of notes, you might
+want to get the notes out of the way into a drawer (@pxref{Drawers}).
+Customize the variable @code{org-log-into-drawer} to get this
+behavior---the recommended drawer for this is called @code{LOGBOOK}.  You can
+also overrule the setting of this variable for a subtree by setting a
+@code{LOG_INTO_DRAWER} property.
+Since it is normally too much to record a note for every state, Org mode
+expects configuration on a per-keyword basis for this.  This is achieved by
+adding special markers @samp{!} (for a timestamp) and @samp{@@} (for a note)
+in parentheses after each keyword.  For example, with the setting
 @lisp
 (setq org-todo-keywords
@@ -3428,16 +3693,17 @@ after each keyword.  For example, with the setting
 @end lisp
 @noindent
+@vindex org-log-done
 you not only define global TODO keywords and fast access keys, but also
-request that a time is recorded when the entry is turned into
+request that a time is recorded when the entry is set to
-DONE@footnote{It is possible that Org mode will record two time stamps
+DONE@footnote{It is possible that Org mode will record two timestamps
 when you are using both @code{org-log-done} and state change logging.
-However, it will never prompt for two notes - if you have configured
+However, it will never prompt for two notes---if you have configured
 both, the state change recording note will take precedence and cancel
 the @samp{Closing Note}.}, and that a note is recorded when switching to
-WAIT or CANCELED.  The setting for WAIT is even more special: The
+WAIT or CANCELED.  The setting for WAIT is even more special: the
 @samp{!} after the slash means that in addition to the note taken when
-entering the state, a time stamp should be recorded when @i{leaving} the
+entering the state, a timestamp should be recorded when @i{leaving} the
 WAIT state, if and only if the @i{target} state does not configure
 logging for entering it.  So it has no effect when switching from WAIT
 to DONE, because DONE is configured to record a timestamp only.  But
@@ -3448,9 +3714,10 @@ configured.
 You can use the exact same syntax for setting logging preferences local
 to a buffer:
 @example
-#+SEQ_TODO: TODO(t) WAIT(w@@/!) | DONE(d!) CANCELED(c@@)
+#+TODO: TODO(t) WAIT(w@@/!) | DONE(d!) CANCELED(c@@)
 @end example
+@cindex property, LOGGING
 In order to define logging settings that are local to a subtree or a
 single item, define a LOGGING property in this entry.  Any non-empty
 LOGGING property resets all logging settings to nil.  You may then turn
@@ -3509,13 +3776,17 @@ agenda buffer with the @kbd{,} command (@pxref{Agenda commands}).
 @kindex S-@key{down}
 @item S-@key{up}
 @itemx S-@key{down}
+@vindex org-priority-start-cycle-with-default
 Increase/decrease priority of current headline@footnote{See also the option
-@code{org-priority-start-cycle-with-default'}.}.  Note that these keys are
+@code{org-priority-start-cycle-with-default}.}.  Note that these keys are
-also used to modify time stamps (@pxref{Creating timestamps}).  See also
+also used to modify timestamps (@pxref{Creating timestamps}).  See also
-@ref{Conflicts} for a discussion of the interaction with
+@ref{Conflicts}, for a discussion of the interaction with
 @code{shift-selection-mode}.
 @end table
+@vindex org-highest-priority
+@vindex org-lowest-priority
+@vindex org-default-priority
 You can change the range of allowed priorities by setting the variables
 @code{org-highest-priority}, @code{org-lowest-priority}, and
 @code{org-default-priority}.  For an individual buffer, you may set
@@ -3523,6 +3794,7 @@ these values (highest, lowest, default) like this (please make sure that
 the highest priority is earlier in the alphabet than the lowest
 priority):
+@cindex #+PRIORITIES
 @example
 #+PRIORITIES: A C B
 @end example
@@ -3531,6 +3803,7 @@ priority):
 @section Breaking tasks down into subtasks
 @cindex tasks, breaking down
+@vindex org-agenda-todo-list-sublevels
 It is often advisable to break down large tasks into smaller, manageable
 subtasks.  You can do this by creating an outline tree below a TODO item,
 with detailed subtasks on the tree@footnote{To keep subtasks out of the
@@ -3548,8 +3821,14 @@ be updates each time the todo status of a child changes.  For example:
 ** DONE Talk to neighbor
 @end example
-If you would like a TODO entry to automatically change to DONE when all
+@cindex property, COOKIE_DATA
-children are done, you can use the following setup:
+If a heading has both checkboxes and TODO children below it, the meaning of
+the statistics cookie become ambiguous.  Set the property
+@code{COOKIE_DATA} to either @samp{checkbox} or @samp{todo} to resolve
+this issue.
+If you would like a TODO entry to automatically change to DONE
+when all children are done, you can use the following setup:
 @example
 (defun org-summary-todo (n-done n-not-done)
@@ -3597,29 +3876,45 @@ checked.
 @cindex statistics, for checkboxes
 @cindex checkbox statistics
-The @samp{[2/4]} and @samp{[1/3]} in the first and second line are
+@cindex property, COOKIE_DATA
-cookies indicating how many checkboxes present in this entry have been
+The @samp{[2/4]} and @samp{[1/3]} in the first and second line are cookies
-checked off, and the total number of checkboxes are present.  This can
+indicating how many checkboxes present in this entry have been checked off,
-give you an idea on how many checkboxes remain, even without opening a
+and the total number of checkboxes present.  This can give you an idea on how
-folded entry.  The cookies can be placed into a headline or into (the
+many checkboxes remain, even without opening a folded entry.  The cookies can
-first line of) a plain list item. Each cookie covers all checkboxes
+be placed into a headline or into (the first line of) a plain list item.
-structurally below the headline/item on which the cookie appear.  You
+Each cookie covers checkboxes of direct children structurally below the
-have to insert the cookie yourself by typing either @samp{[/]} or
+headline/item on which the cookie appears@footnote{Set the variable
-@samp{[%]}.  With @samp{[/]} you get an @samp{n out of m} result, as in
+@code{org-recursive-checkbox-statistics} if you want such cookies to
-the examples above.  With @samp{[%]} you get information about the
+represent the all checkboxes below the cookie, not just the direct
-percentage of checkboxes checked (in the above example, this would be
+children.}.  You have to insert the cookie yourself by typing either
-@samp{[50%]} and @samp{[33%]}, respectively).
+@samp{[/]} or @samp{[%]}.  With @samp{[/]} you get an @samp{n out of m}
+result, as in the examples above.  With @samp{[%]} you get information about
+the percentage of checkboxes checked (in the above example, this would be
+@samp{[50%]} and @samp{[33%]}, respectively).  In a headline, a cookie can
+count either checkboxes below the heading or TODO states of children, and it
+will display whatever was changed last.  Set the property @code{COOKIE_DATA}
+to either @samp{checkbox} or @samp{todo} to resolve this issue.
+@cindex blocking, of checkboxes
+@cindex checkbox blocking
+@cindex property, ORDERED
+If the current outline node has an @code{ORDERED} property, checkboxes must
+be checked off in sequence, and an error will be thrown if you try to check
+off a box while there are unchecked boxes above it.
 @noindent The following commands work with checkboxes:
 @table @kbd
 @kindex C-c C-c
 @item C-c C-c
-Toggle checkbox at point.  With a prefix argument, set it to @samp{[-]},
+Toggle checkbox status or (with prefix arg) checkbox presence at point.  With
-which is considered to be an intermediate state.
+double prefix argument, set it to @samp{[-]}, which is considered to be an
+intermediate state.
 @kindex C-c C-x C-b
 @item C-c C-x C-b
-Toggle checkbox status or (with prefix arg) checkbox presence at point.
+Toggle checkbox status or (with prefix arg) checkbox presence at point.  With
+double prefix argument, set it to @samp{[-]}, which is considered to be an
+intermediate state.
 @itemize @minus
 @item
 If there is an active region, toggle the first checkbox in the region
@@ -3636,6 +3931,16 @@ If there is no active region, just toggle the checkbox at point.
 Insert a new item with a checkbox.
 This works only if the cursor is already in a plain list item
 (@pxref{Plain lists}).
+@kindex C-c C-x o
+@item C-c C-x o
+@vindex org-track-ordered-property-with-tag
+@cindex property, ORDERED
+Toggle the @code{ORDERED} property of the entry, to toggle if checkboxes must
+be checked off in sequence.  A property is used for this behavior because
+this should be local to the current entry, not inherited like a tag.
+However, if you would like to @i{track} the value of this property with a tag
+for better visibility, customize the variable
+@code{org-track-ordered-property-with-tag}.
 @kindex C-c #
 @item C-c #
 Update the checkbox statistics in the current outline entry.  When
@@ -3657,13 +3962,14 @@ An excellent way to implement labels and contexts for cross-correlating
 information is to assign @i{tags} to headlines.  Org mode has extensive
 support for tags.
+@vindex org-tag-faces
 Every headline can contain a list of tags; they occur at the end of the
 headline.  Tags are normal words containing letters, numbers, @samp{_}, and
-@samp{@@}.  Tags must be preceded and followed by a single colon, e.g.,
+@samp{@@}.  Tags must be preceded and followed by a single colon, @eg{},
 @samp{:work:}.  Several tags can be specified, as in @samp{:work:urgent:}.
-Tags will by default get a bold face with the same color as the headline.
+Tags will by default be in bold face with the same color as the headline.
 You may specify special faces for specific tags using the variable
-@code{org-tag-faces}, much in the same way as you can do for TODO keywords
+@code{org-tag-faces}, in much the same way as you can for TODO keywords
 (@pxref{Faces for TODO keywords}).
 @menu
@@ -3692,18 +3998,22 @@ well.  For example, in the list
 the final heading will have the tags @samp{:work:}, @samp{:boss:},
 @samp{:notes:}, and @samp{:action:} even though the final heading is not
 explicitly marked with those tags.  You can also set tags that all entries in
-a file should inherit as if these tags would be defined in a hypothetical
+a file should inherit just as if these tags were defined in a hypothetical
 level zero that surrounds the entire file.
+@cindex #+FILETAGS
 @example
 #+FILETAGS: :Peter:Boss:Secret:
 @end example
 @noindent
+@vindex org-use-tag-inheritance
+@vindex org-tags-exclude-from-inheritance
 To limit tag inheritance to specific tags, or to turn it off entirely, use
 the variables @code{org-use-tag-inheritance} and
 @code{org-tags-exclude-from-inheritance}.
+@vindex org-tags-match-list-sublevels
 When a headline matches during a tags search while tag inheritance is turned
 on, all the sublevels in the same tree will (for a simple match form) match
 as well@footnote{This is only true if the search does not involve more
@@ -3726,6 +4036,7 @@ also a special command for inserting tags:
 @kindex C-c C-q
 @item C-c C-q
 @cindex completion, of tags
+@vindex org-tags-column
 Enter new tags for the current headline.  Org mode will either offer
 completion or a special single-key interface for setting tags, see
 below.  After pressing @key{RET}, the tags will be inserted and aligned
@@ -3738,12 +4049,14 @@ demotion, and TODO state changes (@pxref{TODO basics}).
 When the cursor is in a headline, this does the same as @kbd{C-c C-q}.
 @end table
+@vindex org-tag-alist
 Org will support tag insertion based on a @emph{list of tags}.  By
 default this list is constructed dynamically, containing all tags
 currently used in the buffer.  You may also globally specify a hard list
 of tags with the variable @code{org-tag-alist}.  Finally you can set
 the default tags for a given file with lines like
+@cindex #+TAGS
 @example
 #+TAGS: @@work @@home @@tennisclub
 #+TAGS: laptop car pc sailboat
@@ -3757,6 +4070,17 @@ in a specific file, add an empty TAGS option line to that file:
 #+TAGS:
 @end example
+@vindex org-tag-persistent-alist
+If you have a preferred set of tags that you would like to use in every file,
+in addition to those defined on a per-file basis by TAGS option lines, then
+you may specify a list of tags with the variable
+@code{org-tag-persistent-alist}.  You may turn this off on a per-file basis
+by adding a STARTUP option line to that file:
+@example
+#+STARTUP: noptag
+@end example
 By default Org mode uses the standard minibuffer completion facilities for
 entering tags.  However, it also implements another, quicker, tag selection
 method called @emph{fast tag selection}.  This allows you to select and
@@ -3771,15 +4095,30 @@ like:
 (setq org-tag-alist '(("@@work" . ?w) ("@@home" . ?h) ("laptop" . ?l)))
 @end lisp
-@noindent If the tag is only relevant to the file you are working on then you
+@noindent If the tag is only relevant to the file you are working on, then you
-can, instead, set the TAGS option line as:
+can instead set the TAGS option line as:
 @example
 #+TAGS: @@work(w)  @@home(h)  @@tennisclub(t)  laptop(l)  pc(p)
 @end example
+@noindent The tags interface will show the available tags in a splash
+window.  If you want to start a new line after a specific tag, insert
+@samp{\n} into the tag list
+@example
+#+TAGS: @@work(w)  @@home(h)  @@tennisclub(t) \n laptop(l)  pc(p)
+@end example
+@noindent or write them in two lines:
+@example
+#+TAGS: @@work(w)  @@home(h)  @@tennisclub(t)
+#+TAGS: laptop(l)  pc(p)
+@end example
 @noindent
-You can also group together tags that are mutually exclusive.  By using
+You can also group together tags that are mutually exclusive by using
 braces, as in:
 @example
@@ -3793,9 +4132,10 @@ and @samp{@@tennisclub} should be selected.  Multiple such groups are allowed.
 these lines to activate any changes.
 @noindent
-To set these mutually exclusive groups in the variable @code{org-mode-alist}
+To set these mutually exclusive groups in the variable @code{org-tags-alist},
 you must use the dummy tags @code{:startgroup} and @code{:endgroup} instead
-of the braces.  The previous example would be set globally by the following
+of the braces.  Similarly, you can use @code{:newline} to indicate a line
+break.  The previous example would be set globally by the following
 configuration:
 @lisp
@@ -3851,10 +4191,11 @@ alternatively with @kbd{C-c C-c C-c w}.  Adding the non-predefined tag
 @samp{Sarah} could be done with @kbd{C-c C-c @key{TAB} S a r a h
 @key{RET} @key{RET}}.
-If you find that most of the time, you need only a single key press to
+@vindex org-fast-tag-selection-single-key
+If you find that most of the time you need only a single key press to
 modify your list of tags, set the variable
 @code{org-fast-tag-selection-single-key}.  Then you no longer have to
-press @key{RET} to exit fast tag selection - it will immediately exit
+press @key{RET} to exit fast tag selection---it will immediately exit
 after the first change.  If you then occasionally need more keys, press
 @kbd{C-c} to turn off auto-exit for the current tag selection process
 (in effect: start selection with @kbd{C-c C-c C-c} instead of @kbd{C-c
@@ -3872,9 +4213,9 @@ information into special lists.
 @table @kbd
 @kindex C-c \
-@kindex C-c / T
+@kindex C-c / m
 @item C-c \
-@itemx C-c / T
+@itemx C-c / m
 Create a sparse tree with all headlines matching a tags search.  With a
 @kbd{C-u} prefix argument, ignore headlines that are not a TODO line.
 @kindex C-c a m
@@ -3883,81 +4224,20 @@ Create a global list of tag matches from all agenda files.
 @xref{Matching tags and properties}.
 @kindex C-c a M
 @item C-c a M
+@vindex org-tags-match-list-sublevels
 Create a global list of tag matches from all agenda files, but check
 only TODO items and force checking subitems (see variable
 @code{org-tags-match-list-sublevels}).
 @end table
-@cindex Boolean logic, for tag searches
+These commands all prompt for a match string which allows basic Boolean logic
-A @i{tags} search string can use Boolean operators @samp{&} for AND and
+like @samp{+boss+urgent-project1}, to find entries with tags @samp{boss} and
-@samp{|} for OR.  @samp{&} binds more strongly than @samp{|}.
+@samp{urgent}, but not @samp{project1}, or @samp{Kathy|Sally} to find entries
-Parenthesis are currently not implemented.  A tag may also be preceded
+which are tagged, like @samp{Kathy} or @samp{Sally}.  The full syntax of the search
-by @samp{-}, to select against it, and @samp{+} is syntactic sugar for
+string is rich and allows also matching against TODO keywords, entry levels
-positive selection.  The AND operator @samp{&} is optional when @samp{+}
+and properties.  For a complete description with many examples, see
-or @samp{-} is present.  Examples:
+@ref{Matching tags and properties}.
-@table @samp
-@item +work-boss
-Select headlines tagged @samp{:work:}, but discard those also tagged
-@samp{:boss:}.
-@item work|laptop
-Selects lines tagged @samp{:work:} or @samp{:laptop:}.
-@item work|laptop&night
-Like before, but require the @samp{:laptop:} lines to be tagged also
-@samp{:night:}.
-@end table
-@cindex TODO keyword matching, with tags search
-You may also test for TODO keywords (@pxref{TODO extensions}) and properties
-(@pxref{Properties and Columns}) at the same time as matching tags.  For a
-guide on how to match properties, see @ref{Property searches}.  To match a
-specific TODO keyword, include an expression like @samp{+TODO="NEXT"} as one
-of the terms in a tags search.
-There is also the possibility to end the tags part of the match (which may
-include several terms connected with @samp{|}) with a @samp{/} and then
-specify a Boolean expression just for TODO keywords.  The syntax is then
-similar to the tag matches, but should be applied with consideration: For
-example, a positive selection on several TODO keywords can not meaningfully
-be combined with boolean AND.  However, @emph{negative selection} combined
-with AND can be meaningful.  To make sure that only lines are checked that
-actually have any TODO keyword (resulting in a speed-up), use @kbd{C-c a M},
-or equivalently start the TODO part after the slash with @samp{!}.  Examples:
-@table @samp
-@item work+TODO="WAITING"
-Select @samp{:work:}-tagged TODO lines with the specific TODO
-keyword @samp{WAITING}.
-@item work+TODO="WAITING"|home+TODO="WAITING"
-Waiting tasks both at work and at home.
-@item work/WAITING
-Same as the first example.
-@item work/!-WAITING-NEXT
-Select @samp{:work:}-tagged TODO lines that are neither @samp{WAITING}
-nor @samp{NEXT}
-@item work/!+WAITING|+NEXT
-Select @samp{:work:}-tagged TODO lines that are either @samp{WAITING} or
-@samp{NEXT}.
-@end table
-@cindex regular expressions, with tags search
-Any element of the tag/todo match can be a regular expression - in this
-case it must be enclosed in curly braces.  For example,
-@samp{work+@{^boss.*@}} matches headlines that contain the tag
-@samp{:work:} and any tag @i{starting} with @samp{boss}.  You may also use a
-regular expression in @samp{TODO=@{^W@}} which would match TODO keywords
-starting with the letter @samp{W}.
-@cindex level, require for tags/property match
-@cindex category, require for tags/property match
-You can also require a headline to be of a certain level or category, by
-writing instead of any TAG an expression like @samp{LEVEL=3} or
-@samp{CATEGORY="work"}, respectively.  For example, a search
-@samp{+LEVEL=3+boss/-DONE} lists all level three headlines that have the
-tag @samp{boss} and are @emph{not} marked with the TODO keyword DONE.
-Accessing TODO, LEVEL, and CATEGORY during a search is fast.  Accessing any
-other properties will slow down the search.
 @node Properties and Columns, Dates and Times, Tags, Top
 @chapter Properties and Columns
@@ -3968,12 +4248,12 @@ are two main applications for properties in Org mode.  First, properties
 are like tags, but with a value.  Second, you can use properties to
 implement (very basic) database capabilities in an Org buffer.  For
 an example of the first application, imagine maintaining a file where
-you document bugs and plan releases of a piece of software.  Instead of
+you document bugs and plan releases for a piece of software.  Instead of
 using tags like @code{:release_1:}, @code{:release_2:}, one can use a
 property, say @code{:Release:}, that in different subtrees has different
 values, such as @code{1.0} or @code{2.0}.  For an example of the second
 application of properties, imagine keeping track of your music CDs,
-where properties could be things such as the album artist, date of
+where properties could be things such as the album, artist, date of
 release, number of tracks, and so on.
 Properties can be conveniently edited and viewed in column view
@@ -4006,7 +4286,7 @@ first, and the value after it.  Here is an example:
    :Title:     Goldberg Variations
    :Composer:  J.S. Bach
    :Artist:    Glen Gould
-    :Publisher: Deutsche Grammphon
+    :Publisher: Deutsche Grammophon
    :NDisks:    1
    :END:
 @end example
@@ -4029,11 +4309,13 @@ publishers and the number of disks in a box like this:
 If you want to set properties that can be inherited by any entry in a
 file, use a line like
+@cindex property, _ALL
+@cindex #+PROPERTY
 @example
 #+PROPERTY: NDisks_ALL 1 2 3 4
 @end example
+@vindex org-global-properties
 Property values set with the global variable
 @code{org-global-properties} can be inherited by all entries in all
 Org files.
@@ -4077,24 +4359,40 @@ nearest column format definition.
 @section Special properties
 @cindex properties, special
-Special properties provide alternative access method to Org mode
+Special properties provide an alternative access method to Org mode
-features discussed in the previous chapters, like the TODO state or the
+features, like the TODO state or the priority of an entry, discussed in the
-priority of an entry.  This interface exists so that you can include
+previous chapters.  This interface exists so that you can include
-these states into columns view (@pxref{Column view}), or to use them in
+these states in a column view (@pxref{Column view}), or to use them in
 queries.  The following property names are special and should not be
 used as keys in the properties drawer:
+@cindex property, special, TODO
+@cindex property, special, TAGS
+@cindex property, special, ALLTAGS
+@cindex property, special, CATEGORY
+@cindex property, special, PRIORITY
+@cindex property, special, DEADLINE
+@cindex property, special, SCHEDULED
+@cindex property, special, CLOSED
+@cindex property, special, TIMESTAMP
+@cindex property, special, TIMESTAMP_IA
+@cindex property, special, CLOCKSUM
+@c guessing that ITEM is needed in this area; also, should this list be sorted?
+@cindex property, special, ITEM
 @example
 TODO         @r{The TODO keyword of the entry.}
 TAGS         @r{The tags defined directly in the headline.}
 ALLTAGS      @r{All tags, including inherited ones.}
+CATEGORY     @r{The category of an entry.}
 PRIORITY     @r{The priority of the entry, a string with a single letter.}
 DEADLINE     @r{The deadline time string, without the angular brackets.}
-SCHEDULED    @r{The scheduling time stamp, without the angular brackets.}
+SCHEDULED    @r{The scheduling timestamp, without the angular brackets.}
-TIMESTAMP    @r{The first keyword-less time stamp in the entry.}
+CLOSED       @r{When was this entry closed?}
-TIMESTAMP_IA @r{The first inactive time stamp in the entry.}
+TIMESTAMP    @r{The first keyword-less timestamp in the entry.}
+TIMESTAMP_IA @r{The first inactive timestamp in the entry.}
 CLOCKSUM     @r{The sum of CLOCK intervals in the subtree.  @code{org-clock-sum}}
             @r{must be run first to compute the values.}
+ITEM         @r{The content of the entry.}
 @end example
 @node Property searches, Property inheritance, Special properties, Properties and Columns
@@ -4103,51 +4401,28 @@ CLOCKSUM     @r{The sum of CLOCK intervals in the subtree.  @code{org-clock-sum}
 @cindex searching, of properties
 To create sparse trees and special lists with selection based on properties,
-the same commands are used as for tag searches (@pxref{Tag searches}), and
+the same commands are used as for tag searches (@pxref{Tag searches}).
-the same logic applies.  For example, here is a search string:
+@table @kbd
+@kindex C-c \
-@example
+@kindex C-c / m
-+work-boss+PRIORITY="A"+Coffee="unlimited"+Effort<2         \
+@item C-c \
-         +With=@{Sarah\|Denny@}+SCHEDULED>="<2008-10-11>"
+@itemx C-c / m
-@end example
+Create a sparse tree with all matching entries.  With a
+@kbd{C-u} prefix argument, ignore headlines that are not a TODO line.
-@noindent
+@kindex C-c a m
-The type of comparison will depend on how the comparison value is written:
+@item C-c a m
-@itemize @minus
+Create a global list of tag/property  matches from all agenda files.
-@item
+@xref{Matching tags and properties}.
-If the comparison value is a plain number, a numerical comparison is done,
+@kindex C-c a M
-and the allowed operators are @samp{<}, @samp{=}, @samp{>}, @samp{<=},
+@item C-c a M
-@samp{>=}, and @samp{<>}.
+@vindex org-tags-match-list-sublevels
-@item
+Create a global list of tag matches from all agenda files, but check
-If the comparison value is enclosed in double
+only TODO items and force checking of subitems (see variable
-quotes, a string comparison is done, and the same operators are allowed.
+@code{org-tags-match-list-sublevels}).
-@item
+@end table
-If the comparison value is enclosed in double quotes @emph{and} angular
-brackets (like @samp{DEADLINE<="<2008-12-24 18:30>"}), both values are
-assumed to be date/time specifications in the standard Org way, and the
-comparison will be done accordingly.  Special values that will be recognized
-are @code{"<now>"} for now (including time), and @code{"<today>"}, and
-@code{"<tomorrow>"} for these days at 0:00 hours, i.e. without a time
-specification.  Also strings like @code{"<+5d>"} or @code{"<-2m>"} with units
-@code{d}, @code{w}, @code{m}, and @code{y} for day, week, month, and year,
-respectively, can be used.
-@item
-If the comparison value is enclosed
-in curly braces, a regexp match is performed, with @samp{=} meaning that the
-regexp matches the property value, and @samp{<>} meaning that it does not
-match.
-@end itemize
-So the search string in the example finds entries tagged @samp{:work:} but
-not @samp{:boss:}, which also have a priority value @samp{A}, a
-@samp{:Coffee:} property with the value @samp{unlimited}, an @samp{Effort}
-property that is numerically smaller than 2, a @samp{:With:} property that is
-matched by the regular expression @samp{Sarah\|Denny}, and that are scheduled
-on or after October 11, 2008.
-You can configure Org mode to use property inheritance during a search, but
+The syntax for the search string is described in @ref{Matching tags and
-beware that this can slow down searches considerably.  See @ref{Property
+properties}.
-inheritance} for details.
 There is also a special command for creating sparse trees based on a
 single property:
@@ -4167,13 +4442,14 @@ a regular expression and matched against the property values.
 @cindex properties, inheritance
 @cindex inheritance, of properties
-The outline structure of Org mode documents lends itself for an
+@vindex org-use-property-inheritance
-inheritance model of properties: If the parent in a tree has a certain
+The outline structure of Org-mode documents lends itself for an
+inheritance model of properties: if the parent in a tree has a certain
 property, the children can inherit this property.  Org mode does not
 turn this on by default, because it can slow down property searches
 significantly and is often not needed.  However, if you find inheritance
 useful, you can turn it on by setting the variable
-@code{org-use-property-inheritance}.  It may be set to @code{t}, to make
+@code{org-use-property-inheritance}.  It may be set to @code{t} to make
 all properties inherited from the parent, to a list of properties
 that should be inherited, or to a regular expression that matches
 inherited properties.
@@ -4181,6 +4457,7 @@ inherited properties.
 Org mode has a few properties for which inheritance is hard-coded, at
 least for the special applications for which they are used:
+@cindex property, COLUMNS
 @table @code
 @item COLUMNS
 The @code{:COLUMNS:} property defines the format of column view
@@ -4189,12 +4466,15 @@ where a @code{:COLUMNS:} property is defined is used as the starting
 point for a column view table, independently of the location in the
 subtree from where columns view is turned on.
 @item CATEGORY
+@cindex property, CATEGORY
 For agenda view, a category set through a @code{:CATEGORY:} property
 applies to the entire subtree.
 @item ARCHIVE
+@cindex property, ARCHIVE
 For archiving, the @code{:ARCHIVE:} property may define the archive
 location for the entire subtree (@pxref{Moving subtrees}).
 @item LOGGING
+@cindex property, LOGGING
 The LOGGING property may define logging settings for an entry or a
 subtree (@pxref{Tracking TODO state changes}).
 @end table
@@ -4203,7 +4483,7 @@ subtree (@pxref{Tracking TODO state changes}).
 @section Column view
 A great way to view and edit properties in an outline tree is
-@emph{column view}.  In column view, each outline item is turned into a
+@emph{column view}.  In column view, each outline node is turned into a
 table row.  Columns in this table provide access to properties of the
 entries.  Org mode implements columns by overlaying a tabular structure
 over the headline of each item.  While the headlines have been turned
@@ -4240,6 +4520,7 @@ done by defining a column format line.
 To define a column format for an entire file, use a line like
+@cindex #+COLUMNS
 @example
 #+COLUMNS: %25ITEM %TAGS %PRIORITY %TODO
 @end example
@@ -4267,7 +4548,7 @@ A column definition sets the attributes of a column.  The general
 definition looks like this:
 @example
- %[width]property[(title)][@{summary-type@}]
+ %[@var{width}]@var{property}[(@var{title})][@{@var{summary-type}@}]
 @end example
 @noindent
@@ -4275,21 +4556,27 @@ Except for the percent sign and the property name, all items are
 optional.  The individual parts have the following meaning:
 @example
-width           @r{An integer specifying the width of the column in characters.}
+@var{width}           @r{An integer specifying the width of the column in characters.}
                @r{If omitted, the width will be determined automatically.}
-property        @r{The property that should be edited in this column.}
+@var{property}        @r{The property that should be edited in this column.}
 (title)         @r{The header text for the column. If omitted, the}
                @r{property name is used.}
-@{summary-type@}  @r{The summary type.  If specified, the column values for}
+@{@var{summary-type}@}  @r{The summary type.  If specified, the column values for}
                @r{parent nodes are computed from the children.}
                @r{Supported summary types are:}
                @{+@}       @r{Sum numbers in this column.}
                @{+;%.1f@}  @r{Like @samp{+}, but format result with @samp{%.1f}.}
                @{$@}       @r{Currency, short for @samp{+;%.2f}.}
                @{:@}       @r{Sum times, HH:MM:SS, plain numbers are hours.}
-                @{X@}       @r{Checkbox status, [X] if all children are [X].}
+                @{X@}       @r{Checkbox status, @samp{[X]} if all children are @samp{[X]}.}
-                @{X/@}      @r{Checkbox status, [n/m].}
+                @{X/@}      @r{Checkbox status, @samp{[n/m]}.}
-                @{X%@}      @r{Checkbox status, [n%].}
+                @{X%@}      @r{Checkbox status, @samp{[n%]}.}
+                @{min@}     @r{Smallest number in column.}
+                @{max@}     @r{Largest number.}
+                @{mean@}    @r{Arithmetic mean of numbers.}
+                @{:min@}    @r{Smallest time value in column.}
+                @{:max@}    @r{Largest time value.}
+                @{:mean@}   @r{Arithmetic mean of time values.}
 @end example
 @noindent
@@ -4297,15 +4584,16 @@ Here is an example for a complete columns definition, along with allowed
 values.
 @example
-:COLUMNS:  %20ITEM %9Approved(Approved?)@{X@} %Owner %11Status \@footnote{Please note that the COLUMNS definition must be on a single line - it is wrapped here only because of formatting constraints.}
+:COLUMNS:  %20ITEM %9Approved(Approved?)@{X@} %Owner %11Status \@footnote{Please note that the COLUMNS definition must be on a single line---it is wrapped here only because of formatting constraints.}
                   %10Time_Estimate@{:@} %CLOCKSUM
 :Owner_ALL:    Tammy Mark Karl Lisa Don
 :Status_ALL:   "In progress" "Not started yet" "Finished" ""
 :Approved_ALL: "[ ]" "[X]"
 @end example
+@noindent
 The first column, @samp{%25ITEM}, means the first 25 characters of the
-item itself, i.e. of the headline.  You probably always should start the
+item itself, @ie of the headline.  You probably always should start the
 column definition with the @samp{ITEM} specifier.  The other specifiers
 create columns @samp{Owner} with a list of names as allowed values, for
 @samp{Status} with four different possible values, and for a checkbox
@@ -4326,13 +4614,16 @@ in the subtree.
 @tsubheading{Turning column view on and off}
 @kindex C-c C-x C-c
 @item C-c C-x C-c
-Create the column view for the local environment.  This command searches
+@vindex org-columns-default-format
-the hierarchy, up from point, for a @code{:COLUMNS:} property that defines
+Turn on column view.  If the cursor is before the first headline in the file,
-a format.  When one is found, the column view table is established for
+column view is turned on for the entire file, using the @code{#+COLUMNS}
-the entire tree, starting from the entry that contains the @code{:COLUMNS:}
+definition.  If the cusor is somewhere inside the outline, this command
-property.  If none is found, the format is taken from the @code{#+COLUMNS}
+searches the hierarchy, up from point, for a @code{:COLUMNS:} property that
-line or from the variable @code{org-columns-default-format}, and column
+defines a format.  When one is found, the column view table is established
-view is established for the current entry and its subtree.
+for the tree starting at the entry that contains the @code{:COLUMNS:}
+property.  If no such property is found, the format is taken from the
+@code{#+COLUMNS} line or from the variable @code{org-columns-default-format},
+and column view is established for the current entry and its subtree.
 @kindex r
 @item r
 Recreate the column view, to include recent changes made in the buffer.
@@ -4393,10 +4684,10 @@ Delete the current column.
 Since column view is just an overlay over a buffer, it cannot be
 exported or printed directly.  If you want to capture a column view, use
-this @code{columnview} dynamic block (@pxref{Dynamic blocks}).  The frame
+a @code{columnview} dynamic block (@pxref{Dynamic blocks}).  The frame
 of this block looks like this:
-@cindex #+BEGIN: columnview
+@cindex #+BEGIN, columnview
 @example
 * The column view
 #+BEGIN: columnview :hlines 1 :id "label"
@@ -4408,29 +4699,30 @@ of this block looks like this:
 @table @code
 @item :id
-This is most important parameter.  Column view is a feature that is
+This is the most important parameter.  Column view is a feature that is
 often localized to a certain (sub)tree, and the capture block might be
-in a different location in the file.  To identify the tree whose view to
+at a different location in the file.  To identify the tree whose view to
-capture, you can use 3 values:
+capture, you can use 4 values:
+@cindex property, ID
 @example
 local     @r{use the tree in which the capture block is located}
 global    @r{make a global view, including all headings in the file}
-"file:path-to-file"
+"file:@var{path-to-file}"
          @r{run column view at the top of this file}
-"ID"      @r{call column view in the tree that has an @code{:ID:}}
+"@var{ID}"      @r{call column view in the tree that has an @code{:ID:}}
          @r{property with the value @i{label}.  You can use}
          @r{@kbd{M-x org-id-copy} to create a globally unique ID for}
          @r{the current entry and copy it to the kill-ring.}
 @end example
 @item :hlines
-When @code{t}, insert a hline after every line.  When a number N, insert
+When @code{t}, insert an hline after every line.  When a number @var{N}, insert
-a hline before each headline with level @code{<= N}.
+an hline before each headline with level @code{<= @var{N}}.
 @item :vlines
-When set to @code{t}, enforce column groups to get vertical lines.
+When set to @code{t}, force column groups to get vertical lines.
 @item :maxlevel
 When set to a number, don't capture entries below this level.
 @item :skip-empty-rows
-When set to @code{t}, skip row where the only non-empty specifier of the
+When set to @code{t}, skip rows where the only non-empty specifier of the
 column view is @code{ITEM}.
 @end table
@@ -4442,12 +4734,12 @@ The following commands insert or update the dynamic block:
 @kindex C-c C-x i
 @item C-c C-x i
 Insert a dynamic block capturing a column view.  You will be prompted
-for the scope or id of the view.
+for the scope or ID of the view.
 @kindex C-c C-c
 @item C-c C-c
 @kindex C-c C-x C-u
 @itemx C-c C-x C-u
-Update dynamical block at point.  The cursor needs to be in the
+Update dynamic block at point.  The cursor needs to be in the
 @code{#+BEGIN} line of the dynamic block.
 @kindex C-u C-c C-x C-u
 @item C-u C-c C-x C-u
@@ -4456,10 +4748,18 @@ you have several clock table blocks in a buffer.
 @end table
 You can add formulas to the column view table and you may add plotting
-instructions in front of the table - these will survive an update of the
+instructions in front of the table---these will survive an update of the
 block.  If there is a @code{#+TBLFM:} after the table, the table will
 actually be recalculated automatically after an update.
+An alternative way to capture and process property values into a table is
+provided by Eric Schulte's @file{org-collector.el} which is a contributed
+package@footnote{Contributed packages are not part of Emacs, but are
+distributed with the main distribution of Org (visit
+@uref{http://orgmode.org}).}.  It provides a general API to collect
+properties from entries in a certain scope, and arbitrary Lisp expressions to
+process these values before inserting them into a table or a dynamic block.
 @node Property API,  , Column view, Properties and Columns
 @section The Property API
 @cindex properties, API
@@ -4474,8 +4774,8 @@ property API}.
 @chapter Dates and Times
 @cindex dates
 @cindex times
-@cindex time stamps
+@cindex timestamp
-@cindex date stamps
+@cindex date stamp
 To assist project planning, TODO items can be labeled with a date and/or
 a time.  The specially formatted string carrying the date and time
@@ -4495,40 +4795,40 @@ is used in a much wider sense.
 @node Timestamps, Creating timestamps, Dates and Times, Dates and Times
-@section Timestamps, deadlines and scheduling
+@section Timestamps, deadlines, and scheduling
-@cindex time stamps
+@cindex timestamps
 @cindex ranges, time
 @cindex date stamps
 @cindex deadlines
 @cindex scheduling
-A time stamp is a specification of a date (possibly with time or a range
+A timestamp is a specification of a date (possibly with a time or a range
 of times) in a special format, either @samp{<2003-09-16 Tue>} or
 @samp{<2003-09-16 Tue 09:39>} or @samp{<2003-09-16 Tue
 12:00-12:30>}@footnote{This is the standard ISO date/time format.  To
-use an alternative format, see @ref{Custom time format}.}.  A time stamp
+use an alternative format, see @ref{Custom time format}.}.  A timestamp
 can appear anywhere in the headline or body of an Org tree entry.  Its
 presence causes entries to be shown on specific dates in the agenda
 (@pxref{Weekly/daily agenda}).  We distinguish:
 @table @var
-@item Plain time stamp; Event; Appointment
+@item Plain timestamp; Event; Appointment
 @cindex timestamp
-A simple time stamp just assigns a date/time to an item.  This is just
+A simple timestamp just assigns a date/time to an item.  This is just
 like writing down an appointment or event in a paper agenda.  In the
 timeline and agenda displays, the headline of an entry associated with a
-plain time stamp will be shown exactly on that date.
+plain timestamp will be shown exactly on that date.
 @example
 * Meet Peter at the movies <2006-11-01 Wed 19:15>
 * Discussion on climate change <2006-11-02 Thu 20:00-22:00>
 @end example
-@item Time stamp with repeater interval
+@item Timestamp with repeater interval
 @cindex timestamp, with repeater interval
-A time stamp may contain a @emph{repeater interval}, indicating that it
+A timestamp may contain a @emph{repeater interval}, indicating that it
 applies not only on the given date, but again and again after a certain
-interval of N days (d), weeks (w), months(m), or years(y).  The
+interval of N days (d), weeks (w), months (m), or years (y).  The
 following will show up in the agenda every Wednesday:
 @example
@@ -4548,7 +4848,7 @@ package.  For example
 @item Time/Date range
 @cindex timerange
 @cindex date range
-Two time stamps connected by @samp{--} denote a range.  The headline
+Two timestamps connected by @samp{--} denote a range.  The headline
 will be shown on the first and last day of the range, and on any dates
 that are displayed and fall in the range.  Here is an example:
@@ -4557,11 +4857,11 @@ that are displayed and fall in the range.  Here is an example:
   <2004-08-23 Mon>--<2004-08-26 Thu>
 @end example
-@item Inactive time stamp
+@item Inactive timestamp
 @cindex timestamp, inactive
 @cindex inactive timestamp
-Just like a plain time stamp, but with square brackets instead of
+Just like a plain timestamp, but with square brackets instead of
-angular ones.  These time stamps are inactive in the sense that they do
+angular ones.  These timestamps are inactive in the sense that they do
 @emph{not} trigger an entry to show up in the agenda.
 @example
@@ -4575,32 +4875,35 @@ angular ones.  These time stamps are inactive in the sense that they do
 @cindex creating timestamps
 @cindex timestamps, creating
-For Org mode to recognize time stamps, they need to be in the specific
+For Org mode to recognize timestamps, they need to be in the specific
-format.  All commands listed below produce time stamps in the correct
+format.  All commands listed below produce timestamps in the correct
 format.
 @table @kbd
 @kindex C-c .
 @item C-c .
-Prompt for a date and insert a corresponding time stamp.  When the cursor is
+Prompt for a date and insert a corresponding timestamp.  When the cursor is
-at an existing time stamp in the buffer, the command is used to modify this
+at an existing timestamp in the buffer, the command is used to modify this
 timestamp instead of inserting a new one.  When this command is used twice in
 succession, a time range is inserted.
 @c
-@kindex C-u C-c .
-@item C-u C-c .
-Like @kbd{C-c .}, but use the alternative format which contains date
-and time.  The default time can be rounded to multiples of 5 minutes,
-see the option @code{org-time-stamp-rounding-minutes}.
-@c
 @kindex C-c !
 @item C-c !
-Like @kbd{C-c .}, but insert an inactive time stamp that will not cause
+Like @kbd{C-c .}, but insert an inactive timestamp that will not cause
 an agenda entry.
 @c
+@kindex C-u C-c .
+@kindex C-u C-c !
+@item C-u C-c .
+@itemx C-u C-c !
+@vindex org-time-stamp-rounding-minutes
+Like @kbd{C-c .} and @kbd{C-c !}, but use the alternative format which
+contains date and time.  The default time can be rounded to multiples of 5
+minutes, see the option @code{org-time-stamp-rounding-minutes}.
+@c
 @kindex C-c <
 @item C-c <
-Insert a time stamp corresponding to the cursor date in the Calendar.
+Insert a timestamp corresponding to the cursor date in the Calendar.
 @c
 @kindex C-c >
 @item C-c >
@@ -4610,7 +4913,7 @@ instead.
 @c
 @kindex C-c C-o
 @item C-c C-o
-Access the agenda for the date given by the time stamp or -range at
+Access the agenda for the date given by the timestamp or -range at
 point (@pxref{Weekly/daily agenda}).
 @c
 @kindex S-@key{left}
@@ -4618,17 +4921,20 @@ point (@pxref{Weekly/daily agenda}).
 @item S-@key{left}
 @itemx S-@key{right}
 Change date at cursor by one day.  These key bindings conflict with
-CUA mode (@pxref{Conflicts}).
+shift-selection and related modes (@pxref{Conflicts}).
 @c
 @kindex S-@key{up}
 @kindex S-@key{down}
 @item S-@key{up}
 @itemx S-@key{down}
 Change the item under the cursor in a timestamp.  The cursor can be on a
-year, month, day, hour or minute.  Note that if the cursor is in a
+year, month, day, hour or minute.  When the timestamp contains a time range
-headline and not at a time stamp, these same keys modify the priority of
+like @samp{15:30-16:30}, modifying the first time will also shift the second,
-an item.  (@pxref{Priorities}). The key bindings also conflict with
+shifting the time block with constant length.  To change the length, modify
-CUA mode (@pxref{Conflicts}).
+the second time.  Note that if the cursor is in a headline and not at a
+timestamp, these same keys modify the priority of an item.
+(@pxref{Priorities}). The key bindings also conflict with shift-selection and
+related modes (@pxref{Conflicts}).
 @c
 @kindex C-c C-y
 @cindex evaluate time range
@@ -4649,6 +4955,7 @@ the following column).
 @cindex date, reading in minibuffer
 @cindex time, reading in minibuffer
+@vindex org-read-date-prefer-future
 When Org mode prompts for a date/time, the default is shown as an ISO
 date, and the prompt therefore seems to ask for an ISO date.  But it
 will in fact accept any string containing some date and/or time
@@ -4657,10 +4964,10 @@ can, for example, use @kbd{C-y} to paste a (possibly multi-line) string
 copied from an email message.  Org mode will find whatever information
 is in there and derive anything you have not specified from the
 @emph{default date and time}.  The default is usually the current date
-and time, but when modifying an existing time stamp, or when entering
+and time, but when modifying an existing timestamp, or when entering
 the second stamp of a range, it is taken from the stamp in the buffer.
 When filling in information, Org mode assumes that most of the time you
-will want to enter a date in the future: If you omit the month/year and
+will want to enter a date in the future: if you omit the month/year and
 the given day/month is @i{before} today, it will assume that you mean a
 future date@footnote{See the variable
 @code{org-read-date-prefer-future}.}.
@@ -4686,11 +4993,11 @@ w4            --> ISO week for of the current year @b{2006}
 Furthermore you can specify a relative date by giving, as the
 @emph{first} thing in the input: a plus/minus sign, a number and a
-letter [dwmy] to indicate change in days weeks, months, years.  With a
+letter ([dwmy]) to indicate change in days, weeks, months, or years.  With a
 single plus or minus, the date is always relative to today.  With a
 double plus or minus, it is relative to the default date.  If instead of
 a single letter, you use the abbreviation of day name, the date will be
-the nth such day.  E.g.
+the nth such day.  @Eg
 @example
 +0            --> today
@@ -4699,14 +5006,17 @@ the nth such day.  E.g.
 +4            --> same as above
 +2w           --> two weeks from today
 ++5           --> five days from default date
-+2tue         --> second tuesday from now.
+2tue         --> second Tuesday from now.
 @end example
+@vindex parse-time-months
+@vindex parse-time-weekdays
 The function understands English month and weekday abbreviations.  If
 you want to use unabbreviated names and/or other languages, configure
 the variables @code{parse-time-months} and @code{parse-time-weekdays}.
 @cindex calendar, for selecting date
+@vindex org-popup-calendar-for-date-prompt
 Parallel to the minibuffer prompt, a calendar is popped up@footnote{If
 you don't need/want the calendar, configure the variable
 @code{org-popup-calendar-for-date-prompt}.}.  When you exit the date
@@ -4734,6 +5044,7 @@ M-S-@key{right}/@key{left}   @r{One month forward/backward.}
 @key{RET}           @r{Choose date in calendar.}
 @end example
+@vindex org-read-date-display-live
 The actions of the date/time prompt may seem complex, but I assure you they
 will grow on you, and you will start getting annoyed by pretty much any other
 way of entering a date/time out there.  To help you understand what is going
@@ -4747,6 +5058,8 @@ minibuffer@footnote{If you find this distracting, turn the display of with
 @cindex time format, custom
 @cindex date format, custom
+@vindex org-display-custom-times
+@vindex org-time-stamp-custom-formats
 Org mode uses the standard ISO notation for dates and times as it is
 defined in ISO 8601.  If you cannot get used to this and require another
 representation of date and time to keep you happy, you can get it by
@@ -4761,28 +5074,28 @@ Toggle the display of custom formats for dates and times.
 @noindent
 Org mode needs the default format for scanning, so the custom date/time
-format does not @emph{replace} the default format - instead it is put
+format does not @emph{replace} the default format---instead it is put
 @emph{over} the default format using text properties.  This has the
 following consequences:
 @itemize @bullet
 @item
-You cannot place the cursor onto a time stamp anymore, only before or
+You cannot place the cursor onto a timestamp anymore, only before or
 after.
 @item
 The @kbd{S-@key{up}/@key{down}} keys can no longer be used to adjust
-each component of a time stamp.  If the cursor is at the beginning of
+each component of a timestamp.  If the cursor is at the beginning of
 the stamp, @kbd{S-@key{up}/@key{down}} will change the stamp by one day,
 just like @kbd{S-@key{left}/@key{right}}.  At the end of the stamp, the
 time will be changed by one minute.
 @item
-If the time stamp contains a range of clock times or a repeater, these
+If the timestamp contains a range of clock times or a repeater, these
 will not be overlayed, but remain in the buffer as they were.
 @item
-When you delete a time stamp character-by-character, it will only
+When you delete a timestamp character-by-character, it will only
 disappear from the buffer after @emph{all} (invisible) characters
 belonging to the ISO timestamp have been removed.
 @item
-If the custom time stamp format is longer than the default and you are
+If the custom timestamp format is longer than the default and you are
 using dates in tables, table alignment will be messed up.  If the custom
 format is shorter, things do work as expected.
 @end itemize
@@ -4791,7 +5104,7 @@ format is shorter, things do work as expected.
 @node Deadlines and scheduling, Clocking work time, Creating timestamps, Dates and Times
 @section Deadlines and scheduling
-A time stamp may be preceded by special keywords to facilitate planning:
+A timestamp may be preceded by special keywords to facilitate planning:
 @table @var
 @item DEADLINE
@@ -4800,6 +5113,7 @@ A time stamp may be preceded by special keywords to facilitate planning:
 Meaning: the task (most likely a TODO item, though not necessarily) is supposed
 to be finished on that date.
+@vindex org-deadline-warning-days
 On the deadline date, the task will be listed in the agenda.  In
 addition, the agenda for @emph{today} will carry a warning about the
 approaching or missed deadline, starting
@@ -4822,12 +5136,13 @@ period of 5 days @code{DEADLINE: <2004-02-29 Sun -5d>}.
 Meaning: you are planning to start working on that task on the given
 date.
+@vindex org-agenda-skip-scheduled-if-done
 The headline will be listed under the given date@footnote{It will still
 be listed on that date after it has been marked DONE.  If you don't like
 this, set the variable @code{org-agenda-skip-scheduled-if-done}.}.  In
 addition, a reminder that the scheduled date has passed will be present
 in the compilation for @emph{today}, until the entry is marked DONE.
-I.e., the task will automatically be forwarded until completed.
+@Ie the task will automatically be forwarded until completed.
 @example
 *** TODO Call Trillian for a date on New Years Eve.
@@ -4838,15 +5153,15 @@ I.e., the task will automatically be forwarded until completed.
 @b{Important:} Scheduling an item in Org mode should @i{not} be
 understood in the same way that we understand @i{scheduling a meeting}.
 Setting a date for a meeting is just a simple appointment, you should
-mark this entry with a simple plain time stamp, to get this item shown
+mark this entry with a simple plain timestamp, to get this item shown
-on the date where it applies.  This is a frequent mis-understanding from
+on the date where it applies.  This is a frequent misunderstanding by
-Org-users.  In Org mode, @i{scheduling} means setting a date when you
+Org users.  In Org mode, @i{scheduling} means setting a date when you
 want to start working on an action item.
 @end table
-You may use time stamps with repeaters in scheduling and deadline
+You may use timestamps with repeaters in scheduling and deadline
 entries.  Org mode will issue early and late warnings based on the
-assumption that the time stamp represents the @i{nearest instance} of
+assumption that the timestamp represents the @i{nearest instance} of
 the repeater.  However, the use of diary sexp entries like
 @c
 @code{<%%(diary-float t 42)>}
@@ -4864,7 +5179,7 @@ sexp entry matches.
 @node Inserting deadline/schedule, Repeated tasks, Deadlines and scheduling, Deadlines and scheduling
 @subsection Inserting deadlines or schedules
-The following commands allow to quickly insert a deadline or to schedule
+The following commands allow you to quickly insert a deadline or to schedule
 an item:
 @table @kbd
@@ -4876,15 +5191,6 @@ happen in the line directly following the headline.  When called with a
 prefix arg, an existing deadline will be removed from the entry.
 @c FIXME Any CLOSED timestamp will be removed.????????
 @c
-@kindex C-c / d
-@cindex sparse tree, for deadlines
-@item C-c / d
-Create a sparse tree with all deadlines that are either past-due, or
-which will become due within @code{org-deadline-warning-days}.
-With @kbd{C-u} prefix, show all deadlines in the file.  With a numeric
-prefix, check that many days.  For example, @kbd{C-1 C-c / d} shows
-all deadlines due tomorrow.
-@c
 @kindex C-c C-s
 @item C-c C-s
 Insert @samp{SCHEDULED} keyword along with a stamp.  The insertion will
@@ -4900,23 +5206,44 @@ Mark the current entry for agenda action.  After you have marked the entry
 like this, you can open the agenda or the calendar to find an appropriate
 date.  With the cursor on the selected date, press @kbd{k s} or @kbd{k d} to
 schedule the marked item.
+@c
+@kindex C-c / d
+@cindex sparse tree, for deadlines
+@item C-c / d
+@vindex org-deadline-warning-days
+Create a sparse tree with all deadlines that are either past-due, or
+which will become due within @code{org-deadline-warning-days}.
+With @kbd{C-u} prefix, show all deadlines in the file.  With a numeric
+prefix, check that many days.  For example, @kbd{C-1 C-c / d} shows
+all deadlines due tomorrow.
+@c
+@kindex C-c / b
+@item C-c / b
+Sparse tree for deadlines and scheduled items before a given date.
+@c
+@kindex C-c / a
+@item C-c / a
+Sparse tree for deadlines and scheduled items after a given date.
 @end table
 @node Repeated tasks,  , Inserting deadline/schedule, Deadlines and scheduling
 @subsection Repeated tasks
+@cindex tasks, repeated
+@cindex repeated tasks
 Some tasks need to be repeated again and again.  Org mode helps to
 organize such tasks using a so-called repeater in a DEADLINE, SCHEDULED,
-or plain time stamp.  In the following example
+or plain timestamp.  In the following example
 @example
 ** TODO Pay the rent
   DEADLINE: <2005-10-01 Sat +1m>
 @end example
-the @code{+1m} is a repeater; the intended interpretation is that the
+@noindent
-task has a deadline on <2005-10-01> and repeats itself every (one) month
+the @code{+1m} is a repeater; the intended interpretation is that the task
-starting from that time.  If you need both a repeater and a special
+has a deadline on <2005-10-01> and repeats itself every (one) month starting
-warning period in a deadline entry, the repeater comes first and the
+from that time.  If you need both a repeater and a special warning period in
-warning period last: @code{DEADLINE: <2005-10-01 Sat +1m -3d>}.
+a deadline entry, the repeater should come first and the warning period last:
+@code{DEADLINE: <2005-10-01 Sat +1m -3d>}.
 Deadlines and scheduled items produce entries in the agenda when they
 are over-due, so it is important to be able to mark such an entry as
@@ -4926,7 +5253,7 @@ agenda.  The problem with this is, however, that then also the
 @emph{next} instance of the repeated entry will not be active.  Org mode
 deals with this in the following way: When you try to mark such an entry
 DONE (using @kbd{C-c C-t}), it will shift the base date of the repeating
-time stamp by the repeater interval, and immediately set the entry state
+timestamp by the repeater interval, and immediately set the entry state
 back to TODO.  In the example above, setting the state to DONE would
 actually switch the date like this:
@@ -4935,6 +5262,7 @@ actually switch the date like this:
   DEADLINE: <2005-11-01 Tue +1m>
 @end example
+@vindex org-log-repeat
 A timestamp@footnote{You can change this using the option
 @code{org-log-repeat}, or the @code{#+STARTUP} options @code{logrepeat},
 @code{lognoterepeat}, and @code{nologrepeat}.  With @code{lognoterepeat}, you
@@ -4946,7 +5274,7 @@ visible in the agenda when checking past dates, but all future instances
 will be visible.
 With the @samp{+1m} cookie, the date shift will always be exactly one
-month.  So if you have not payed the rent for three months, marking this
+month.  So if you have not paid the rent for three months, marking this
 entry DONE will still keep it as an overdue deadline.  Depending on the
 task, this may not be the best way to handle it.  For example, if you
 forgot to call you father for 3 weeks, it does not make sense to call
@@ -4969,42 +5297,80 @@ special repeaters markers with @samp{++} and @samp{.+}.  For example:
 @end example
 You may have both scheduling and deadline information for a specific
-task - just make sure that the repeater intervals on both are the same.
+task---just make sure that the repeater intervals on both are the same.
+An alternative to using a repeater is to create a number of copies of a task
+subtree, with dates shifted in each copy.  The command @kbd{C-c C-x c} was
+created for this purpose, it is described in @ref{Structure editing}.
 @node Clocking work time, Effort estimates, Deadlines and scheduling, Dates and Times
 @section Clocking work time
-Org mode allows you to clock the time you spent on specific tasks in a
+Org mode allows you to clock the time you spend on specific tasks in a
 project.  When you start working on an item, you can start the clock.
 When you stop working on that task, or when you mark the task done, the
 clock is stopped and the corresponding time interval is recorded.  It
 also computes the total time spent on each subtree of a project.
+Normally, the clock does not survive exiting and re-entering Emacs, but you
+can arrange for the clock information to persist across Emacs sessions with
+@lisp
+(setq org-clock-persist t)
+(org-clock-persistence-insinuate)
+@end lisp
 @table @kbd
 @kindex C-c C-x C-i
 @item C-c C-x C-i
+@vindex org-clock-into-drawer
 Start the clock on the current item (clock-in).  This inserts the CLOCK
 keyword together with a timestamp.  If this is not the first clocking of
 this item, the multiple CLOCK lines will be wrapped into a
-@code{:CLOCK:} drawer (see also the variable
+@code{:LOGBOOK:} drawer (see also the variable
 @code{org-clock-into-drawer}).  When called with a @kbd{C-u} prefix argument,
 select the task from a list of recently clocked tasks.  With two @kbd{C-u
 C-u} prefixes, clock into the task at point and mark it as the default task.
 The default task will always be available when selecting a clocking task,
-with letter @kbd{d}.
+with letter @kbd{d}.@*
+@cindex property: CLOCK_MODELINE_TOTAL
+@cindex property: LAST_REPEAT
+@vindex org-clock-modeline-total
+While the clock is running, the current clocking time is shown in the mode
+line, along with the title of the task.  The clock time shown will be all
+time ever clocked for this task and its children.  If the task has an effort
+estimate (@pxref{Effort estimates}), the mode line displays the current
+clocking time against it@footnote{To add an effort estimate ``on the fly'',
+hook a function doing this to @code{org-clock-in-prepare-hook}.}  If the task
+is a repeating one (@pxref{Repeated tasks}), only the time since the last
+reset of the task @footnote{as recorded by the @code{LAST_REPEAT} property}
+will be shown.  More control over what time is shown can be exercised with
+the @code{CLOCK_MODELINE_TOTAL} property.  It may have the values
+@code{current} to show only the current clocking instance, @code{today} to
+show all time clocked on this tasks today (see also the variable
+@code{org-extend-today-until}), @code{all} to include all time, or
+@code{auto} which is the default@footnote{See also the variable
+@code{org-clock-modeline-total}.}.@* Clicking with @kbd{mouse-1} onto the
+mode line entry will pop up a menu with clocking options.
 @kindex C-c C-x C-o
 @item C-c C-x C-o
+@vindex org-log-note-clock-out
 Stop the clock (clock-out).  This inserts another timestamp at the same
 location where the clock was last started.  It also directly computes
 the resulting time in inserts it after the time range as @samp{=>
 HH:MM}.  See the variable @code{org-log-note-clock-out} for the
 possibility to record an additional note together with the clock-out
-time stamp@footnote{The corresponding in-buffer setting is:
+timestamp@footnote{The corresponding in-buffer setting is:
 @code{#+STARTUP: lognoteclock-out}}.
+@kindex C-c C-x C-e
+@item C-c C-x C-e
+Update the effort estimate for the current clock task.
 @kindex C-c C-y
-@item C-c C-y
+@kindex C-c C-c
-Recompute the time interval after changing one of the time stamps.  This
+@item C-c C-y @ @ @r{or}@ @ C-c C-c
-is only necessary if you edit the time stamps directly.  If you change
+Recompute the time interval after changing one of the timestamps.  This
+is only necessary if you edit the timestamps directly.  If you change
 them with @kbd{S-@key{cursor}} keys, the update is automatic.
 @kindex C-c C-t
 @item C-c C-t
@@ -5021,6 +5387,7 @@ Jump to the entry that contains the currently running clock.  With a
 tasks.
 @kindex C-c C-x C-d
 @item C-c C-x C-d
+@vindex org-remove-highlights-with-change
 Display time summaries for each subtree in the current buffer.  This
 puts overlays at the end of each headline, showing the total time
 recorded under that heading, including the time of any subheadings. You
@@ -5030,11 +5397,11 @@ when you change the buffer (see variable
 @kindex C-c C-x C-r
 @item C-c C-x C-r
 Insert a dynamic block (@pxref{Dynamic blocks}) containing a clock
-report as an Org mode table into the current file.  When the cursor is
+report as an Org-mode table into the current file.  When the cursor is
 at an existing clock table, just update it.  When called with a prefix
 argument, jump to the first clock report in the current document and
 update it.
-@cindex #+BEGIN: clocktable
+@cindex #+BEGIN, clocktable
 @example
 #+BEGIN: clocktable :maxlevel 2 :emphasize nil :scope file
 #+END: clocktable
@@ -5044,12 +5411,12 @@ If such a block already exists at point, its content is replaced by the
 new table.  The @samp{BEGIN} line can specify options:
 @example
 :maxlevel    @r{Maximum level depth to which times are listed in the table.}
-:emphasize   @r{When @code{t}, emphasize level one and level two items}
+:emphasize   @r{When @code{t}, emphasize level one and level two items.}
 :scope       @r{The scope to consider.  This can be any of the following:}
             nil        @r{the current buffer or narrowed region}
             file       @r{the full current buffer}
             subtree    @r{the subtree where the clocktable is located}
-             treeN      @r{the surrounding level N tree, for example @code{tree3}}
+             tree@var{N}      @r{the surrounding level @var{N} tree, for example @code{tree3}}
             tree       @r{the surrounding level 1 tree}
             agenda     @r{all agenda files}
             ("file"..) @r{scan these files}
@@ -5062,30 +5429,33 @@ new table.  The @samp{BEGIN} line can specify options:
             2007-12       @r{December 2007}
             2007-W50      @r{ISO-week 50 in 2007}
             2007          @r{the year 2007}
-             today, yesterday, today-N          @r{a relative day}
+             today, yesterday, today-@var{N}          @r{a relative day}
-             thisweek, lastweek, thisweek-N     @r{a relative week}
+             thisweek, lastweek, thisweek-@var{N}     @r{a relative week}
-             thismonth, lastmonth, thismonth-N  @r{a relative month}
+             thismonth, lastmonth, thismonth-@var{N}  @r{a relative month}
-             thisyear, lastyear, thisyear-N     @r{a relative year}
+             thisyear, lastyear, thisyear-@var{N}     @r{a relative year}
             @r{Use @kbd{S-@key{left}/@key{right}} keys to shift the time interval.}
-:tstart      @r{A time string specifying when to start considering times}
+:tstart      @r{A time string specifying when to start considering times.}
-:tend        @r{A time string specifying when to stop considering times}
+:tend        @r{A time string specifying when to stop considering times.}
 :step        @r{@code{week} or @code{day}, to split the table into chunks.}
             @r{To use this, @code{:block} or @code{:tstart}, @code{:tend} are needed.}
-:link        @r{Link the item headlines in the table to their origins}
+:link        @r{Link the item headlines in the table to their origins.}
 :formula     @r{Content of a @code{#+TBLFM} line to be added and evaluated.}
-             @r{As a special case, @samp{:formula %} adds column with % time.}
+             @r{As a special case, @samp{:formula %} adds a column with % time.}
-             @r{If you do not specify a formula here, any existing formula}
+             @r{If you do not specify a formula here, any existing formula.}
             @r{below the clock table will survive updates and be evaluated.}
+:timestamp   @r{A timestamp for the entry, when available.  Look for SCHEDULED,}
+             @r{DEADLINE, TIMESTAMP and TIMESTAMP_IA, in this order.}
 @end example
-So to get a clock summary of the current level 1 tree, for the current
+To get a clock summary of the current level 1 tree, for the current
 day, you could write
 @example
 #+BEGIN: clocktable :maxlevel 2 :block today :scope tree1 :link t
 #+END: clocktable
 @end example
+@noindent
 and to use a specific time range you could write@footnote{Note that all
-parameters must be specified in a single line - the line is broken here
+parameters must be specified in a single line---the line is broken here
-only to fit it onto the manual.}
+only to fit it into the manual.}
 @example
 #+BEGIN: clocktable :tstart "<2006-08-10 Thu 10:00>"
                    :tend "<2006-08-10 Thu 12:00>"
@@ -5100,7 +5470,7 @@ A summary of the current subtree with % times would be
 @item C-c C-c
 @kindex C-c C-x C-u
 @itemx C-c C-x C-u
-Update dynamical block at point.  The cursor needs to be in the
+Update dynamic block at point.  The cursor needs to be in the
 @code{#+BEGIN} line of the dynamic block.
 @kindex C-u C-c C-x C-u
 @item C-u C-c C-x C-u
@@ -5123,6 +5493,8 @@ worked on or closed during a day.
 @section Effort estimates
 @cindex effort estimates
+@cindex property, Effort
+@vindex org-effort-property
 If you want to plan your work in a very detailed way, or if you need to
 produce offers with quotations of the estimated work effort, you may want to
 assign effort estimates to entries.  If you are also clocking your work, you
@@ -5141,6 +5513,8 @@ you want to clock your time).  For a specific buffer you can use
 @end example
 @noindent
+@vindex org-global-properties
+@vindex org-columns-default-format
 or, even better, you can set up these values globally by customizing the
 variables @code{org-global-properties} and @code{org-columns-default-format}.
 In particular if you want to use this setup also in the agenda, a global
@@ -5151,6 +5525,7 @@ mode, and to use @kbd{S-@key{right}} and @kbd{S-@key{left}} to change the
 value.  The values you enter will immediately be summed up in the hierarchy.
 In the column next to it, any clocked time will be displayed.
+@vindex org-agenda-columns-add-appointments-to-effort-sum
 If you switch to column view in the daily/weekly agenda, the effort column
 will summarize the estimated work effort for each day@footnote{Please note
 the pitfalls of summing hierarchical data in a flat list (@pxref{Agenda
@@ -5189,8 +5564,8 @@ Once the timer list is started, you can also use @kbd{M-@key{RET}} to insert
 new timer items.
 @kindex C-c C-x ,
 @item C-c C-x ,
-Pause the timer, or continue it if it is already paused.  With prefix
+Pause the timer, or continue it if it is already paused.
-argument, stop it entirely.
+@c removed the sentence because it is redundant to the following item
 @kindex C-u C-c C-x ,
 @item C-u C-c C-x ,
 Stop the timer.  After this, you can only start a new timer, not continue the
@@ -5213,39 +5588,42 @@ not started at exactly the right moment.
 An important part of any organization system is the ability to quickly
 capture new ideas and tasks, and to associate reference material with them.
-Org uses the @file{remember} package to create tasks, and stores files
+Org uses the @file{remember.el} package to create tasks, and stores files
 related to a task (@i{attachments}) in a special directory.
 @menu
 * Remember::                    Capture new tasks/ideas with little interruption
 * Attachments::                 Add files to tasks.
+* RSS Feeds::                   Getting input from RSS feeds
+* Protocols::                   External (@eg Browser) access to Emacs and Org
 @end menu
 @node Remember, Attachments, Capture, Capture
 @section Remember
 @cindex @file{remember.el}
-The @i{Remember} package by John Wiegley lets you store quick notes with
+The Remember package by John Wiegley lets you store quick notes with little
-little interruption of your work flow.  See
+interruption of your work flow.  It is an excellent way to add new notes and
-@uref{http://www.emacswiki.org/cgi-bin/wiki/RememberMode} for more
+tasks to Org files.  The @code{remember.el} package is part of Emacs 23, not
-information.  It is an excellent way to add new notes and tasks to
+Emacs 22.  See @uref{http://www.emacswiki.org/cgi-bin/wiki/RememberMode} for
-Org files.  Org significantly expands the possibilities of
+more information.
-@i{remember}: You may define templates for different note types, and
-associate target files and headlines with specific templates.  It also
+Org significantly expands the possibilities of Remember: you may define
-allows you to select the location where a note should be stored
+templates for different note types, and associate target files and headlines
-interactively, on the fly.
+with specific templates.  It also allows you to select the location where a
+note should be stored interactively, on the fly.
 @menu
-* Setting up Remember::         Some code for .emacs to get things going
+* Setting up Remember for Org:: Some code for .emacs to get things going
 * Remember templates::          Define the outline of different note types
 * Storing notes::               Directly get the note to where it belongs
 * Refiling notes::              Moving a note or task to a project
 @end menu
-@node Setting up Remember, Remember templates, Remember, Remember
+@node Setting up Remember for Org, Remember templates, Remember, Remember
-@subsection Setting up Remember
+@subsection Setting up Remember for Org
-The following customization will tell @i{remember} to use org files as
+The following customization will tell Remember to use Org files as
 target, and to create annotations compatible with Org links.
 @example
@@ -5255,33 +5633,34 @@ target, and to create annotations compatible with Org links.
 (define-key global-map "\C-cr" 'org-remember)
 @end example
+@noindent
 The last line binds the command @code{org-remember} to a global
 key@footnote{Please select your own key, @kbd{C-c r} is only a
-suggestion.}.  @code{org-remember} basically just calls @code{remember},
+suggestion.}.  @code{org-remember} basically just calls Remember,
-but it makes a few things easier: If there is an active region, it will
+but it makes a few things easier: if there is an active region, it will
-automatically copy the region into the remember buffer.  It also allows
+automatically copy the region into the Remember buffer.  It also allows
-to jump to the buffer and location where remember notes are being
+to jump to the buffer and location where Remember notes are being
-stored: Just call @code{org-remember} with a prefix argument.  If you
+stored: just call @code{org-remember} with a prefix argument.  If you
 use two prefix arguments, Org jumps to the location where the last
 remember note was stored.
-The remember buffer will actually use @code{org-mode} as its major mode, so
+The Remember buffer will actually use @code{org-mode} as its major mode, so
-that all editing features of Org-mode are available.  In addition to this, a
+that all editing features of Org mode are available.  In addition to this, a
 minor mode @code{org-remember-mode} is turned on, for the single purpose that
 you can use its keymap @code{org-remember-mode-map} to overwrite some of
-Org-mode's key bindings.
+Org mode's key bindings.
 You can also call @code{org-remember} in a special way from the agenda,
-using the @kbd{k r} key combination.  With this access, any time stamps
+using the @kbd{k r} key combination.  With this access, any timestamps
-inserted by the selected remember template (see below) will default to
+inserted by the selected Remember template (see below) will default to
 the cursor date in the agenda, rather than to the current date.
-@node Remember templates, Storing notes, Setting up Remember, Remember
+@node Remember templates, Storing notes, Setting up Remember for Org, Remember
 @subsection Remember templates
-@cindex templates, for remember
+@cindex templates, for Remember
 In combination with Org, you can use templates to generate
-different types of @i{remember} notes.  For example, if you would like
+different types of Remember notes.  For example, if you would like
 to use one template to create general TODO entries, another one for
 journal entries, and a third one for collecting random ideas, you could
 use:
@@ -5293,21 +5672,23 @@ use:
   ("Idea" ?i "* %^@{Title@}\n  %i\n  %a" "~/org/JOURNAL.org" "New Ideas")))
 @end example
+@vindex org-remember-default-headline
+@vindex org-directory
 @noindent In these entries, the first string is just a name, and the
 character specifies how to select the template.  It is useful if the
 character is also the first letter of the name.  The next string specifies
 the template.  Two more (optional) strings give the file in which, and the
-headline under which the new note should be stored.  The file (if not present
+headline under which, the new note should be stored.  The file (if not present
 or @code{nil}) defaults to @code{org-default-notes-file}, the heading to
 @code{org-remember-default-headline}.  If the file name is not an absolute
 path, it will be interpreted relative to @code{org-directory}.  The heading
-can also be the symbols @code{top} or @code{bottom} to send note as level 1
+can also be the symbols @code{top} or @code{bottom} to send notes as level 1
 entries to the beginning or end of the file, respectively.
 An optional sixth element specifies the contexts in which the user can select
 the template.  This element can be a list of major modes or a function.
 @code{org-remember} will first check whether the function returns @code{t} or
-if we are in any of the listed major mode, and exclude templates for which
+if we are in any of the listed major modes, and exclude templates for which
 this condition is not fulfilled.  Templates that do not specify this element
 at all, or that use @code{nil} or @code{t} as a value will always be
 selectable.
@@ -5321,6 +5702,7 @@ So for example:
   ("Idea" ?i "* %^@{Title@}\n  %i\n  %a" "~/org/JOURNAL.org" "New Ideas")))
 @end example
+@noindent
 The first template will only be available when invoking @code{org-remember}
 from an buffer in @code{emacs-lisp-mode}.  The second template will only be
 available when the function @code{my-check} returns @code{t}.  The third
@@ -5331,14 +5713,14 @@ something, Org will prompt for a key to select the template (if you have
 more than one template) and then prepare the buffer like
 @example
 * TODO
-  [[file:link to where you called remember]]
+  [[file:@var{link to where you called remember}]]
 @end example
 @noindent
 During expansion of the template, special @kbd{%}-escapes allow dynamic
 insertion of content:
 @example
-%^@{prompt@}  @r{prompt the user for a string and replace this sequence with it.}
+%^@{@var{prompt}@}  @r{prompt the user for a string and replace this sequence with it.}
            @r{You may specify a default value and a completion table with}
            @r{%^@{prompt|default|completion2|completion3...@}}
            @r{The arrow keys access a prompt-specific history.}
@@ -5346,9 +5728,9 @@ insertion of content:
 %A          @r{like @code{%a}, but prompt for the description part}
 %i          @r{initial content, the region when remember is called with C-u.}
            @r{The entire text will be indented like @code{%i} itself.}
-%t          @r{time stamp, date only}
+%t          @r{timestamp, date only}
-%T          @r{time stamp with date and time}
+%T          @r{timestamp with date and time}
-%u, %U      @r{like the above, but inactive time stamps}
+%u, %U      @r{like the above, but inactive timestamps}
 %^t         @r{like @code{%t}, but prompt for date.  Similarly @code{%^T}, @code{%^u}, @code{%^U}}
            @r{You may define a prompt like @code{%^@{Birthday@}t}}
 %n          @r{user name (taken from @code{user-full-name})}
@@ -5360,10 +5742,10 @@ insertion of content:
 %k          @r{title of currently clocked task}
 %K          @r{link to currently clocked task}
 %^G         @r{prompt for tags, with completion all tags in all agenda files.}
-%^@{prop@}p   @r{Prompt the user for a value for property @code{prop}}
+%^@{@var{prop}@}p   @r{Prompt the user for a value for property @var{prop}}
 %:keyword   @r{specific information for certain link types, see below}
-%[pathname] @r{insert the contents of the file given by @code{pathname}}
+%[@var{file}]     @r{insert the contents of the file given by @var{file}}
-%(sexp)     @r{evaluate elisp @code{(sexp)} and replace with the result}
+%(@var{sexp})     @r{evaluate Elisp @var{sexp} and replace with the result}
 %!          @r{immediately store note after completing the template}
            @r{(skipping the @kbd{C-c C-c} that normally triggers storing)}
 %&          @r{jump to target location immediately after storing note}
@@ -5376,6 +5758,7 @@ hyperlink types}), any property you store with
 @code{org-store-link-props} can be accessed in remember templates in a
 similar way.}:
+@vindex org-from-is-user-regexp
 @example
 Link type          |  Available keywords
 -------------------+----------------------------------------------
@@ -5406,29 +5789,31 @@ template that will be filled with the previous context information.
 @node Storing notes, Refiling notes, Remember templates, Remember
 @subsection Storing notes
-When you are finished preparing a note with @i{remember}, you have to press
+@vindex org-remember-clock-out-on-exit
+When you are finished preparing a note with Remember, you have to press
 @kbd{C-c C-c} to file the note away.  If you have started the clock in the
-remember buffer, you will first be asked if you want to clock out
+Remember buffer, you will first be asked if you want to clock out
 now@footnote{To avoid this query, configure the variable
 @code{org-remember-clock-out-on-exit}.}.  If you answer @kbd{n}, the clock
 will continue to run after the note was filed away.
 The handler will then store the note in the file and under the headline
-specified in the template, or it will use the default file and headlines.
+specified in the template, or it will use the default file and headline.
 The window configuration will be restored, sending you back to the working
-context before the call to @code{remember}.  To re-use the location found
+context before the call to Remember.  To re-use the location found
-during the last call to @code{remember}, exit the remember buffer with
+during the last call to Remember, exit the Remember buffer with
-@kbd{C-0 C-c C-c}, i.e. specify a zero prefix argument to @kbd{C-c C-c}.
+@kbd{C-0 C-c C-c}, @ie specify a zero prefix argument to @kbd{C-c C-c}.
 Another special case is @kbd{C-2 C-c C-c} which files the note as a child of
 the currently clocked item.
+@vindex org-remember-store-without-prompt
 If you want to store the note directly to a different place, use
-@kbd{C-1 C-c C-c} instead to exit remember@footnote{Configure the
+@kbd{C-1 C-c C-c} instead to exit Remember@footnote{Configure the
 variable @code{org-remember-store-without-prompt} to make this behavior
-the default.}.  The handler will then first prompt for a target file -
+the default.}.  The handler will then first prompt for a target file---if
-if you press @key{RET}, the value specified for the template is used.
+you press @key{RET}, the value specified for the template is used.
 Then the command offers the headings tree of the selected file, with the
-cursor position at the default headline (if you had specified one in the
+cursor position at the default headline (if you specified one in the
 template).  You can either immediately press @key{RET} to get the note
 placed there.  Or you can use the following keys to find a different
 location:
@@ -5444,6 +5829,7 @@ u            @r{One level up.}
 Pressing @key{RET} or @key{left} or @key{right}
 then leads to the following result.
+@vindex org-reverse-note-order
 @multitable @columnfractions 0.2 0.15 0.65
 @item @b{Cursor position} @tab @b{Key} @tab @b{Note gets inserted}
 @item on headline     @tab @key{RET}              @tab as sublevel of the heading at cursor, first or last
@@ -5456,7 +5842,7 @@ then leads to the following result.
 @end multitable
 Before inserting the text into a tree, the function ensures that the text has
-a headline, i.e. a first line that starts with a @samp{*}.  If not, a
+a headline, @ie a first line that starts with a @samp{*}.  If not, a
 headline is constructed from the current date.  If you have indented the text
 of the note below the headline, the indentation will be adapted if inserting
 the note into the tree requires demotion from level 1.
@@ -5468,13 +5854,18 @@ the note into the tree requires demotion from level 1.
 Remember is usually used to quickly capture notes and tasks into one or
 a few capture lists.  When reviewing the captured data, you may want to
 refile some of the entries into a different list, for example into a
-project.  Cutting, finding the right location and then pasting the note
+project.  Cutting, finding the right location, and then pasting the note
 is cumbersome.  To simplify this process, you can use the following
 special command:
 @table @kbd
 @kindex C-c C-w
 @item C-c C-w
+@vindex org-reverse-note-order
+@vindex org-refile-targets
+@vindex org-refile-use-outline-path
+@vindex org-outline-path-complete-in-steps
+@vindex org-refile-allow-creating-parent-nodes
 Refile the entry or region at point.  This command offers possible locations
 for refiling the entry and lets you select one with completion.  The item (or
 all items in the region) is filed below the target heading as a subitem.
@@ -5485,7 +5876,9 @@ targets, but you can have more complex definitions across a number of files.
 See the variable @code{org-refile-targets} for details.  If you would like to
 select a location via a file-path-like completion along the outline path, see
 the variables @code{org-refile-use-outline-path} and
-@code{org-outline-path-complete-in-steps}.
+@code{org-outline-path-complete-in-steps}.  If you would like to be able to
+create new nodes as new parents for for refiling on the fly, check the
+variable @code{org-refile-allow-creating-parent-nodes}.
 @kindex C-u C-c C-w
 @item C-u C-c C-w
 Use the refile interface to jump to a heading.
@@ -5494,10 +5887,12 @@ Use the refile interface to jump to a heading.
 Jump to the location where @code{org-refile} last moved a tree to.
 @end table
-@node Attachments,  , Remember, Capture
+@node Attachments, RSS Feeds, Remember, Capture
 @section Attachments
 @cindex attachments
+@vindex org-attach-directory
 It is often useful to associate reference material with an outline node/task.
 Small chunks of plain text can simply be stored in the subtree of a project.
 Hyperlinks (@pxref{Hyperlinks}) can be used to establish associations with
@@ -5506,13 +5901,13 @@ source code files belonging to a project.  Another method is @i{attachments},
 which are files located in a directory belonging to an outline node.  Org
 uses directories named by the unique ID of each entry.  These directories are
 located in the @file{data} directory which lives in the same directory where
-your org-file lives@footnote{If you move entries or Org-files from one
+your Org file lives@footnote{If you move entries or Org files from one
-directory to the next, you may want to configure @code{org-attach-directory}
+directory to another, you may want to configure @code{org-attach-directory}
 to contain an absolute path.}.  If you initialize this directory with
-@code{git-init}, Org will automatically commit changes when it sees them.
+@code{git init}, Org will automatically commit changes when it sees them.
 The attachment system has been contributed to Org by John Wiegley.
-In cases where this seems better, you can also attach a directory of your
+In cases where it seems better to do so, you can also attach a directory of your
 choice to an entry.  You can also make children inherit the attachment
 directory from a parent, so that an entire subtree uses the same attached
 directory.
@@ -5530,6 +5925,7 @@ to select a command:
 @table @kbd
 @kindex C-c C-a a
 @item a
+@vindex org-attach-method
 Select a file and move it into the task's attachment directory.  The file
 will be copied, moved, or linked, depending on @code{org-attach-method}.
 Note that hard links are not supported on all systems.
@@ -5552,6 +5948,7 @@ attachments yourself.
 @kindex C-c C-a o
 @item o
+@vindex org-file-apps
 Open current task's attachment.  If there are more than one, prompt for a
 file name first.  Opening will follow the rules set by @code{org-file-apps}.
 For more details, see the information on following hyperlinks
@@ -5567,7 +5964,7 @@ Open the current task's attachment directory.
 @kindex C-c C-a F
 @item F
-Also open the directory, but force using @code{dired} in Emacs.
+Also open the directory, but force using @command{dired} in Emacs.
 @kindex C-c C-a d
 @item d
@@ -5576,20 +5973,80 @@ Select and delete a single attachment.
 @kindex C-c C-a D
 @item D
 Delete all of a task's attachments.  A safer way is to open the directory in
-dired and delete from there.
+@command{dired} and delete from there.
 @kindex C-c C-a s
 @item C-c C-a s
+@cindex property, ATTACH_DIR
 Set a specific directory as the entry's attachment directory.  This works by
 putting the directory path into the @code{ATTACH_DIR} property.
 @kindex C-c C-a i
 @item C-c C-a i
+@cindex property, ATTACH_DIR_INHERIT
 Set the @code{ATTACH_DIR_INHERIT} property, so that children will use the
-same directory for attachments as the parent.
+same directory for attachments as the parent does.
+@end table
 @end table
+@node RSS Feeds, Protocols, Attachments, Capture
+@section RSS feeds
+@cindex RSS feeds
+Org has the capability to add and change entries based on information found in
+RSS feeds.  You could use this to make a task out of each new podcast in a
+podcast feed.  Or you could use a phone-based note-creating service on the
+web to import tasks into Org.  To access feeds, you need to configure the
+variable @code{org-feed-alist}.  The docstring of this variable has detailed
+information.  Here is just an example:
+@example
+(setq org-feed-alist
+      '(("ReQall" "http://www.reqall.com/user/feeds/rss/a1b2c3....."
+         "~/org/feeds.org" "ReQall Entries")
+@end example
+@noindent
+will configure that new items from the feed provided by @file{reqall.com}
+will result in new entries in the file @file{~/org/feeds.org} under the
+heading @samp{ReQall Entries}, whenever the following command is used:
+@table @kbd
+@kindex C-c C-x g
+@item C-c C-x g
+Collect items from the feeds configured in @code{org-feed-alist} and act upon
+them.
+@kindex C-c C-x G
+@item C-c C-x G
+Prompt for a feed name and go to the inbox configured for this feed.
 @end table
+Under the same headline, Org will create a drawer @samp{FEEDSTATUS} in which
+it will store information about the status of items in the feed, to avoid
+adding the same item several times.  You should add @samp{FEEDSTATUS} to the
+list of drawers in that file:
+@example
+#+DRAWERS: LOGBOOK PROPERTIES FEEDSTATUS
+@end example
+For more information, see @file{org-feed.el} and the docstring of
+@code{org-feed-alist}.
+@node Protocols,  , RSS Feeds, Capture
+@section Protocols for external access
+@cindex protocols, for external access
+@cindex emacsserver
+You can set up Org for handling protocol calls from outside applications that
+are passed to Emacs through the @file{emacsserver}.  For example, you can
+configure bookmarks in your web browser to send a link to the current page to
+Org and create a note from it using Remember (@pxref{Remember}).  Or you
+could create a bookmark that will tell Emacs to open the local source file of
+a remote website you are looking at with the browser.  See
+@uref{http://orgmode.org/worg/org-contrib/org-protocol.php} for detailed
+documentation and setup instructions.
 @node Agenda Views, Embedded LaTeX, Capture, Top
 @chapter Agenda Views
 @cindex agenda views
@@ -5600,7 +6057,7 @@ files.  To get an overview of open action items, or of events that are
 important for a particular date, this information must be collected,
 sorted and displayed in an organized way.
-Org can select items based on various criteria, and display them
+Org can select items based on various criteria and display them
 in a separate buffer.  Seven different view types are provided:
 @itemize @bullet
@@ -5611,14 +6068,14 @@ for specific dates,
 a @emph{TODO list} that covers all unfinished
 action items,
 @item
-a @emph{match view}, showings headlines based on the tags, properties and
+a @emph{match view}, showings headlines based on the tags, properties, and
 TODO state associated with them,
 @item
 a @emph{timeline view} that shows all events in a single Org file,
 in time-sorted view,
 @item
 a @emph{keyword search view} that shows all entries from multiple files
-that contain specified keywords.
+that contain specified keywords,
 @item
 a @emph{stuck projects view} showing projects that currently don't move
 along, and
@@ -5633,6 +6090,8 @@ buffer}.  This buffer is read-only, but provides commands to visit the
 corresponding locations in the original Org files, and even to
 edit these files remotely.
+@vindex org-agenda-window-setup
+@vindex org-agenda-restore-windows-after-quit
 Two variables control how the agenda buffer is displayed and whether the
 window configuration is restored when the agenda exits:
 @code{org-agenda-window-setup} and
@@ -5645,6 +6104,7 @@ window configuration is restored when the agenda exits:
 * 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
+* Exporting Agenda Views::
 * Agenda column view::          Using column view for collected entries
 @end menu
@@ -5653,6 +6113,7 @@ window configuration is restored when the agenda exits:
 @cindex agenda files
 @cindex files for agenda
+@vindex org-agenda-files
 The information to be shown is normally 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
@@ -5661,8 +6122,8 @@ maintained in that external file.}. If a directory is part of this list,
 all files with the extension @file{.org} in this directory will be part
 of the list.
-Thus even if you only work with a single Org file, this file should
+Thus, even if you only work with a single Org file, that file should
-be put into that list@footnote{When using the dispatcher, pressing
+be put into the list@footnote{When using the dispatcher, pressing
 @kbd{<} 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
@@ -5693,9 +6154,9 @@ buffers.
 The Org menu contains the current list of files and can be used
 to visit any of them.
-If you would like to focus the agenda temporarily onto a file not in
+If you would like to focus the agenda temporarily on a file not in
-this list, or onto just one file in the list or even only a subtree in a
+this list, or on just one file in the list, or even on only a subtree in a
-file, this can be done in different ways.  For a single agenda command,
+file, then this can be done in different ways.  For a single agenda command,
 you may press @kbd{<} once or several times in the dispatcher
 (@pxref{Agenda dispatcher}).  To restrict the agenda scope for an
 extended period, use the following commands:
@@ -5715,26 +6176,26 @@ Remove the permanent restriction created by @kbd{C-c C-x <}.
 @end table
 @noindent
-When working with @file{Speedbar}, you can use the following commands in
+When working with @file{speedbar.el}, you can use the following commands in
 the Speedbar frame:
 @table @kbd
 @kindex <
 @item < @r{in the speedbar frame}
-Permanently restrict the agenda to the item at the cursor in the
+Permanently restrict the agenda to the item---either an Org file or a subtree
-Speedbar frame, either an Org file or a subtree in such a file.
+in such a file---at the cursor in the Speedbar frame.
 If there is a window displaying an agenda view, the new restriction takes
 effect immediately.
 @kindex >
 @item > @r{in the speedbar frame}
-Lift the restriction again.
+Lift the restriction.
 @end table
 @node Agenda dispatcher, Built-in agenda views, Agenda files, Agenda Views
 @section The agenda dispatcher
 @cindex agenda dispatcher
 @cindex dispatching agenda commands
-The views are created through a dispatcher that should be bound to a
+The views are created through a dispatcher, which should be bound to a
-global key, for example @kbd{C-c a} (@pxref{Installation}).  In the
+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
 is accessed and list keyboard access to commands accordingly.  After
 pressing @kbd{C-c a}, an additional letter is required to execute a
@@ -5753,8 +6214,9 @@ Create the timeline view for the current buffer (@pxref{Timeline}).
 Create a list of entries selected by a boolean expression of keywords
 and/or regular expressions that must or must not occur in the entry.
 @item /
+@vindex org-agenda-text-search-extra-files
 Search for a regular expression in all agenda files and additionally in
-the files listed in @code{org-agenda-multi-occur-extra-files}.  This
+the files listed in @code{org-agenda-text-search-extra-files}.  This
 uses the Emacs command @code{multi-occur}.  A prefix argument can be
 used to specify the number of context lines for each match, default is
 1.
@@ -5769,7 +6231,7 @@ selecting the command.
 If there is an active region, restrict the following agenda command to
 the region.  Otherwise, restrict it to the current subtree@footnote{For
 backward compatibility, you can also press @kbd{0} to restrict to the
-current buffer.}.  After pressing @kbd{< <}, you still need to press the
+current region/subtree.}.  After pressing @kbd{< <}, you still need to press the
 character selecting the command.
 @end table
@@ -5806,7 +6268,8 @@ paper agenda, showing all the tasks for the current week or day.
 @cindex org-agenda, command
 @kindex C-c a a
 @item C-c a a
-Compile an agenda for the current week from a list of org files.  The agenda
+@vindex org-agenda-ndays
+Compile an agenda for the current week from a list of Org files.  The agenda
 shows the entries for each day.  With a numeric prefix@footnote{For backward
 compatibility, the universal prefix @kbd{C-u} causes all TODO entries to be
 listed before the agenda.  This feature is deprecated, use the dedicated TODO
@@ -5840,7 +6303,7 @@ agenda, you only need to customize the variable
 @end lisp
 @noindent After that, everything will happen automatically.  All diary
-entries including holidays, anniversaries etc will be included in the
+entries including holidays, anniversaries, etc., will be included in the
 agenda buffer created by Org mode.  @key{SPC}, @key{TAB}, and
 @key{RET} can be used from the agenda buffer to jump to the diary
 file in order to edit existing diary entries.  The @kbd{i} command to
@@ -5855,7 +6318,7 @@ faster to not use the above setting, but instead to copy or even move
 the entries into an Org file. Org mode evaluates diary-style sexp
 entries, and does it faster because there is no overhead for first
 creating the diary display.  Note that the sexp entries must start at
-the left margin, no white space is allowed before them.  For example,
+the left margin, no whitespace is allowed before them.  For example,
 the following segment of an Org file will be processed and entries
 will be made in the agenda:
@@ -5868,24 +6331,60 @@ will be made in the agenda:
 %%(diary-anniversary  2 10 1869) Mahatma Gandhi would be %d years old
 @end example
+@subsubheading Anniversaries from BBDB
+@cindex BBDB, anniversaries
+@cindex anniversaries, from BBDB
+If you are using the Big Brothers Database to store your contacts, you will
+very likely prefer to store anniversaries in BBDB rather than in a
+separate Org or diary file.  Org supports this and will show BBDB
+anniversaries as part of the agenda.  All you need to do is to add the
+following to one your your agenda files:
+@example
+* Anniversaries
+  :PROPERTIES:
+  :CATEGORY: Anniv
+  :END
+%%(org-bbdb-anniversaries)
+@end example
+You can then go ahead and define anniversaries for a BBDB record.  Basically,
+you need to press @kbd{C-o anniversary @key{RET}} with the cursor in a BBDB
+record and then add the date in the format @code{YYYY-MM-DD}, followed by a
+space and the class of the anniversary (@samp{birthday} or @samp{wedding}, or
+a format string).  If you omit the class, it will default to @samp{birthday}.
+Here are a few examples, the header for the file @file{org-bbdb.el} contains
+more detailed information.
+@example
+1973-06-22
+1955-08-02 wedding
+2008-04-14 %s released version 6.01 of org-mode, %d years ago
+@end example
+After a change to BBDB, or for the first agenda display during an Emacs
+session, the agenda display will suffer a short delay as Org updates its
+hash with anniversaries.  However, from then on things will be very fast---much
+faster in fact than a long list of @samp{%%(diary-anniversary)} entries
+in an Org or Diary file.
 @subsubheading Appointment reminders
 @cindex @file{appt.el}
 @cindex appointment reminders
-Org can interact with Emacs appointments notification facility.
+Org can interact with Emacs appointments notification facility.  To add all
+the appointments of your agenda files, use the command
-To add all the appointments of your agenda files, use the command
+@code{org-agenda-to-appt}.  This command also lets you filter through the
-@code{org-agenda-to-appt}.  This commands also lets you filter through
+list of your appointments and add only those belonging to a specific category
-the list of your appointments and add only those belonging to a specific
+or matching a regular expression. See the docstring for details.
-category or matching a regular expression. See the docstring for
-details.
 @node Global TODO list, Matching tags and properties, Weekly/daily agenda, Built-in agenda views
 @subsection The global TODO list
 @cindex global TODO list
 @cindex TODO list, global
-The global TODO list contains all unfinished TODO items, formatted and
+The global TODO list contains all unfinished TODO items formatted and
 collected into a single place.
 @table @kbd
@@ -5898,11 +6397,12 @@ the TODO entries directly from that buffer (@pxref{Agenda commands}).
 @kindex C-c a T
 @item C-c a T
 @cindex TODO keyword matching
+@vindex org-todo-keywords
 Like the above, but allows selection of a specific TODO keyword.  You
 can also do this by specifying a prefix argument to @kbd{C-c a t}.  With
 a @kbd{C-u} prefix you are prompted for a keyword, and you may also
-specify several keywords by separating them with @samp{|} as boolean OR
+specify several keywords by separating them with @samp{|} as the boolean OR
-operator.  With a numeric prefix, the Nth keyword in
+operator.  With a numeric prefix, the nth keyword in
 @code{org-todo-keywords} is selected.
 @kindex r
 The @kbd{r} key in the agenda buffer regenerates it, and you can give
@@ -5923,11 +6423,17 @@ keywords.  This list can become very long.  There are two ways to keep
 it more compact:
 @itemize @minus
 @item
-Some people view a TODO item that has been @emph{scheduled} for
+@vindex org-agenda-todo-ignore-scheduled
-execution (@pxref{Timestamps}) as no longer @emph{open}.  Configure the
+@vindex org-agenda-todo-ignore-deadlines
-variable @code{org-agenda-todo-ignore-scheduled} to exclude scheduled
+@vindex org-agenda-todo-ignore-with-date
-items from the global TODO list.
+Some people view a TODO item that has been @emph{scheduled} for execution or
-@item
+have a @emph{deadline} (@pxref{Timestamps}) as no longer @emph{open}.
+Configure the variables @code{org-agenda-todo-ignore-scheduled},
+@code{org-agenda-todo-ignore-deadlines}, and/or
+@code{org-agenda-todo-ignore-with-date} to exclude such items from the
+global TODO list.
+@item
+@vindex org-agenda-todo-list-sublevels
 TODO items may have sublevels to break up the task into subtasks.  In
 such cases it may be enough to list only the highest level TODO headline
 and omit the sublevels from the global list.  Configure the variable
@@ -5941,9 +6447,11 @@ and omit the sublevels from the global list.  Configure the variable
 @cindex tags view
 @cindex match view
-If headlines in the agenda files are marked with @emph{tags}
+If headlines in the agenda files are marked with @emph{tags} (@pxref{Tags}),
-(@pxref{Tags}), you can select headlines based on the tags that apply
+or have properties (@pxref{Properties and Columns}), you can select headlines
-to them and collect them into an agenda buffer.
+based on this metadata and collect them into an agenda buffer.  The match
+syntax described here also applies when creating sparse trees with @kbd{C-c /
+m}.
 @table @kbd
 @kindex C-c a m
@@ -5955,15 +6463,144 @@ expression with tags, like @samp{+work+urgent-withboss} or
 define a custom command for it (@pxref{Agenda dispatcher}).
 @kindex C-c a M
 @item C-c a M
-Like @kbd{C-c a m}, but only select headlines that are also TODO items
+@vindex org-tags-match-list-sublevels
-and force checking subitems (see variable
+@vindex org-agenda-tags-todo-honor-ignore-options
-@code{org-tags-match-list-sublevels}).  Matching specific TODO keywords
+Like @kbd{C-c a m}, but only select headlines that are also TODO items and
-together with a tags match is also possible, see @ref{Tag searches}.
+force checking subitems (see variable @code{org-tags-match-list-sublevels}).
+To exclude scheduled/deadline items, see the variable
+@code{org-agenda-tags-todo-honor-ignore-options}.  Matching specific TODO
+keywords together with a tags match is also possible, see @ref{Tag searches}.
 @end table
 The commands available in the tags list are described in @ref{Agenda
 commands}.
+@subsubheading Match syntax
+@cindex Boolean logic, for tag/property searches
+A search string can use Boolean operators @samp{&} for AND and @samp{|} for
+OR.  @samp{&} binds more strongly than @samp{|}.  Parentheses are currently
+not implemented.  Each element in the search is either a tag, a regular
+expression matching tags, or an expression like @code{PROPERTY OPERATOR
+VALUE} with a comparison operator, accessing a property value.  Each element
+may be preceded by @samp{-}, to select against it, and @samp{+} is syntactic
+sugar for positive selection.  The AND operator @samp{&} is optional when
+@samp{+} or @samp{-} is present.  Here are some examples, using only tags.
+@table @samp
+@item +work-boss
+Select headlines tagged @samp{:work:}, but discard those also tagged
+@samp{:boss:}.
+@item work|laptop
+Selects lines tagged @samp{:work:} or @samp{:laptop:}.
+@item work|laptop+night
+Like before, but require the @samp{:laptop:} lines to be tagged also
+@samp{:night:}.
+@end table
+@cindex regular expressions, with tags search
+Instead of a tag, you may also specify a regular expression enclosed in curly
+braces.  For example,
+@samp{work+@{^boss.*@}} matches headlines that contain the tag
+@samp{:work:} and any tag @i{starting} with @samp{boss}.
+@cindex TODO keyword matching, with tags search
+@cindex level, require for tags/property match
+@cindex category, require for tags/property match
+@vindex org-odd-levels-only
+You may also test for properties (@pxref{Properties and Columns}) at the same
+time as matching tags.  The properties may be real properties, or special
+properties that represent other metadata (@pxref{Special properties}).  For
+example, the ``property'' @code{TODO} represents the TODO keyword of the
+entry.  Or, the ``property'' @code{LEVEL} represents the level of an entry.
+So a search @samp{+LEVEL=3+boss-TODO="DONE"} lists all level three headlines
+that have the tag @samp{boss} and are @emph{not} marked with the TODO keyword
+DONE.  In buffers with @code{org-odd-levels-only} set, @samp{LEVEL} does not
+count the number of stars, but @samp{LEVEL=2} will correspond to 3 stars etc.
+Here are more examples:
+@table @samp
+@item work+TODO="WAITING"
+Select @samp{:work:}-tagged TODO lines with the specific TODO
+keyword @samp{WAITING}.
+@item work+TODO="WAITING"|home+TODO="WAITING"
+Waiting tasks both at work and at home.
+@end table
+When matching properties, a number of different operators can be used to test
+the value of a property.  Here is a complex example:
+@example
+work-boss+PRIORITY="A"+Coffee="unlimited"+Effort<2         \
+         +With=@{Sarah\|Denny@}+SCHEDULED>="<2008-10-11>"
+@end example
+@noindent
+The type of comparison will depend on how the comparison value is written:
+@itemize @minus
+@item
+If the comparison value is a plain number, a numerical comparison is done,
+and the allowed operators are @samp{<}, @samp{=}, @samp{>}, @samp{<=},
+@samp{>=}, and @samp{<>}.
+@item
+If the comparison value is enclosed in double-quotes,
+a string comparison is done, and the same operators are allowed.
+@item
+If the comparison value is enclosed in double-quotes @emph{and} angular
+brackets (like @samp{DEADLINE<="<2008-12-24 18:30>"}), both values are
+assumed to be date/time specifications in the standard Org way, and the
+comparison will be done accordingly.  Special values that will be recognized
+are @code{"<now>"} for now (including time), and @code{"<today>"}, and
+@code{"<tomorrow>"} for these days at 0:00 hours, @ie without a time
+specification.  Also strings like @code{"<+5d>"} or @code{"<-2m>"} with units
+@code{d}, @code{w}, @code{m}, and @code{y} for day, week, month, and year,
+respectively, can be used.
+@item
+If the comparison value is enclosed
+in curly braces, a regexp match is performed, with @samp{=} meaning that the
+regexp matches the property value, and @samp{<>} meaning that it does not
+match.
+@end itemize
+So the search string in the example finds entries tagged @samp{:work:} but
+not @samp{:boss:}, which also have a priority value @samp{A}, a
+@samp{:Coffee:} property with the value @samp{unlimited}, an @samp{Effort}
+property that is numerically smaller than 2, a @samp{:With:} property that is
+matched by the regular expression @samp{Sarah\|Denny}, and that are scheduled
+on or after October 11, 2008.
+Accessing TODO, LEVEL, and CATEGORY during a search is fast.  Accessing any
+other properties will slow down the search.  However, once you have paid the
+price by accessing one property, testing additional properties is cheap
+again.
+You can configure Org mode to use property inheritance during a search, but
+beware that this can slow down searches considerably.  See @ref{Property
+inheritance}, for details.
+For backward compatibility, and also for typing speed, there is also a
+different way to test TODO states in a search.  For this, terminate the
+tags/property part of the search string (which may include several terms
+connected with @samp{|}) with a @samp{/} and then specify a Boolean
+expression just for TODO keywords.  The syntax is then similar to that for
+tags, but should be applied with care: for example, a positive
+selection on several TODO keywords cannot meaningfully be combined with
+boolean AND.  However, @emph{negative selection} combined with AND can be
+meaningful.  To make sure that only lines are checked that actually have any
+TODO keyword (resulting in a speed-up), use @kbd{C-c a M}, or equivalently
+start the TODO part after the slash with @samp{!}.  Examples:
+@table @samp
+@item work/WAITING
+Same as @samp{work+TODO="WAITING"}
+@item work/!-WAITING-NEXT
+Select @samp{:work:}-tagged TODO lines that are neither @samp{WAITING}
+nor @samp{NEXT}
+@item work/!+WAITING|+NEXT
+Select @samp{:work:}-tagged TODO lines that are either @samp{WAITING} or
+@samp{NEXT}.
+@end table
 @node Timeline, Keyword search, Matching tags and properties, Built-in agenda views
 @subsection Timeline for a single file
 @cindex timeline, single file
@@ -5976,7 +6613,7 @@ to give an overview over events in a project.
 @table @kbd
 @kindex C-c a L
 @item C-c a L
-Show a time-sorted view of the org file, with all time-stamped items.
+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.
 @end table
@@ -6010,6 +6647,7 @@ and @code{wifi}, but not the keyword @code{ethernet}, and which are also
 not matched by the regular expression @code{8\.11[bg]}, meaning to
 exclude both 8.11b and 8.11g.
+@vindex org-agenda-text-search-extra-files
 Note that in addition to the agenda files, this command will also search
 the files listed in @code{org-agenda-text-search-extra-files}.
 @end table
@@ -6030,6 +6668,7 @@ projects and define next actions for them.
 List projects that are stuck.
 @kindex C-c a !
 @item C-c a !
+@vindex org-stuck-projects
 Customize the variable @code{org-stuck-projects} to define what a stuck
 project is and how to find it.
 @end table
@@ -6047,9 +6686,10 @@ and TODO indicate next actions.  The tag @@SHOP indicates shopping and
 is a next action even without the NEXT tag.  Finally, if the project
 contains the special word IGNORE anywhere, it should not be listed
 either.  In this case you would start by identifying eligible projects
-with a tags/todo match @samp{+PROJECT/-MAYBE-DONE}, and then check for
+with a tags/todo match@footnote{@xref{Tag searches}.}
-TODO, NEXT, @@SHOP, and IGNORE in the subtree to identify projects that
+@samp{+PROJECT/-MAYBE-DONE}, and then check for TODO, NEXT, @@SHOP, and
-are not stuck.  The correct customization for this is
+IGNORE in the subtree to identify projects that are not stuck.  The
+correct customization for this is
 @lisp
 (setq org-stuck-projects
@@ -6057,11 +6697,14 @@ are not stuck.  The correct customization for this is
                               "\\<IGNORE\\>"))
 @end lisp
+Note that if a project is identified as non-stuck, the subtree of this entry
+will still be searched for stuck projects.
 @node Presentation and sorting, Agenda commands, Built-in agenda views, Agenda Views
 @section Presentation and sorting
 @cindex presentation, of agenda items
+@vindex org-agenda-prefix-format
 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}
@@ -6083,7 +6726,7 @@ associated with the item.
 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@footnote{For
-backward compatibility, the following also works: If there are several
+backward compatibility, the following also works: if there are several
 such lines in a file, each specifies the category for the text below it.
 The first category also applies to any text before the first CATEGORY
 line.  However, using this method is @emph{strongly} deprecated as it is
@@ -6096,6 +6739,7 @@ property.}:
 @end example
 @noindent
+@cindex property, CATEGORY
 If you would like to have a special CATEGORY for a single entry or a
 (sub)tree, give the entry a @code{:CATEGORY:} property with the
 special category you want to apply as the value.
@@ -6109,9 +6753,9 @@ longer than 10 characters.
 @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
+time can be part of the timestamp 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
+ranges can be specified with two timestamps, like
 @c
 @w{@samp{<2005-05-10 Tue 20:30>--<2005-05-10 Tue 22:15>}}.
@@ -6149,6 +6793,8 @@ timed entries are embedded in a time grid, like
   20:30-22:15 Marvin escorts the Hitchhikers to the bridge
 @end example
+@vindex org-agenda-use-time-grid
+@vindex org-agenda-time-grid
 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}.
@@ -6161,6 +6807,7 @@ Before being inserted into a view, the items are sorted.  How this is
 done depends on the type of view.
 @itemize @bullet
 @item
+@vindex org-agenda-files
 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
@@ -6173,12 +6820,15 @@ 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}).
+(@pxref{Priorities}).  The priority used for sorting derives from the
+priority cookie, with additions depending on how close an item is to its due
+or scheduled date.
 @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
+@vindex org-agenda-sorting-strategy
 Sorting can be customized using the variable
 @code{org-agenda-sorting-strategy}, and may also include criteria based on
 the estimated effort of an entry (@pxref{Effort estimates}).
@@ -6187,10 +6837,10 @@ the estimated effort of an entry (@pxref{Effort estimates}).
 @section Commands in the agenda buffer
 @cindex commands, in agenda buffer
-Entries in the agenda buffer are linked back to the org file or diary
+Entries in the agenda buffer are linked back to the Org file or diary
 file where they originate.  You are not allowed to edit the agenda
 buffer itself, but commands are provided to show and jump to the
-original entry location, and to edit the org-files ``remotely'' from
+original entry location, and to edit the Org files ``remotely'' from
 the agenda buffer.  In this way, all information is stored only once,
 removing the risk that your agenda and note files may diverge.
@@ -6206,7 +6856,7 @@ Next line (same as @key{up} and @kbd{C-p}).
 @kindex p
 @item p
 Previous line (same as @key{down} and @kbd{C-n}).
-@tsubheading{View/Go to org file}
+@tsubheading{View/Go to Org file}
 @kindex mouse-3
 @kindex @key{SPC}
 @item mouse-3
@@ -6234,9 +6884,10 @@ Go to the original location of the item and delete other windows.
 @c
 @kindex f
 @item f
+@vindex org-agenda-start-with-follow-mode
 Toggle Follow mode.  In Follow mode, as you move the cursor through
 the agenda buffer, the other window always shows the corresponding
-location in the org file.  The initial setting for this mode in new
+location in the Org file.  The initial setting for this mode in new
 agenda buffers can be set with the variable
 @code{org-agenda-start-with-follow-mode}.
 @c
@@ -6247,8 +6898,11 @@ 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 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
@@ -6257,16 +6911,19 @@ types that should be included in log mode using the variable
 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 v a
-@item v
+@kindex v A
-Toggle Archives mode.  In archives mode, trees that are marked
+@item v a
-@code{ARCHIVED} are also scanned when producing the agenda.  When you call
+@itemx v A
-this command with a @kbd{C-u} prefix argument, even all archive files are
+Toggle Archives mode.  In Archives mode, trees that are marked
-included.  To exit archives mode, press @kbd{v} again.
+@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
-Toggle Clockreport mode.  In clockreport mode, the daily/weekly agenda will
+@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
@@ -6278,11 +6935,16 @@ agenda buffers can be set with the variable
 @item o
 Delete other windows.
 @c
+@kindex v d
 @kindex d
+@kindex v w
 @kindex w
-@kindex m
+@kindex v m
-@kindex y
+@kindex v y
-@item d w m y
+@item v d @ @r{or short} @ d
+@itemx v w @ @r{or short} @ w
+@itemx v m
+@itemx v y
 Switch to day/week/month/year view.  When switching to day or week view,
 this setting becomes the default for subsequent agenda commands.  Since
 month and year views are slow to create, they do not become the default.
@@ -6300,13 +6962,15 @@ Toggle the inclusion of diary entries.  See @ref{Weekly/daily agenda}.
 @c
 @kindex G
 @item G
+@vindex org-agenda-use-time-grid
+@vindex org-agenda-time-grid
 Toggle the time grid on and off.  See also the variables
 @code{org-agenda-use-time-grid} and @code{org-agenda-time-grid}.
 @c
 @kindex r
 @item r
 Recreate the agenda buffer, for example to reflect the changes after
-modification of the time stamps of items with @kbd{S-@key{left}} and
+modification of the timestamps of items with S-@key{left} and
 @kbd{S-@key{right}}.  When the buffer is the global TODO list, a prefix
 argument is interpreted to create a selective list for a specific TODO
 keyword.
@@ -6318,10 +6982,12 @@ Same as @kbd{r}.
 @kindex C-x C-s
 @item s
 @itemx C-x C-s
-Save all Org buffers in the current Emacs session.
+Save all Org buffers in the current Emacs session, and also the locations of
+IDs.
 @c
 @kindex @key{right}
 @item @key{right}
+@vindex org-agenda-ndays
 Display the following @code{org-agenda-ndays} days.  For example, if
 the display covers a week, switch to the following week.  With prefix
 arg, go forward that many times @code{org-agenda-ndays} days.
@@ -6334,8 +7000,13 @@ Display the previous dates.
 @item .
 Go to today.
 @c
+@kindex j
+@item j
+Prompt for a date and go there.
+@c
 @kindex C-c C-x C-c
 @item C-c C-x C-c
+@vindex org-columns-default-format
 Invoke column view (@pxref{Column view}) in the agenda buffer.  The column
 view format is taken from the entry at point, or (if there is no entry at
 point), from the first entry in the agenda view.  So whatever the format for
@@ -6343,6 +7014,11 @@ that entry would be in the original buffer (taken from a property, from a
 @code{#+COLUMNS} line, or from the default variable
 @code{org-columns-default-format}), will be used in the agenda.
+@kindex C-c C-x >
+@item C-c C-x >
+Remove the restriction lock on the agenda, if it is currently restricted to a
+file or subtree (@pxref{Agenda files}).
 @tsubheading{Secondary filtering and query editing}
 @cindex filtering, by tag and effort, in agenda
 @cindex tag filtering, in agenda
@@ -6351,10 +7027,14 @@ that entry would be in the original buffer (taken from a property, from a
 @kindex /
 @item /
+@vindex org-agenda-filter-preset
 Filter the current agenda view with respect to a tag and/or effort estimates.
-The difference between this and a custom agenda commands is that filtering is
+The difference between this and a custom agenda command is that filtering is
 very fast, so that you can switch quickly between different filters without
-having to recreate the agenda.
+having to recreate the agenda@footnote{Custom commands can preset a filter by
+binding the variable @code{org-agenda-filter-preset} as an option.  This
+filter will then be applied to the view and persist as a basic filter through
+refreshes and more secondary filtering.}
 You will be prompted for a tag selection letter.  Pressing @key{TAB} at that
 prompt will offer use completion to select a tag (including any tags that do
@@ -6367,19 +7047,23 @@ requiring or forbidding the selected additional tag.  Instead of pressing
 @kbd{+} or @kbd{-} after @kbd{/}, you can also immediately use the @kbd{\}
 command.
+@vindex org-sort-agenda-noeffort-is-high
 In order to filter for effort estimates, you should set-up allowed
 efforts globally, for example
 @lisp
 (setq org-global-properties
    '(("Effort_ALL". "0 0:10 0:30 1:00 2:00 3:00 4:00")))
 @end lisp
-You can then filter for an effort by first typing an operator, one of @kbd{<},
+You can then filter for an effort by first typing an operator, one of
-@kbd{>}, and @kbd{=}, and then the one-digit index of an effort estimate in
+@kbd{<}, @kbd{>}, and @kbd{=}, and then the one-digit index of an effort
-your array of allowed values, where @kbd{0} means the 10th value.  The filter
+estimate in your array of allowed values, where @kbd{0} means the 10th value.
-will then restrict to entries with effort smaller-or-equal, equal, or
+The filter will then restrict to entries with effort smaller-or-equal, equal,
-larger-or-equal than the selected value.  If the digits 0-9 are not used as
+or larger-or-equal than the selected value.  If the digits 0-9 are not used
-fast access keys to tags, you can also simply press the index digit directly
+as fast access keys to tags, you can also simply press the index digit
-without an operator.  In this case, @kbd{<} will be assumed.
+directly without an operator.  In this case, @kbd{<} will be assumed.  For
+application of the operator, entries without a defined effort will be treated
+according to the value of @code{org-sort-agenda-noeffort-is-high}.  To filter
+for tasks without effort definition, press @kbd{?} as the operator.
 @kindex \
 @item \
@@ -6422,19 +7106,24 @@ original org file.
 @c
 @kindex C-k
 @item C-k
+@vindex org-agenda-confirm-kill
 Delete the current agenda item along with the entire subtree belonging
 to it in the original Org file.  If the text to be deleted remotely
 is longer than one line, the kill needs to be confirmed by the user.  See
 variable @code{org-agenda-confirm-kill}.
 @c
+@kindex C-c C-w
+@item C-c C-w
+Refile the entry at point.
+@c
 @kindex a
 @item a
 Toggle the ARCHIVE tag for the current headline.
 @c
 @kindex A
 @item A
-Move the subtree corresponding to the current entry to its @emph{Archive
+Move the subtree corresponding to the current entry to its @emph{archive
-Sibling}.
+sibling}.
 @c
 @kindex $
 @item $
@@ -6444,6 +7133,7 @@ different file.
 @c
 @kindex T
 @item T
+@vindex org-agenda-show-inherited-tags
 Show all tags associated with the current item.  This is useful if you have
 turned off @code{org-agenda-show-inherited-tags}, but still want to see all
 tags of a headline occasionally.
@@ -6477,6 +7167,13 @@ key for this.
 @itemx S-@key{down}
 Decrease the priority of the current item.
 @c
+@kindex z
+@item z
+@vindex org-log-into-drawer
+Add a note to the entry.  This note will be recorded, and then files to the
+same location where state change notes are put.  Depending on
+@code{org-log-into-drawer}, this maybe inside a drawer.
+@c
 @kindex C-c C-a
 @item C-c C-a
 Dispatcher for all command related to attachments.
@@ -6501,25 +7198,29 @@ d   @r{Set the deadline of the marked entry to the date at point.}
 s   @r{Schedule the marked entry at the date at point.}
 r   @r{Call @code{org-remember} with the cursor date as default date.}
 @end example
+@noindent
 Press @kbd{r} afterward to refresh the agenda and see the effect of the
 command.
 @c
 @kindex S-@key{right}
 @item S-@key{right}
-Change the time stamp associated with the current line by one day into the
+Change the timestamp associated with the current line by one day into the
 future.  With a numeric prefix argument, change it by that many days.  For
-example, @kbd{3 6 5 S-@key{right}} will change it by a year.  The stamp is
+example, @kbd{3 6 5 S-@key{right}} will change it by a year.  With a
-changed in the original org file, but the change is not directly reflected in
+@kbd{C-u} prefix, change the time by one hour.  If you immediately repeat the
-the agenda buffer.  Use the @kbd{r} key to update the buffer.
+command, it will continue to change hours even without the prefix arg.  With
+a double @kbd{C-u C-u} prefix, do the same for changing minutes.  The stamp
+is changed in the original Org file, but the change is not directly reflected
+in the agenda buffer.  Use @kbd{r} or @kbd{g} to update the buffer.
 @c
 @kindex S-@key{left}
 @item S-@key{left}
-Change the time stamp associated with the current line by one day
+Change the timestamp associated with the current line by one day
 into the past.
 @c
 @kindex >
 @item >
-Change the time stamp associated with the current line to today.
+Change the timestamp associated with the current line to today.
 The key @kbd{>} has been chosen, because it is the same as @kbd{S-.}
 on my keyboard.
 @c
@@ -6540,6 +7241,42 @@ Cancel the currently running clock.
 @item J
 Jump to the running clock in another window.
+@tsubheading{Bulk remote editing selected entries}
+@cindex remote editing, bulk, from agenda
+@kindex m
+@item s
+Mark the entry at point for bulk action.
+@kindex u
+@item u
+Unmark entry for bulk action.
+@kindex U
+@item U
+Unmark all marked entries for bulk action.
+@kindex B
+@item B
+Bulk action: act on all marked entries in the agenda.  This will prompt for
+another key to select the action to be applied:
+@example
+r  @r{Prompt for a single refile target and move all entries.  The entries}
+   @r{will no longer be in the agenda, refresh (@kbd{g}) to bring them back.}
+$  @r{Archive all selected entries.}
+A  @r{Archive entries by moving them to their respective archive siblings.}
+t  @r{Change TODO state.  This prompts for a single TODO keyword and}
+   @r{changes the state of all selected entries, bypassing blocking and}
+   @r{suppressing logging notes (but not time stamps).}
+  @r{Add a tag to all selected entries.}
+-  @r{Remove a tag from all selected entries.}
+s  @r{Schedule all items to a new date.  To shift existing schedule dates}
+   @r{by a fixed number of days, use something starting with double plus}
+   @r{at the prompt, for example @samp{++8d} or @samp{++2w}.}
+d  @r{Set deadline to a specific date.}
+@end example
 @tsubheading{Calendar commands}
 @cindex calendar commands, from agenda
 @kindex c
@@ -6555,7 +7292,7 @@ date at the cursor.
 @item i
 Insert a new entry into the diary.  Prompts for the type of entry
 (day, weekly, monthly, yearly, anniversary, cyclic) and creates a new
-entry in the diary, just as @kbd{i d} etc. would do in the calendar.
+entry in the diary, just as @kbd{i d}, etc., would do in the calendar.
 The date is taken from the cursor position.
 @c
 @kindex M
@@ -6565,7 +7302,7 @@ Show the phases of the moon for the three months around current date.
 @kindex S
 @item S
 Show sunrise and sunset times.  The geographical location must be set
-with calendar variables, see documentation of the Emacs calendar.
+with calendar variables, see the documentation for the Emacs calendar.
 @c
 @kindex C
 @item C
@@ -6574,7 +7311,7 @@ calendars.
 @c
 @kindex H
 @item H
-Show holidays for three month around the cursor date.
+Show holidays for three months around the cursor date.
 @item M-x org-export-icalendar-combine-agenda-files
 Export a single iCalendar file containing entries from all agenda files.
@@ -6585,12 +7322,14 @@ This is a globally available command, and also available in the agenda menu.
 @item C-x C-w
 @cindex exporting agenda views
 @cindex agenda views, exporting
-Write the agenda view to a file.  Depending on the extension of the
+@vindex org-agenda-exporter-settings
-selected file name, the view will be exported as HTML (extension
+Write the agenda view to a file.  Depending on the extension of the selected
-@file{.html} or @file{.htm}), Postscript (extension @file{.ps}), or
+file name, the view will be exported as HTML (extension @file{.html} or
-plain text (any other extension).  Use the variable
+@file{.htm}), Postscript (extension @file{.ps}), PDF (extension @file{.pdf}),
-@code{org-agenda-exporter-settings} to set options for @file{ps-print}
+or plain text (any other extension).  When called with a @kbd{C-u} prefix
-and for @file{htmlize} to be used during export.
+argument, immediately open the newly created file.  Use the variable
+@code{org-agenda-exporter-settings} to set options for @file{ps-print} and
+for @file{htmlize} to be used during export.
 @tsubheading{Quit and Exit}
 @kindex q
@@ -6602,11 +7341,11 @@ Quit agenda, remove the agenda buffer.
 @item x
 Exit agenda, remove the agenda buffer and all buffers loaded by Emacs
 for the compilation of the agenda.  Buffers created by the user to
-visit org files will not be removed.
+visit Org files will not be removed.
 @end table
-@node Custom agenda views, Agenda column view, Agenda commands, Agenda Views
+@node Custom agenda views, Exporting Agenda Views, Agenda commands, Agenda Views
 @section Custom agenda views
 @cindex custom agenda views
 @cindex agenda views, custom
@@ -6620,8 +7359,6 @@ dispatcher (@pxref{Agenda dispatcher}), just like the default commands.
 * Storing searches::            Type once, use often
 * Block agenda::                All the stuff you need in a single buffer
 * Setting Options::             Changing the rules
-* Exporting Agenda Views::      Writing agendas to files
-* Using the agenda elsewhere::  Using agenda information in other programs
 @end menu
 @node Storing searches, Block agenda, Custom agenda views, Custom agenda views
@@ -6632,6 +7369,7 @@ 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
+@vindex org-agenda-custom-commands
 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
@@ -6725,10 +7463,11 @@ 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, Exporting Agenda Views, Block agenda, Custom agenda views
+@node Setting Options,  , Block agenda, Custom agenda views
 @subsection Setting options for custom commands
 @cindex options, for custom agenda views
+@vindex org-agenda-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
@@ -6760,6 +7499,7 @@ headline hierarchy above the match, nor the headline following the match
 will be shown.  The command @kbd{C-c a N} will do a text search limited
 to only a single file.
+@vindex org-agenda-custom-commands
 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
@@ -6787,29 +7527,32 @@ the results for GARDEN tags query in the opposite order,
 @end group
 @end lisp
-As you see, the values and parenthesis setting is a little complex.
+As you see, the values and parentheses setting is a little complex.
-When in doubt, use the customize interface to set this variable - it
+When in doubt, use the customize interface to set this variable---it
-fully supports its structure.  Just one caveat: When setting options in
+fully supports its structure.  Just one caveat: when setting options in
-this interface, the @emph{values} are just lisp expressions.  So if the
+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
+value is a string, you need to add the double-quotes around the value
 yourself.
-@node Exporting Agenda Views, Using the agenda elsewhere, Setting Options, Custom agenda views
+@node Exporting Agenda Views, Agenda column view, Custom agenda views, Agenda Views
-@subsection Exporting Agenda Views
+@section Exporting Agenda Views
 @cindex agenda views, exporting
 If you are away from your computer, it can be very useful to have a printed
 version of some agenda views to carry around.  Org mode can export custom
 agenda views as plain text, HTML@footnote{You need to install Hrvoje Niksic's
-@file{htmlize.el}.}, Postscript, and iCalendar files.  If you want to do this
+@file{htmlize.el}.}, Postscript, PDF@footnote{To create PDF output, the
-only occasionally, use the command
+ghostscript @file{ps2pdf} utility must be installed on the system.  Selecting
+a PDF file with also create the postscript file.}, and iCalendar files.  If
+you want to do this only occasionally, use the command
 @table @kbd
 @kindex C-x C-w
 @item C-x C-w
 @cindex exporting agenda views
 @cindex agenda views, exporting
+@vindex org-agenda-exporter-settings
 Write the agenda view to a file.  Depending on the extension of the
 selected file name, the view will be exported as HTML (extension
 @file{.html} or @file{.htm}), Postscript (extension @file{.ps}),
@@ -6818,10 +7561,15 @@ Use the variable @code{org-agenda-exporter-settings} to
 set options for @file{ps-print} and for @file{htmlize} to be used during
 export, for example
+@vindex org-agenda-add-entry-text-maxlines
+@vindex htmlize-output-type
+@vindex ps-number-of-columns
+@vindex ps-landscape-mode
 @lisp
 (setq org-agenda-exporter-settings
      '((ps-number-of-columns 2)
        (ps-landscape-mode t)
+        (org-agenda-add-entry-text-maxlines 5)
        (htmlize-output-type 'css)))
 @end lisp
 @end table
@@ -6831,8 +7579,8 @@ any custom agenda command with a list of output file names
 @footnote{If you want to store standard views like the weekly agenda
 or the global TODO list as well, you need to define custom commands for
 them in order to be able to specify file names.}.  Here is an example
-that first does define custom commands for the agenda and the global
+that first defines custom commands for the agenda and the global
-todo list, together with a number of files to which to export them.
+TODO list, together with a number of files to which to export them.
 Then we define two block agenda commands and specify file names for them
 as well.  File names can be relative to the current working directory,
 or absolute.
@@ -6861,9 +7609,9 @@ The extension of the file name determines the type of export.  If it is
 @file{.html}, Org mode will use the @file{htmlize.el} package to convert
 the buffer to HTML and save it to this file name.  If the extension is
 @file{.ps}, @code{ps-print-buffer-with-faces} is used to produce
-postscript output.  If the extension is @file{.ics}, iCalendar export is
+Postscript output.  If the extension is @file{.ics}, iCalendar export is
 run export over all files that were used to construct the agenda, and
-limit the export to entries listed in the agenda now.  Any other
+limit the export to entries listed in the agenda.  Any other
 extension produces a plain ASCII file.
 The export files are @emph{not} created when you use one of those
@@ -6893,8 +7641,8 @@ set options for the export commands.  For example:
 @end lisp
 @noindent
-This command sets two options for the postscript exporter, to make it
+This command sets two options for the Postscript exporter, to make it
-print in two columns in landscape format - the resulting page can be cut
+print in two columns in landscape format---the resulting page can be cut
 in two and then used in a paper agenda.  The remaining settings modify
 the agenda prefix to omit category and scheduling information, and
 instead include a checkbox to check off items.  We also remove the tags
@@ -6909,8 +7657,8 @@ From the command line you may also use
 emacs -f org-batch-store-agenda-views -kill
 @end example
 @noindent
-or, if you need to modify some parameters@footnote{Quoting may depend on the
+or, if you need to modify some parameters@footnote{Quoting depends on the
-system you use, please check th FAQ for examples.}
+system you use, please check the FAQ for examples.}
 @example
 emacs -eval '(org-batch-store-agenda-views                      \
              org-agenda-ndays 30                               \
@@ -6921,116 +7669,15 @@ emacs -eval '(org-batch-store-agenda-views                      \
 @end example
 @noindent
 which will create the agenda views restricted to the file
-@file{~/org/project.org}, without diary entries and with 30 days
+@file{~/org/project.org}, without diary entries and with a 30-day
 extent.
-@node Using the agenda elsewhere,  , Exporting Agenda Views, Custom agenda views
+You can also extract agenda information in a way that allows further
-@subsection Using agenda information outside of Org
+processing by other programs.  See @ref{Extracting agenda information}, for
-@cindex agenda, pipe
+more information.
-@cindex Scripts, for agenda processing
-Org provides commands to access agenda information for the command
-line in emacs batch mode.  This extracted information can be sent
-directly to a printer, or it can be read by a program that does further
-processing of the data.  The first of these commands is the function
-@code{org-batch-agenda}, that produces an agenda view and sends it as
-ASCII text to STDOUT.  The command takes a single string as parameter.
-If the string has length 1, it is used as a key to one of the commands
-you have configured in @code{org-agenda-custom-commands}, basically any
-key you can use after @kbd{C-c a}.  For example, to directly print the
-current TODO list, you could use
-@example
-emacs -batch -l ~/.emacs -eval '(org-batch-agenda "t")' | lpr
-@end example
-If the parameter is a string with 2 or more characters, it is used as a
-tags/todo match string.  For example, to print your local shopping list
-(all items with the tag @samp{shop}, but excluding the tag
-@samp{NewYork}), you could use
-@example
-emacs -batch -l ~/.emacs                                      \
-      -eval '(org-batch-agenda "+shop-NewYork")' | lpr
-@end example
-@noindent
-You may also modify parameters on the fly like this:
-@example
-emacs -batch -l ~/.emacs                                      \
-   -eval '(org-batch-agenda "a"                               \
-            org-agenda-ndays 30                               \
-            org-agenda-include-diary nil                      \
-            org-agenda-files (quote ("~/org/project.org")))'  \
-   | lpr
-@end example
-@noindent
-which will produce a 30 day agenda, fully restricted to the Org file
-@file{~/org/projects.org}, not even including the diary.
-If you want to process the agenda data in more sophisticated ways, you
-can use the command @code{org-batch-agenda-csv} to get a comma-separated
-list of values for each agenda item.  Each line in the output will
-contain a number of fields separated by commas.  The fields in a line
-are:
-@example
-category     @r{The category of the item}
-head         @r{The headline, without TODO kwd, TAGS and PRIORITY}
-type         @r{The type of the agenda entry, can be}
-                todo               @r{selected in TODO match}
-                tagsmatch          @r{selected in tags match}
-                diary              @r{imported from diary}
-                deadline           @r{a deadline}
-                scheduled          @r{scheduled}
-                timestamp          @r{appointment, selected by timestamp}
-                closed             @r{entry was closed on date}
-                upcoming-deadline  @r{warning about nearing deadline}
-                past-scheduled     @r{forwarded scheduled item}
-                block              @r{entry has date block including date}
-todo         @r{The TODO keyword, if any}
-tags         @r{All tags including inherited ones, separated by colons}
-date         @r{The relevant date, like 2007-2-14}
-time         @r{The time, like 15:00-16:50}
-extra        @r{String with extra planning info}
-priority-l   @r{The priority letter if any was given}
-priority-n   @r{The computed numerical priority}
-@end example
-@noindent
-Time and date will only be given if a timestamp (or deadline/scheduled)
-lead to the selection of the item.
-A CSV list like this is very easy to use in a post processing script.
-For example, here is a Perl program that gets the TODO list from
-Emacs/Org and prints all the items, preceded by a checkbox:
-@example
-@group
-#!/usr/bin/perl
-# define the Emacs command to run
-$cmd = "emacs -batch -l ~/.emacs -eval '(org-batch-agenda-csv \"t\")'";
-# run it and capture the output
-$agenda = qx@{$cmd 2>/dev/null@};
-# loop over all lines
-foreach $line (split(/\n/,$agenda)) @{
-  # get the individual values
-  ($category,$head,$type,$todo,$tags,$date,$time,$extra,
-   $priority_l,$priority_n) = split(/,/,$line);
-  # process and print
-  print "[ ] $head\n";
-@}
-@end group
-@end example
-@node Agenda column view,  , Custom agenda views, Agenda Views
+@node Agenda column view,  , Exporting Agenda Views, Agenda Views
 @section Using column view in the agenda
 @cindex column view, in agenda
 @cindex agenda, column view
@@ -7052,15 +7699,18 @@ This causes the following issues:
 @enumerate
 @item
+@vindex org-columns-default-format
+@vindex org-overriding-columns-format
 Org needs to make a decision which @code{COLUMNS} format to use.  Since the
 entries in the agenda are collected from different files, and different files
 may have different @code{COLUMNS} formats, this is a non-trivial problem.
 Org first checks if the variable @code{org-overriding-columns-format} is
-currently set, and if yes takes the format from there.  Otherwise it takes
+currently set, and if so, takes the format from there.  Otherwise it takes
 the format associated with the first item in the agenda, or, if that item
-does not have a specific format (defined in a property, or in it's file), it
+does not have a specific format (defined in a property, or in its file), it
 uses @code{org-columns-default-format}.
 @item
+@cindex property, special, CLOCKSUM
 If any of the columns has a summary type defined (@pxref{Column attributes}),
 turning on column view in the agenda will visit all relevant agenda files and
 make sure that the computations of this property are up to date.  This is
@@ -7069,7 +7719,7 @@ values displayed in the agenda.  In the daily/weekly agenda, the sums will
 cover a single day, in all other views they cover the entire block.  It is
 vital to realize that the agenda may show the same entry @emph{twice} (for
 example as scheduled and as a deadline), and it may show two entries from the
-same hierarchy (for example a @emph{parent} and it's @emph{child}).  In these
+same hierarchy (for example a @emph{parent} and its @emph{child}).  In these
 cases, the summation in the agenda will lead to incorrect results because
 some values will count double.
 @item
@@ -7077,7 +7727,7 @@ When the column view in the agenda shows the @code{CLOCKSUM}, that is always
 the entire clocked time for this item.  So even in the daily/weekly agenda,
 the clocksum listed in column view may originate from times outside the
 current view.  This has the advantage that you can compare these values with
-a column listing the planned total effort for a task - one of the major
+a column listing the planned total effort for a task---one of the major
 applications for column view in the agenda.  If you want information about
 clocked time in the displayed period use clock table mode (press @kbd{R} in
 the agenda).
@@ -7085,7 +7735,7 @@ the agenda).
 @node Embedded LaTeX, Exporting, Agenda Views, Top
-@chapter Embedded LaTeX
+@chapter Embedded La@TeX{}
 @cindex @TeX{} interpretation
 @cindex La@TeX{} interpretation
@@ -7104,17 +7754,17 @@ If you observe a few conventions, Org mode knows how to find it and what
 to do with it.
 @menu
-* Math symbols::                TeX macros for symbols and Greek letters
+* Math symbols::                @TeX{} macros for symbols and Greek letters
 * Subscripts and superscripts::  Simple syntax for raising/lowering text
 * LaTeX fragments::             Complex formulas made easy
-* Processing LaTeX fragments::  Previewing LaTeX processing
+* Processing LaTeX fragments::  Previewing La@TeX{} processing
 * CDLaTeX mode::                Speed up entering of formulas
 @end menu
 @node Math symbols, Subscripts and superscripts, Embedded LaTeX, Embedded LaTeX
 @section Math symbols
 @cindex math symbols
-@cindex TeX macros
+@cindex @TeX{} macros
 You can use La@TeX{} macros to insert special symbols like @samp{\alpha} to
 indicate the Greek letter, or @samp{\to} to indicate an arrow.  Completion
@@ -7126,7 +7776,7 @@ delimiters, for example:
 @example
 Angles are written as Greek letters \alpha, \beta and \gamma.
 @end example
+@noindent
 During HTML export (@pxref{HTML export}), these symbols are translated
 into the proper syntax for HTML, for the above examples this is
 @samp{&alpha;} and @samp{&rarr;}, respectively.  If you need such a symbol
@@ -7149,15 +7799,16 @@ the sun is R_@{sun@} = 6.96 x 10^8 m.
 @end example
 To avoid interpretation as raised or lowered text, you can quote
-@samp{^} and @samp{_} with a backslash: @samp{\_} and @samp{\^}.
+@samp{^} and @samp{_} with a backslash: @samp{\^} and @samp{\_}.
 During HTML export (@pxref{HTML export}), subscript and superscripts
 are surrounded with @code{<sub>} and @code{<sup>} tags, respectively.
 @node LaTeX fragments, Processing LaTeX fragments, Subscripts and superscripts, Embedded LaTeX
-@section LaTeX fragments
+@section La@TeX{} fragments
-@cindex LaTeX fragments
+@cindex La@TeX{} fragments
+@vindex org-format-latex-header
 With symbols, sub- and superscripts, HTML is pretty much at its end when
 it comes to representing mathematical formulas@footnote{Yes, there is
 MathML, but that is not yet fully supported by many browsers, and there
@@ -7205,6 +7856,7 @@ either $$ a=+\sqrt@{2@} $$ or \[ a=-\sqrt@{2@} \].
 @end example
 @noindent
+@vindex org-format-latex-options
 If you need any of the delimiter ASCII sequences for other purposes, you
 can configure the option @code{org-format-latex-options} to deselect the
 ones you do not wish to have interpreted by the La@TeX{} converter.
@@ -7213,7 +7865,7 @@ ones you do not wish to have interpreted by the La@TeX{} converter.
 @section Processing LaTeX fragments
 @cindex LaTeX fragments, preview
-La@TeX{} fragments can be processed to produce a preview images of the
+La@TeX{} fragments can be processed to produce preview images of the
 typeset expressions:
 @table @kbd
@@ -7239,16 +7891,16 @@ setting is active:
 @end lisp
 @node CDLaTeX mode,  , Processing LaTeX fragments, Embedded LaTeX
-@section Using CDLaTeX to enter math
+@section Using CDLa@TeX{} to enter math
-@cindex CDLaTeX
+@cindex CDLa@TeX{}
-CDLaTeX mode is a minor mode that is normally used in combination with a
+CDLa@TeX{} mode is a minor mode that is normally used in combination with a
-major La@TeX{} mode like AUCTeX in order to speed-up insertion of
+major La@TeX{} mode like AUC@TeX{} in order to speed-up insertion of
 environments and math templates.  Inside Org mode, you can make use of
-some of the features of CDLaTeX mode.  You need to install
+some of the features of CDLa@TeX{} mode.  You need to install
 @file{cdlatex.el} and @file{texmathp.el} (the latter comes also with
-AUCTeX) from @url{http://www.astro.uva.nl/~dominik/Tools/cdlatex}.
+AUC@TeX{}) from @url{http://www.astro.uva.nl/~dominik/Tools/cdlatex}.
-Don't use CDLaTeX mode itself under Org mode, but use the light
+Don't use CDLa@TeX{} mode itself under Org mode, but use the light
 version @code{org-cdlatex-mode} that comes as part of Org mode.  Turn it
 on for the current buffer with @code{M-x org-cdlatex-mode}, or for all
 Org files with
@@ -7258,7 +7910,7 @@ Org files with
 @end lisp
 When this mode is enabled, the following features are present (for more
-details see the documentation of CDLaTeX mode):
+details see the documentation of CDLa@TeX{} mode):
 @itemize @bullet
 @kindex C-c @{
 @item
@@ -7279,6 +7931,7 @@ To get a list of all abbreviations, type @kbd{M-x cdlatex-command-help}.
 @item
 @kindex _
 @kindex ^
+@vindex cdlatex-simplify-sub-super-scripts
 Pressing @kbd{_} and @kbd{^} inside a La@TeX{} fragment will insert these
 characters together with a pair of braces.  If you use @key{TAB} to move
 out of the braces, and if the braces surround only a single character or
@@ -7291,7 +7944,7 @@ macros, also outside La@TeX{} fragments.  If you wait more than 1.5 seconds
 after the backquote, a help window will pop up.
 @item
 @kindex '
-Pressing the normal quote @kbd{'} followed by another character modifies
+Pressing the single-quote @kbd{'} followed by another character modifies
 the symbol before point with an accent or a font.  If you wait more than
 1.5 seconds after the backquote, a help window will pop up.  Character
 modification will work only inside La@TeX{} fragments, outside the quote
@@ -7302,16 +7955,17 @@ is normal.
 @chapter Exporting
 @cindex exporting
-Org mode documents can be exported into a variety of other formats.  For
+Org-mode documents can be exported into a variety of other formats.  For
-printing and sharing of notes, ASCII export produces a readable and
+printing and sharing of notes, ASCII export produces a readable and simple
-simple version of an Org file.  HTML export allows you to publish a
+version of an Org file.  HTML export allows you to publish a notes file on
-notes file on the web, while the XOXO format provides a solid base for
+the web, while the XOXO format provides a solid base for exchange with a
-exchange with a broad range of other applications. La@TeX{} export lets
+broad range of other applications. La@TeX{} export lets you use Org mode and
-you use Org mode and its structured editing functions to easily create
+its structured editing functions to easily create La@TeX{} files.  DocBook
-La@TeX{} files.  To incorporate entries with associated times like
+export makes it possible to convert Org files to many other formats using
-deadlines or appointments into a desktop calendar program like iCal,
+DocBook tools.  To incorporate entries with associated times like deadlines
-Org mode can also produce extracts in the iCalendar format.  Currently
+or appointments into a desktop calendar program like iCal, Org mode can also
-Org mode only supports export, not import of these different formats.
+produce extracts in the iCalendar format.  Currently Org mode only supports
+export, not import of these different formats.
 Org supports export of selected regions when @code{transient-mark-mode} is
 enabled (default in Emacs 23).
@@ -7323,7 +7977,8 @@ enabled (default in Emacs 23).
 * The export dispatcher::       How to access exporter commands
 * ASCII export::                Exporting to plain ASCII
 * HTML export::                 Exporting to HTML
-* LaTeX and PDF export::        Exporting to LaTeX, and processing to PDF
+* LaTeX and PDF export::        Exporting to La@TeX{}, and processing to PDF
+* DocBook export::              Exporting to DocBook
 * XOXO export::                 Exporting to XOXO
 * iCalendar export::            Exporting in iCalendar format
 @end menu
@@ -7331,11 +7986,11 @@ enabled (default in Emacs 23).
 @node Markup rules, Selective export, Exporting, Exporting
 @section Markup rules
-When exporting Org mode documents,  the exporter tries to reflect the
+When exporting Org-mode documents, the exporter tries to reflect the
-structure of the document as accurately as possible in the back-end.  Since
+structure of the document as accurately as possible in the backend.  Since
-export targets like HTML or La@TeX{} allow much richer formatting, Org mode
+export targets like HTML, La@TeX{}, or DocBook allow much richer formatting,
-has rules how to prepare text for rich export.  This section summarizes the
+Org mode has rules on how to prepare text for rich export.  This section
-markup rule used in an Org mode buffer.
+summarizes the markup rules used in an Org-mode buffer.
 @menu
 * Document title::              How the document title is determined
@@ -7348,11 +8003,12 @@ markup rule used in an Org mode buffer.
 * Include files::               Include the contents of a file during export
 * Tables exported::             Tables are exported richly
 * Inlined images::              How to inline images during export
-* Footnote markup::
+* Footnote markup::             ASCII representation of footnotes
 * Emphasis and monospace::      To bold or not to bold
 * TeX macros and LaTeX fragments::  Create special, rich export.
 * Horizontal rules::            A line across the page
 * Comment lines::               Some lines will not be exported
+* Macro replacement::           Global replacement of place holders
 @end menu
 @node Document title, Headings and sections, Markup rules, Markup rules
@@ -7362,6 +8018,7 @@ markup rule used in an Org mode buffer.
 @noindent
 The title of the exported document is taken from the special line
+@cindex #+TITLE
 @example
 #+TITLE: This is the title of the document
 @end example
@@ -7372,6 +8029,7 @@ non-comment line in the buffer.  If no such line exists, or if you have
 turned off exporting of the text before the first headline (see below), the
 title will be the file name without extension.
+@cindex property, EXPORT_TITLE
 If you are exporting only a subtree by marking is as the region, the heading
 of the subtree will become the title of the document.  If the subtree has a
 property @code{EXPORT_TITLE}, that will take precedence.
@@ -7380,14 +8038,16 @@ property @code{EXPORT_TITLE}, that will take precedence.
 @subheading Headings and sections
 @cindex headings and sections, markup rules
+@vindex org-headline-levels
 The outline structure of the document as described in @ref{Document
-Structure} forms the basis for defining sections of the exported document.
+Structure}, forms the basis for defining sections of the exported document.
 However, since the outline structure is also used for (for example) lists of
 tasks, only the first three outline levels will be used as headings.  Deeper
 levels will become itemized lists.  You can change the location of this
-switch, globally by setting the variable @code{org-headline-levels}, or on a
+switch globally by setting the variable @code{org-headline-levels}, or on a
-per file basis with a line
+per-file basis with a line
+@cindex #+OPTIONS
 @example
 #+OPTIONS: H:4
 @end example
@@ -7396,12 +8056,13 @@ per file basis with a line
 @subheading Table of contents
 @cindex table of contents, markup rules
+@vindex org-export-with-toc
 The table of contents is normally inserted directly before the first headline
 of the file.  If you would like to get it to a different location, insert the
 string @code{[TABLE-OF-CONTENTS]} on a line by itself at the desired
 location.  The depth of the table of contents is by default the same as the
-number of headline levels, but you can choose a smaller number or turn off
+number of headline levels, but you can choose a smaller number, or turn off
-the table of contents entirely by configuring the variable
+the table of contents entirely, by configuring the variable
 @code{org-export-with-toc}, or on a per-file basis with a line like
 @example
@@ -7416,9 +8077,10 @@ the table of contents entirely by configuring the variable
 Org mode normally exports the text before the first headline, and even uses
 the first line as the document title.  The text will be fully marked up.  If
-you need to include literal HTML or La@TeX{} code, use the special constructs
+you need to include literal HTML, La@TeX{}, or DocBook code, use the special
-described below in the sections for the individual exporters.
+constructs described below in the sections for the individual exporters.
+@vindex org-export-skip-text-before-1st-heading
 Some people like to use the space before the first headline for setup and
 internal links and therefore would like to control the exported text before
 the first headline in a different way.  You can do so by setting the variable
@@ -7440,8 +8102,8 @@ If you still want to have some text before the first headline, use the
 @subheading Lists
 @cindex lists, markup rules
-Plain lists as described in @ref{Plain lists} are translated to the back-ends
+Plain lists as described in @ref{Plain lists}, are translated to the backend's
-syntax for such lists.  Most back-ends support unordered, ordered, and
+syntax for such lists.  Most backends support unordered, ordered, and
 description lists.
 @node Paragraphs, Literal examples, Lists, Markup rules
@@ -7454,6 +8116,7 @@ a line break within a paragraph, use @samp{\\} at the end of a line.
 To keep the line breaks in a region, but otherwise use normal formatting, you
 can use this construct, which can also be used to format poetry.
+@cindex #+BEGIN_VERSE
 @example
 #+BEGIN_VERSE
 Great clouds overhead
@@ -7466,8 +8129,9 @@ can use this construct, which can also be used to format poetry.
 When quoting a passage from another document, it is customary to format this
 as a paragraph that is indented on both the left and the right margin.  You
-can include quotations in Org mode documents like this:
+can include quotations in Org-mode documents like this:
+@cindex #+BEGIN_QUOTE
 @example
 #+BEGIN_QUOTE
 Everything should be made as simple as possible,
@@ -7475,11 +8139,19 @@ but not any simpler -- Albert Einstein
 #+END_QUOTE
 @end example
+If you would like to center some text, do it like this:
+@cindex #+BEGIN_CENTER
+@example
+#+BEGIN_CENTER
+Everything should be made as simple as possible, \\
+but not any simpler
+#+END_CENTER
+@end example
 @node Literal examples, Include files, Paragraphs, Markup rules
 @subheading Literal examples
 @cindex literal examples, markup rules
-@cindex code line refenences, markup rules
+@cindex code line references, markup rules
 You can include literal examples that should not be subjected to
 markup.  Such examples will be typeset in monospace, so this is well suited
@@ -7492,8 +8164,10 @@ Some example from a text file.
 #+END_EXAMPLE
 @end example
-For simplicity when using small examples, you can also start the example
+Note that such blocks may be @i{indented} in order to align nicely with
-lines with a colon followed by a space.  There may also be additional
+indented text and in particular with plain list structure (@pxref{Plain
+lists}).  For simplicity when using small examples, you can also start the
+example lines with a colon followed by a space.  There may also be additional
 whitespace before the colon:
 @example
@@ -7505,7 +8179,7 @@ Here is an example
 If the example is source code from a programming language, or any other text
 that can be marked up by font-lock in Emacs, you can ask for the example to
 look like the fontified Emacs buffer@footnote{Currently this works only for
-the HTML back-end, and requires the @file{htmlize.el} package version 1.34 or
+the HTML backend, and requires the @file{htmlize.el} package version 1.34 or
 later.}.  This is done with the @samp{src} block, where you also need to
 specify the name of the major mode that should be used to fontify the
 example:
@@ -7524,46 +8198,50 @@ switch to the end of the @code{BEGIN} line, to get the lines of the example
 numbered.  If you use a @code{+n} switch, the numbering from the previous
 numbered snippet will be continued in the current one.  In literal examples,
 Org will interpret strings like @samp{(ref:name)} as labels, and use them as
-targets for special hyperlinks like @code{[[(name)]]} (i.e. the reference
+targets for special hyperlinks like @code{[[(name)]]} (@ie the reference name
-name enclosed in single parenthesis).  In HTML, hovering the mouse over such
+enclosed in single parenthesis).  In HTML, hovering the mouse over such a
-a link will remote-highlight the corresponding code line, which is kind of
+link will remote-highlight the corresponding code line, which is kind of
-cool.  If the example/src snippet is numbered, you can also add a @code{-r}
+cool.
-switch.  Then labels will be @i{removed} from the source code and the links
-will be @i{replaced}@footnote{If you want to explain the use of such labels
+You can also add a @code{-r} switch which @i{removes} the labels from the
-themelves in org-mode example code, you can use the @code{-k} switch to make
+source code@footnote{Adding @code{-k} to @code{-n -r} will @i{keep} the
-sure they are not touched.} with line numbers from the code listing.  Here is
+labels in the source code while using line numbers for the links, which might
-an example:
+be useful to explain those in an org-mode example code.}.  With the @code{-n}
+switch, links to these references will be labeled by the line numbers from
+the code listing, otherwise links will use the labels with no parentheses.
+Here is an example:
 @example
 #+BEGIN_SRC emacs-lisp -n -r
 (save-excursion                  (ref:sc)
   (goto-char (point-min))       (ref:jump)
-#+END SRC
+#+END_SRC
-In line [[(sc)]] we remember the current positon.  [[(jump)][Line (jump)]]
+In line [[(sc)]] we remember the current position.  [[(jump)][Line (jump)]]
 jumps to point-min.
 @end example
+@vindex org-coderef-label-format
 If the syntax for the label format conflicts with the language syntax, use a
 @code{-l} switch to change the format, for example @samp{#+BEGIN_SRC pascal
 -n -r -l "((%s))"}.  See also the variable @code{org-coderef-label-format}.
-HTML export also allows examples to be published as text areas, @pxref{Text
+HTML export also allows examples to be published as text areas, @xref{Text
 areas in HTML export}.
 @table @kbd
 @kindex C-c '
 @item C-c '
 Edit the source code example at point in its native mode.  This works by
-switching to an indirect buffer, narrowing the buffer and switching to the
+switching to a temporary buffer with the source code.  You need to exit by
-other mode.  You need to exit by pressing @kbd{C-c '} again@footnote{Upon
+pressing @kbd{C-c '} again@footnote{Upon exit, lines starting with @samp{*}
-exit, lines starting with @samp{*} or @samp{#} will get a comma prepended, to
+or @samp{#} will get a comma prepended, to keep them from being interpreted
-keep them from being interpreted by Org as outline nodes or special
+by Org as outline nodes or special comments.  These commas will be striped
-comments.  These commas will be striped for editing with @kbd{C-c '}, and
+for editing with @kbd{C-c '}, and also for export.}, the edited version will
-also for export.}.  Fixed-width
+then replace the old version in the Org buffer.  Fixed-width regions
-regions (where each line starts with a colon followed by a space) will be
+(where each line starts with a colon followed by a space) will be edited
-edited using @code{artist-mode}@footnote{You may select a different-mode with
+using @code{artist-mode}@footnote{You may select a different-mode with the
-the variable @code{org-edit-fixed-width-region-mode}.} to allow creating
+variable @code{org-edit-fixed-width-region-mode}.} to allow creating ASCII
-ASCII drawings easily.  Using this command in an empty line will create a new
+drawings easily.  Using this command in an empty line will create a new
 fixed-width region.
 @kindex C-c l
 @item C-c l
@@ -7580,13 +8258,13 @@ label is stored as a link @samp{(label)}, for retrieval with @kbd{C-c C-l}.
 @cindex include files, markup rules
 During export, you can include the content of another file.  For example, to
-include your .emacs file, you could use:
+include your @file{.emacs} file, you could use:
 @cindex #+INCLUDE
 @example
 #+INCLUDE: "~/.emacs" src emacs-lisp
 @end example
+@noindent
 The optional second and third parameter are the markup (@samp{quote},
 @samp{example}, or @samp{src}), and, if the markup is @samp{src}, the
 language for formatting the contents.  The markup is optional, if it is not
@@ -7625,10 +8303,10 @@ a caption and a label for cross references:
 @subheading Inlined Images
 @cindex inlined images, markup rules
-Some backends (HTML and LaTeX) allow to directly include images into the
+Some backends (HTML, La@TeX{}, and DocBook) allow you to directly include images
-exported document.  Org does this, if a link to an image files does not have
+into the exported document.  Org does this, if a link to an image files does
-a description part, for example @code{[[./img/a.jpg]]}.  If you wish to
+not have a description part, for example @code{[[./img/a.jpg]]}.  If you wish
-define a caption for the image and maybe a label for internal cross
+to define a caption for the image and maybe a label for internal cross
 references, you can use (before, but close to the link)
 @example
@@ -7645,9 +8323,9 @@ information.
 @cindex footnotes, markup rules
 @cindex @file{footnote.el}
-Footnotes defined in the way descriped in @ref{Footnotes} will be exported by
+Footnotes defined in the way described in @ref{Footnotes}, will be exported by
-all backends.  Org does allow multiple references to the same note, and
+all backends.  Org allows multiple references to the same note, and
-different backends support this to varying degree.
+different backends support this to varying degrees.
 @node Emphasis and monospace, TeX macros and LaTeX fragments, Footnote markup, Markup rules
 @subheading Emphasis and monospace
@@ -7660,25 +8338,26 @@ different backends support this to varying degree.
 @cindex strike-through text, markup rules
 You can make words @b{*bold*}, @i{/italic/}, _underlined_, @code{=code=}
 and @code{~verbatim~}, and, if you must, @samp{+strike-through+}.  Text
-in the code and verbatim string is not processed for Org mode specific
+in the code and verbatim string is not processed for Org-mode specific
 syntax, it is exported verbatim.
 @node TeX macros and LaTeX fragments, Horizontal rules, Emphasis and monospace, Markup rules
 @subheading @TeX{} macros and La@TeX{} fragments
-@cindex LaTeX fragments, markup rules
+@cindex La@TeX{} fragments, markup rules
-@cindex TeX macros, markup rules
+@cindex @TeX{} macros, markup rules
 @cindex HTML entities
-@cindex LaTeX entities
+@cindex La@TeX{} entities
+@vindex org-html-entities
 A @TeX{}-like syntax is used to specify special characters.  Where possible,
-these will be transformed into the native format of the exporter back-end.
+these will be transformed into the native format of the exporter backend.
 Strings like @code{\alpha} will be exported as @code{&alpha;} in the HTML
 output, and as @code{$\alpha$} in the La@TeX{} output.  Similarly,
 @code{\nbsp} will become @code{&nbsp;} in HTML and @code{~} in La@TeX{}.
 This applies for a large number of entities, with names taken from both HTML
 and La@TeX{}, see the variable @code{org-html-entities} for the complete
 list.  If you are unsure about a name, use @kbd{M-@key{TAB}} for completion
-after having typed the backslash and maybe a few characters
+after having typed the backslash and optionally a few characters
 (@pxref{Completion}).
 La@TeX{} fragments are converted into images for HTML export, and they are
@@ -7694,10 +8373,11 @@ different lengths or a compact set of dots.
 A line consisting of only dashes, and at least 5 of them, will be
 exported as a horizontal line (@samp{<hr/>} in HTML).
-@node Comment lines,  , Horizontal rules, Markup rules
+@node Comment lines, Macro replacement, Horizontal rules, Markup rules
 @subheading Comment lines
 @cindex comment lines
 @cindex exporting, not
+@cindex #+BEGIN_COMMENT
 Lines starting with @samp{#} in column zero are treated as comments and will
 never be exported.  Also entire subtrees starting with the word
@@ -7710,10 +8390,33 @@ never be exported.  Also entire subtrees starting with the word
 Toggle the COMMENT keyword at the beginning of an entry.
 @end table
+@node Macro replacement,  , Comment lines, Markup rules
+@subheading Macro replacement
+@cindex macro replacement, during export
+@cindex #+MACRO
+You can define text snippets with
+@example
+#+MACRO: name   replacement text $1, $2 are arguments
+@end example
+@noindent which can be referenced anywhere in the document (even in
+code examples) with @code{@{@{@{name(arg1,arg2)@}@}@}}.  In addition to
+defined macros, @code{@{@{@{title@}@}@}}, @code{@{@{@{author@}@}@}}, etc.,
+will reference information set by the @code{#+TITLE:}, @code{#+AUTHOR:}, and
+similar lines.  Also, @code{@{@{@{date(@var{FORMAT})@}@}@}} and
+@code{@{@{@{modification-time(@var{FORMAT})@}@}@}} refer to current date time
+and to the modification time of the file being exported, respectively.
+@var{FORMAT} should be a format string understood by
+@code{format-time-string}.
 @node Selective export, Export options, Markup rules, Exporting
 @section Selective export
 @cindex export, selective by tags
+@vindex org-export-select-tags
+@vindex org-export-exclude-tags
 You may use tags to select the parts of a document that should be exported,
 or to exclude parts from export.  This behavior is governed by two variables:
 @code{org-export-select-tags} and @code{org-export-exclude-tags}.
@@ -7741,7 +8444,10 @@ additional information.  These lines may be put anywhere in the file.
 The whole set of lines can be inserted into the buffer with @kbd{C-c
 C-e t}.  For individual lines, a good way to make sure the keyword is
 correct is to type @samp{#+} and then use @kbd{M-@key{TAB}} completion
-(@pxref{Completion}).
+(@pxref{Completion}).   For a summary of other in-buffer settings not
+specifically related to export, see @ref{In-buffer settings}.
+In particular, note that you can place commonly-used (export) options in
+a separate file which can be included using @code{#+SETUPFILE}.
 @table @kbd
 @kindex C-c C-e t
@@ -7749,28 +8455,40 @@ correct is to type @samp{#+} and then use @kbd{M-@key{TAB}} completion
 Insert template with export options, see example below.
 @end table
-@cindex #+TITLE:
+@cindex #+TITLE
-@cindex #+AUTHOR:
+@cindex #+AUTHOR
-@cindex #+DATE:
+@cindex #+DATE
-@cindex #+EMAIL:
+@cindex #+EMAIL
-@cindex #+LANGUAGE:
+@cindex #+DESCRIPTION
-@cindex #+TEXT:
+@cindex #+KEYWORDS
-@cindex #+OPTIONS:
+@cindex #+LANGUAGE
-@cindex #+LINK_UP:
+@cindex #+TEXT
-@cindex #+LINK_HOME:
+@cindex #+OPTIONS
-@cindex #+EXPORT_SELECT_TAGS:
+@cindex #+BIND
-@cindex #+EXPORT_EXCLUDE_TAGS:
+@cindex #+LINK_UP
-@example
+@cindex #+LINK_HOME
-#+TITLE:     the title to be shown (default is the buffer name)
+@cindex #+EXPORT_SELECT_TAGS
-#+AUTHOR:    the author (default taken from @code{user-full-name})
+@cindex #+EXPORT_EXCLUDE_TAGS
-#+DATE:      A date, fixed, of a format string for @code{format-time-string}
+@cindex #+LATEX_HEADER
-#+EMAIL:     his/her email address (default from @code{user-mail-address})
+@vindex user-full-name
-#+LANGUAGE:  language for HTML, e.g. @samp{en} (@code{org-export-default-language})
+@vindex user-mail-address
-#+TEXT:      Some descriptive text to be inserted at the beginning.
+@vindex org-export-default-language
-#+TEXT:      Several lines may be given.
+@example
-#+OPTIONS:   H:2 num:t toc:t \n:nil @@:t ::t |:t ^:t f:t TeX:t ...
+#+TITLE:       the title to be shown (default is the buffer name)
-#+LINK_UP:   the ``up'' link of an exported page
+#+AUTHOR:      the author (default taken from @code{user-full-name})
-#+LINK_HOME: the ``home'' link of an exported page
+#+DATE:        a date, fixed, of a format string for @code{format-time-string}
+#+EMAIL:       his/her email address (default from @code{user-mail-address})
+#+DESCRIPTION: the page description, @eg for the XHTML meta tag
+#+KEYWORDS:    the page keywords, @eg for the XHTML meta tag
+#+LANGUAGE:    language for HTML, @eg @samp{en} (@code{org-export-default-language})
+#+TEXT:        Some descriptive text to be inserted at the beginning.
+#+TEXT:        Several lines may be given.
+#+OPTIONS:     H:2 num:t toc:t \n:nil @@:t ::t |:t ^:t f:t TeX:t ...
+#+BIND:        lisp-var lisp-val, e.g.: org-export-latex-low-levels itemize
+               @r{You need to confirm using these, or configure @code{org-export-allow-BIND}}
+#+LINK_UP:     the ``up'' link of an exported page
+#+LINK_HOME:   the ``home'' link of an exported page
+#+LATEX_HEADER: extra line(s) for the LaTeX header, like \usepackage@{xyz@}
 #+EXPORT_SELECT_TAGS:   Tags that select a tree for export
 #+EXPORT_EXCLUDE_TAGS:  Tags that exclude a tree from export
 @end example
@@ -7820,7 +8538,7 @@ creator:   @r{turn on/off inclusion of creator info into exported file}
 timestamp: @r{turn on/off inclusion creation time into exported file}
 d:         @r{turn on/off inclusion of drawers}
 @end example
+@noindent
 These options take effect in both the HTML and La@TeX{} export, except
 for @code{TeX} and @code{LaTeX}, which are respectively @code{t} and
 @code{nil} for the La@TeX{} export.
@@ -7828,7 +8546,8 @@ for @code{TeX} and @code{LaTeX}, which are respectively @code{t} and
 When exporting only a single subtree by selecting it with @kbd{C-c @@} before
 calling an export command, the subtree can overrule some of the file's export
 settings with properties @code{EXPORT_FILE_NAME}, @code{EXPORT_TITLE},
-@code{EXPORT_TEXT}, and @code{EXPORT_OPTIONS}.
+@code{EXPORT_TEXT}, @code{EXPORT_AUTHOR}, @code{EXPORT_DATE}, and
+@code{EXPORT_OPTIONS}.
 @node The export dispatcher, ASCII export, Export options, Exporting
 @section The export dispatcher
@@ -7843,28 +8562,30 @@ the subtrees are exported.
 @table @kbd
 @kindex C-c C-e
 @item C-c C-e
+@vindex org-export-run-in-background
 Dispatcher for export and publishing commands.  Displays a help-window
 listing the additional key(s) needed to launch an export or publishing
 command.  The prefix arg is passed through to the exporter.  A double prefix
 @kbd{C-u C-u} causes most commands to be executed in the background, in a
-separate emacs process@footnote{To make this behavior the default, customize
+separate Emacs process@footnote{To make this behavior the default, customize
 the variable @code{org-export-run-in-background}.}.
 @kindex C-c C-e v
 @item C-c C-e v
 Like @kbd{C-c C-e}, but only export the text that is currently visible
-(i.e. not hidden by outline visibility).
+(@ie not hidden by outline visibility).
 @kindex C-u C-u C-c C-e
 @item C-u C-u C-c C-e
+@vindex org-export-run-in-background
 Call an the exporter, but reverse the setting of
-@code{org-export-run-in-background}, i.e. request background processing if
+@code{org-export-run-in-background}, @ie request background processing if
-not set, or force processing in the current Emacs process if st.
+not set, or force processing in the current Emacs process if set.
 @end table
 @node ASCII export, HTML export, The export dispatcher, Exporting
 @section ASCII export
 @cindex ASCII export
-ASCII export produces a simple and very readable version of an Org mode
+ASCII export produces a simple and very readable version of an Org-mode
 file.
 @cindex region, active
@@ -7873,15 +8594,19 @@ file.
 @table @kbd
 @kindex C-c C-e a
 @item C-c C-e a
-Export as ASCII file.  For an org file @file{myfile.org}, the ASCII file
+@cindex property, EXPORT_FILE_NAME
+Export as ASCII file.  For an Org file, @file{myfile.org}, the ASCII file
 will be @file{myfile.txt}.  The file will be overwritten without
-warning.  If there is an active region@footnote{this requires
+warning.  If there is an active region@footnote{This requires
-@code{transient-mark-mode} to be turned on}, only the region will be
+@code{transient-mark-mode} be turned on.}, only the region will be
 exported. If the selected region is a single tree@footnote{To select the
 current subtree, use @kbd{C-c @@}.}, the tree head will
 become the document title.  If the tree head entry has or inherits an
 @code{EXPORT_FILE_NAME} property, that name will be used for the
 export.
+@kindex C-c C-e A
+@item C-c C-e A
+Export to a temporary buffer, do not create a file.
 @kindex C-c C-e v a
 @item C-c C-e v a
 Export only the visible part of the document.
@@ -7906,6 +8631,11 @@ the body text.  Any indentation larger than this is adjusted to preserve
 the layout relative to the first line.  Should there be lines with less
 indentation than the first, these are left alone.
+@vindex org-export-ascii-links-to-notes
+Links will be exported in a footnote-like style, with the descriptive part in
+the text and the link in a note before the next heading.  See the variable
+@code{org-export-ascii-links-to-notes} for details and other options.
 @node HTML export, LaTeX and PDF export, ASCII export, Exporting
 @section HTML export
 @cindex HTML export
@@ -7918,6 +8648,7 @@ language, but with additional support for tables.
 * HTML Export commands::        How to invoke HTML export
 * Quoting HTML tags::           Using direct HTML in Org mode
 * Links::                       Transformation of links for HTML
+* Tables in HTML export::       How to modify the formatting of tables
 * Images in HTML export::       How to insert figures into HTML output
 * Text areas in HTML export::   An alternative way to show an example
 * CSS support::                 Changing the appearance of the output
@@ -7933,10 +8664,11 @@ language, but with additional support for tables.
 @table @kbd
 @kindex C-c C-e h
 @item C-c C-e h
-Export as HTML file @file{myfile.html}.  For an org file @file{myfile.org},
+@cindex property, EXPORT_FILE_NAME
+Export as HTML file @file{myfile.html}.  For an Org file @file{myfile.org},
 the ASCII file will be @file{myfile.html}.  The file will be overwritten
-without warning.  If there is an active region@footnote{this requires
+without warning.  If there is an active region@footnote{This requires
-@code{transient-mark-mode} to be turned on}, only the region will be
+@code{transient-mark-mode} be turned on.}, only the region will be
 exported. If the selected region is a single tree@footnote{To select the
 current subtree, use @kbd{C-c @@}.}, the tree head will become the document
 title.  If the tree head entry has, or inherits, an @code{EXPORT_FILE_NAME}
@@ -7962,11 +8694,11 @@ the region.  This is good for cut-and-paste operations.
 @item C-c C-e v R
 Export only the visible part of the document.
 @item M-x org-export-region-as-html
-Convert the region to HTML under the assumption that it was Org mode
+Convert the region to HTML under the assumption that it was Org-mode
 syntax before.  This is a global command that can be invoked in any
 buffer.
 @item M-x org-replace-region-by-HTML
-Replace the active region (assumed to be in Org mode syntax) by HTML
+Replace the active region (assumed to be in Org-mode syntax) by HTML
 code.
 @end table
@@ -7993,6 +8725,8 @@ which should be interpreted as such, mark them with @samp{@@} as in
 simple tags.  For more extensive HTML that should be copied verbatim to
 the exported file use either
+@cindex #+HTML
+@cindex #+BEGIN_HTML
 @example
 #+HTML: Literal HTML code for export
 @end example
@@ -8007,14 +8741,14 @@ All lines between these markers are exported literally
 @end example
-@node Links, Images in HTML export, Quoting HTML tags, HTML export
+@node Links, Tables in HTML export, Quoting HTML tags, HTML export
 @subsection Links
 @cindex links, in HTML export
 @cindex internal links, in HTML export
 @cindex external links, in HTML export
 Internal links (@pxref{Internal links}) will continue to work in HTML.  This
-does include automatic links created by radio targets (@pxref{Radio
+includes automatic links created by radio targets (@pxref{Radio
 targets}).  Links to external files will still work if the target file is on
 the same @i{relative} path as the published Org file.  Links to other
 @file{.org} files will be translated into HTML links under the assumption
@@ -8025,23 +8759,41 @@ publishing directory see @ref{Publishing links}.
 If you want to specify attributes for links, you can do so using a special
 @code{#+ATTR_HTML} line to define attributes that will be added to the
-@code{<a>} or @code{<img>} tags.  Here is an example that sets @code{alt} and
+@code{<a>} or @code{<img>} tags.  Here is an example that sets @code{title}
-@code{title} attributes for an inlined image:
+and @code{style} attributes for a link:
+@cindex #+ATTR_HTML
 @example
-#+ATTR_HTML: alt="This is image A" title="Image with no action"
+#+ATTR_HTML: title="The Org-mode homepage" style="color:red;"
-[[./img/a.jpg]]
+[[http://orgmode.org]]
+@end example
+@node Tables in HTML export, Images in HTML export, Links, HTML export
+@subsection Tables
+@cindex tables, in HTML
+@vindex org-export-html-table-tag
+Org-mode tables are exported to HTML using the table tag defined in
+@code{org-export-html-table-tag}.  The default setting makes tables without
+cell borders and frame.  If you would like to change this for individual
+tables, place somthing like the following before the table:
+@cindex #+CAPTION
+@example
+#+CAPTION: This is a table with lines around and between cells
+#+ATTR_HTML: border="2" rules="all" frame="all"
 @end example
-@node Images in HTML export, Text areas in HTML export, Links, HTML export
+@node Images in HTML export, Text areas in HTML export, Tables in HTML export, HTML export
 @subsection Images
 @cindex images, inline in HTML
 @cindex inlining images in HTML
+@vindex org-export-html-inline-images
 HTML export can inline images given as links in the Org file, and
 it can make an image the clickable part of a link.  By
-default@footnote{but see the variable
+default@footnote{But see the variable
-@code{org-export-html-inline-images}}, images are inlined if a link does
+@code{org-export-html-inline-images}.}, images are inlined if a link does
 not have a description.  So @samp{[[file:myimg.jpg]]} will be inlined,
 while @samp{[[file:myimg.jpg][the image]]} will just produce a link
 @samp{the image} that points to the image.  If the description part
@@ -8054,6 +8806,16 @@ will link to a high resolution version of the image, you could use:
 [[file:highres.jpg][file:thumb.jpg]]
 @end example
+If you need to add attributes to an inlines image, use a @code{#+ATTR_HTML},
+for example:
+@cindex #+CAPTION
+@example
+#+CAPTION: A black cat stalking a spider
+#+ATTR_HTML: alt="cat/spider image" title="one second before action"
+[[./img/a.jpg]]
+@end example
 @noindent
 and you could use @code{http} addresses just as well.
@@ -8084,23 +8846,50 @@ respectively.  For example
 @cindex CSS, for HTML export
 @cindex HTML export, CSS
+@vindex org-export-html-todo-kwd-class-prefix
+@vindex org-export-html-tag-class-prefix
 You can also give style information for the exported file.  The HTML exporter
-assigns the following special CSS classes to appropriate parts of the
+assigns the following special CSS classes@footnote{If the classes on TODO
-document - your style specifications may change these, in addition to any of
+keywords and tags lead to conflicts, use the variables
-the standard classes like for headlines, tables etc.
+@code{org-export-html-todo-kwd-class-prefix} and
-@example
+@code{org-export-html-tag-class-prefix} to make them unique.} to appropriate
-.todo              @r{TODO keywords}
+parts of the document---your style specifications may change these, in
-.done              @r{the DONE keyword}
+addition to any of the standard classes like for headlines, tables, etc.
-.timestamp         @r{time stamp}
+@example
-.timestamp-kwd     @r{keyword associated with a time stamp, like SCHEDULED}
+p.author            @r{author information, including email}
-.tag               @r{tag in a headline}
+p.date              @r{publishing date}
-.target            @r{target for links}
+p.creator           @r{creator info, about org-mode version}
-div.figure         @r{how to format an inlined image}
+.title              @r{document title}
-.linenr            @r{the line number in a code example}
+.todo               @r{TODO keywords, all not-done states}
-.code-highlighted  @r{for highlighting referenced code lines}
+.done               @r{the DONE keywords, all stated the count as done}
-@end example
+.WAITING            @r{each TODO keyword also uses a class named after itself}
+.timestamp          @r{timestamp}
-Each exported files contains a compact default style that defines these
+.timestamp-kwd      @r{keyword associated with a timestamp, like SCHEDULED}
+.timestamp-wrapper  @r{span around keyword plus timestamp}
+.tag                @r{tag in a headline}
+._HOME              @r{each tag uses itself as a class, "@@" replaced by "_"}
+.target             @r{target for links}
+.linenr             @r{the line number in a code example}
+.code-highlighted   @r{for highlighting referenced code lines}
+div.outline-N       @r{div for outline level N (headline plus text))}
+div.outline-text-N  @r{extra div for text at outline level N}
+.section-number-N   @r{section number in headlines, different for each level}
+div.figure          @r{how to format an inlined image}
+pre.src             @r{formatted source code}
+pre.example         @r{normal example}
+p.verse             @r{verse paragraph}
+div.footnotes       @r{footnote section headline}
+p.footnote          @r{footnote definition paragraph, containing a footnote}
+.footref            @r{a footnote reference number (always a <sup>)}
+.footnum            @r{footnote number in footnote definition (always <sup>)}
+@end example
+@vindex org-export-html-style-default
+@vindex org-export-html-style-include-default
+@vindex org-export-html-style
+@vindex org-export-html-extra
+@vindex org-export-html-style-default
+Each exported file contains a compact default style that defines these
 classes in a basic way@footnote{This style is defined in the constant
 @code{org-export-html-style-default}, which you should not modify.  To turn
 inclusion of these defaults off, customize
@@ -8110,6 +8899,7 @@ settings, or add to them by using the variables @code{org-export-html-style}
 granular settings, like file-local settings).  To set the latter variable
 individually for each file, you can use
+@cindex #+STYLE
 @example
 #+STYLE: <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 @end example
@@ -8125,7 +8915,8 @@ referring to an external file.
 @node Javascript support,  , CSS support, HTML export
 @subsection Javascript supported display of web pages
-@emph{Sebastian Rose} has written a JavaScript program especially designed to
+@cindex Rose, Sebastian
+Sebastian Rose has written a JavaScript program especially designed to
 enhance the web viewing experience of HTML files created with Org.  This
 program allows you to view large files in two different ways.  The first one
 is an @emph{Info}-like mode where each section is displayed separately and
@@ -8134,7 +8925,7 @@ as well, press @kbd{?} for an overview of the available keys).  The second
 view type is a @emph{folding} view much like Org provides inside Emacs.  The
 script is available at @url{http://orgmode.org/org-info.js} and you can find
 the documentation for it at @url{http://orgmode.org/worg/code/org-info-js/}.
-We are serving the script from our site, but if you use it a lot, you might
+We host the script at our site, but if you use it a lot, you might
 not want to be dependent on @url{orgmode.org} and prefer to install a local
 copy on your own web server.
@@ -8144,6 +8935,7 @@ customize-variable @key{RET} org-modules @key{RET}} to convince yourself that
 this is indeed the case.  All it then takes to make use of the program is
 adding a single line to the Org file:
+@cindex #+INFOJS_OPT
 @example
 #+INFOJS_OPT: view:info toc:nil
 @end example
@@ -8166,45 +8958,48 @@ sdepth:  @r{Maximum headline level that will still become an independent}
         @r{section for info and folding modes.  The default is taken from}
         @r{@code{org-headline-levels} (= the @code{H} switch in @code{#+OPTIONS}).}
         @r{If this is smaller than in @code{org-headline-levels}, each}
-         @r{info/folding section can still contain children headlines.}
+         @r{info/folding section can still contain child headlines.}
 toc:     @r{Should the table of content @emph{initially} be visible?}
-         @r{Even when @code{nil}, you can always get to the toc with @kbd{i}.}
+         @r{Even when @code{nil}, you can always get to the "toc" with @kbd{i}.}
 tdepth:  @r{The depth of the table of contents.  The defaults are taken from}
         @r{the variables @code{org-headline-levels} and @code{org-export-with-toc}.}
-ftoc:    @r{Does the css of the page specify a fixed position for the toc?}
+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.}
+         @r{Make this @code{above} if 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}
         @r{default), only one such button will be present.}
 @end example
+@noindent
+@vindex org-infojs-options
+@vindex org-export-html-use-infojs
 You can choose default values for these options by customizing the variable
 @code{org-infojs-options}.  If you always want to apply the script to your
 pages, configure the variable @code{org-export-html-use-infojs}.
-@node LaTeX and PDF export, XOXO export, HTML export, Exporting
+@node LaTeX and PDF export, DocBook export, HTML export, Exporting
-@section LaTeX and PDF export
+@section La@TeX{} and PDF export
-@cindex LaTeX export
+@cindex La@TeX{} export
 @cindex PDF export
+@cindex Guerry, Bastian
 Org mode contains a La@TeX{} exporter written by Bastien Guerry.  With
 further processing, this backend is also used to produce PDF output.  Since
-the LaTeX output uses @file{hyperref} to implement links and cross
+the La@TeX{} output uses @file{hyperref} to implement links and cross
 references, the PDF output file will be fully linked.
 @menu
 * LaTeX/PDF export commands::   Which key invokes which commands
-* Quoting LaTeX code::          Incorporating literal LaTeX code
+* Quoting LaTeX code::          Incorporating literal La@TeX{} code
-* Sectioning structure::        Changing sectioning in LaTeX output
+* Sectioning structure::        Changing sectioning in La@TeX{} output
-* Tables in LaTeX export::      Options for exporting tables to LaTeX
+* Tables in LaTeX export::      Options for exporting tables to La@TeX{}
-* Images in LaTeX export::      How to insert figures into LaTeX output
+* Images in LaTeX export::      How to insert figures into La@TeX{} output
 @end menu
 @node LaTeX/PDF export commands, Quoting LaTeX code, LaTeX and PDF export, LaTeX and PDF export
-@subsection LaTeX export commands
+@subsection La@TeX{} export commands
 @cindex region, active
 @cindex active region
@@ -8212,10 +9007,11 @@ references, the PDF output file will be fully linked.
 @table @kbd
 @kindex C-c C-e l
 @item C-c C-e l
-Export as La@TeX{} file @file{myfile.tex}.  For an org file
+@cindex property EXPORT_FILE_NAME
+Export as La@TeX{} file @file{myfile.tex}.  For an Org file
 @file{myfile.org}, the ASCII file will be @file{myfile.tex}.  The file will
-be overwritten without warning.  If there is an active region@footnote{this
+be overwritten without warning.  If there is an active region@footnote{This
-requires @code{transient-mark-mode} to be turned on}, only the region will be
+requires @code{transient-mark-mode} be turned on.}, only the region will be
 exported. If the selected region is a single tree@footnote{To select the
 current subtree, use @kbd{C-c @@}.}, the tree head will become the document
 title.  If the tree head entry has or inherits an @code{EXPORT_FILE_NAME}
@@ -8237,13 +9033,14 @@ Replace the active region (assumed to be in Org mode syntax) by La@TeX{}
 code.
 @kindex C-c C-e p
 @item C-c C-e p
-Export as LaTeX and then process to PDF.
+Export as La@TeX{} and then process to PDF.
 @kindex C-c C-e d
 @item C-c C-e d
-Export as LaTeX and then process to PDF, then open the resulting PDF file.
+Export as La@TeX{} and then process to PDF, then open the resulting PDF file.
 @end table
 @cindex headline levels, for exporting
+@vindex org-latex-low-levels
 In the exported version, the first 3 outline levels will become
 headlines, defining a general document structure.  Additional levels
 will be exported as description lists.  The exporter can ignore them or
@@ -8261,14 +9058,16 @@ with a numeric prefix argument. For example,
 creates two levels of headings and does the rest as items.
 @node Quoting LaTeX code, Sectioning structure, LaTeX/PDF export commands, LaTeX and PDF export
-@subsection Quoting LaTeX code
+@subsection Quoting La@TeX{} code
-Embedded La@TeX{} as described in @ref{Embedded LaTeX} will be correctly
+Embedded La@TeX{} as described in @ref{Embedded LaTeX}, will be correctly
 inserted into the La@TeX{} file.  This includes simple macros like
 @samp{\ref@{LABEL@}} to create a cross reference to a figure.  Furthermore,
 you can add special code that should only be present in La@TeX{} export with
 the following constructs:
+@cindex #+LaTeX
+@cindex #+BEGIN_LaTeX
 @example
 #+LaTeX: Literal LaTeX code for export
 @end example
@@ -8284,45 +9083,54 @@ All lines between these markers are exported literally
 @node  Sectioning structure, Tables in LaTeX export, Quoting LaTeX code, LaTeX and PDF export
 @subsection Sectioning structure
-@cindex LaTeX class
+@cindex La@TeX{} class
-@cindex LaTeX sectioning structure
+@cindex La@TeX{} sectioning structure
 By default, the La@TeX{} output uses the class @code{article}.
+@vindex org-export-latex-default-class
+@vindex org-export-latex-classes
+@cindex #+LATEX_HEADER
+@cindex #+LATEX_CLASS
+@cindex property, LATEX_CLASS
 You can change this globally by setting a different value for
 @code{org-export-latex-default-class} or locally by adding an option like
 @code{#+LaTeX_CLASS: myclass} in your file, or with a @code{:LaTeX_CLASS:}
 property that applies when exporting a region containing only this (sub)tree.
 The class should be listed in @code{org-export-latex-classes}, where you can
 also define the sectioning structure for each class, as well as defining
-additional classes.
+additional classes.  You can also use @code{#+LATEX_HEADER:
+\usepackage@{xyz@}} to add lines to the header.
 @node Tables in LaTeX export, Images in LaTeX export, Sectioning structure, LaTeX and PDF export
-@subsection Tables in LaTeX export
+@subsection Tables in La@TeX{} export
-@cindex tables, in LaTeX export
+@cindex tables, in La@TeX{} export
-For LaTeX export of a table, you can specify a label and a caption
+For La@TeX{} export of a table, you can specify a label and a caption
 (@pxref{Markup rules}).  You can also use the @code{ATTR_LaTeX} line to
 request a longtable environment for the table, so that it may span several
-pages:
+pages.  Finally, you can set the alignment string:
+@cindex #+CAPTION
+@cindex #+LABEL
+@cindex #+ATTR_LaTeX
 @example
 #+CAPTION: A long table
 #+LABEL: tbl:long
-#+ATTR_LaTeX: longtable
+#+ATTR_LaTeX: longtable align=l|lp@{3cm@}r|l
 | ..... | ..... |
 | ..... | ..... |
 @end example
 @node Images in LaTeX export,  , Tables in LaTeX export, LaTeX and PDF export
-@subsection Images in LaTeX export
+@subsection Images in La@TeX{} export
-@cindex images, inline in LaTeX
+@cindex images, inline in La@TeX{}
-@cindex inlining images in LaTeX
+@cindex inlining images in La@TeX{}
 Images that are linked to without a description part in the link, like
 @samp{[[file:img.jpg]]} or @samp{[[./img.jpg]]} will be inserted into the PDF
-output files resulting from LaTeX output.  Org will use an
+output files resulting from La@TeX{} output.  Org will use an
 @code{\includegraphics} macro to insert the image.  If you have specified a
 caption and/or a label as described in @ref{Markup rules}, the figure will
 be wrapped into a @code{figure} environment and thus become a floating
@@ -8330,6 +9138,9 @@ element.  Finally, you can use an @code{#+ATTR_LaTeX:} line to specify the
 options that can be used in the optional argument of the
 @code{\includegraphics} macro.
+@cindex #+CAPTION
+@cindex #+LABEL
+@cindex #+ATTR_LaTeX
 @example
 #+CAPTION:    The black-body emission of the disk around HR 4049
 #+LABEL:      fig:SED-HR4049
@@ -8337,20 +9148,214 @@ options that can be used in the optional argument of the
 [[./img/sed-hr4049.pdf]]
 @end example
+@vindex org-export-latex-inline-image-extensions
 If you need references to a label created in this way, write
-@samp{\ref@{fig:SED-HR4049@}} just like in LaTeX.  The default settings will
+@samp{\ref@{fig:SED-HR4049@}} just like in La@TeX{}.  The default settings will
 recognize files types that can be included as images during processing by
-pdflatex (@file{png}, @file{jpg}, and @file{pdf} files).  If you process your
+@command{pdflatex} (@file{png}, @file{jpg}, and @file{pdf} files).  If you process your
 files in a different way, you may need to customize the variable
 @code{org-export-latex-inline-image-extensions}.
-@node XOXO export, iCalendar export, LaTeX and PDF export, Exporting
+@node DocBook export, XOXO export, LaTeX and PDF export, Exporting
+@section DocBook export
+@cindex DocBook export
+@cindex PDF export
+@cindex Cui, Baoqui
+Org contains a DocBook exporter written by Baoqiu Cui.  Once an Org file is
+exported to DocBook format, it can be further processed to produce other
+formats, including PDF, HTML, man pages, etc., using many available DocBook
+tools and stylesheets.
+Currently DocBook exporter only supports DocBook V5.0.
+@menu
+* DocBook export commands::     How to invoke DocBook export
+* Quoting DocBook code::        Incorporating DocBook code in Org files
+* Recursive sections::          Recursive sections in DocBook
+* Tables in DocBook export::    Tables are exported as HTML tables
+* Images in DocBook export::    How to insert figures into DocBook output
+* Special characters::          How to handle special characters
+@end menu
+@node DocBook export commands, Quoting DocBook code, DocBook export, DocBook export
+@subsection DocBook export commands
+@cindex region, active
+@cindex active region
+@cindex transient-mark-mode
+@table @kbd
+@kindex C-c C-e D
+@item C-c C-e D
+@cindex property EXPORT_FILE_NAME
+Export as DocBook file.  For an Org file, @file{myfile.org}, the DocBook XML
+file will be @file{myfile.xml}.  The file will be overwritten without
+warning.  If there is an active region@footnote{This requires
+@code{transient-mark-mode} to be turned on}, only the region will be
+exported.  If the selected region is a single tree@footnote{To select the
+current subtree, use @kbd{C-c @@}.}, the tree head will become the document
+title.  If the tree head entry has, or inherits, an @code{EXPORT_FILE_NAME}
+property, that name will be used for the export.
+@kindex C-c C-e V
+@item C-c C-e V
+Export as DocBook file, process to PDF, then open the resulting PDF file.
+@vindex org-export-docbook-xslt-proc-command
+@vindex org-export-docbook-xsl-fo-proc-command
+Note that, in order to produce PDF output based on exported DocBook file, you
+need to have XSLT processor and XSL-FO processor software installed on your
+system.  Check variables @code{org-export-docbook-xslt-proc-command} and
+@code{org-export-docbook-xsl-fo-proc-command}.
+@kindex C-c C-e v D
+@item C-c C-e v D
+Export only the visible part of the document.
+@end table
+@node Quoting DocBook code, Recursive sections, DocBook export commands, DocBook export
+@subsection Quoting DocBook code
+You can quote DocBook code in Org files and copy it verbatim into exported
+DocBook file with the following constructs:
+@cindex #+DOCBOOK
+@cindex #+BEGIN_DOCBOOK
+@example
+#+DOCBOOK: Literal DocBook code for export
+@end example
+@noindent or
+@cindex #+BEGIN_DOCBOOK
+@example
+#+BEGIN_DOCBOOK
+All lines between these markers are exported by DocBook exporter
+literally.
+#+END_DOCBOOK
+@end example
+For example, you can use the following lines to include a DocBook warning
+admonition.  As to what this warning says, you should pay attention to the
+document context when quoting DocBook code in Org files.  You may make
+exported DocBook XML files invalid by not quoting DocBook code correctly.
+@example
+#+BEGIN_DOCBOOK
+<warning>
+  <para>You should know what you are doing when quoting DocBook XML code
+  in your Org file.  Invalid DocBook XML file may be generated by
+  DocBook exporter if you are not careful!</para>
+</warning>
+#+END_DOCBOOK
+@end example
+@node Recursive sections, Tables in DocBook export, Quoting DocBook code, DocBook export
+@subsection Recursive sections
+@cindex DocBook recursive sections
+DocBook exporter exports Org files as articles using the @code{article}
+element in DocBook.  Recursive sections, @ie @code{section} elements, are
+used in exported articles.  Top level headlines in Org files are exported as
+top level sections, and lower level headlines are exported as nested
+sections.  The entire structure of Org files will be exported completely, no
+matter how many nested levels of headlines there are.
+Using recursive sections makes it easy to port and reuse exported DocBook
+code in other DocBook document types like @code{book} or @code{set}.
+@node Tables in DocBook export, Images in DocBook export, Recursive sections, DocBook export
+@subsection Tables in DocBook export
+@cindex tables, in DocBook export
+Tables in Org files are exported as HTML tables, which have been supported since
+DocBook V4.3.
+If a table does not have a caption, an informal table is generated using the
+@code{informaltable} element; otherwise, a formal table will be generated
+using the @code{table} element.
+@node Images in DocBook export, Special characters, Tables in DocBook export, DocBook export
+@subsection Images in DocBook export
+@cindex images, inline in DocBook
+@cindex inlining images in DocBook
+Images that are linked to without a description part in the link, like
+@samp{[[file:img.jpg]]} or @samp{[[./img.jpg]]}, will be exported to DocBook
+using @code{mediaobject} elements.  Each @code{mediaobject} element contains
+an @code{imageobject} that wraps an @code{imagedata} element.  If you have
+specified a caption for an image as described in @ref{Markup rules}, a
+@code{caption} element will be added in @code{mediaobject}.  If a label is
+also specified, it will be exported as an @code{xml:id} attribute of the
+@code{mediaobject} element.
+@vindex org-export-docbook-default-image-attributes
+Image attributes supported by the @code{imagedata} element, like @code{align}
+or @code{width}, can be specified in two ways: you can either customize
+variable @code{org-export-docbook-default-image-attributes} or use the
+@code{#+ATTR_DOCBOOK:} line.  Attributes specified in variable
+@code{org-export-docbook-default-image-attributes} are applied to all inline
+images in the Org file to be exported (unless they are overwritten by image
+attributes specified in @code{#+ATTR_DOCBOOK:} lines).
+The @code{#+ATTR_DOCBOOK:} line can be used to specify additional image
+attributes or overwrite default image attributes for individual images.  If
+the same attribute appears in both the @code{#+ATTR_DOCBOOK:} line and
+variable @code{org-export-docbook-default-image-attributes}, the former
+overwrites the latter.  Here is an example about how image attributes can be
+set:
+@cindex #+CAPTION
+@cindex #+LABEL
+@cindex #+ATTR_DOCBOOK
+@example
+#+CAPTION:    The logo of Org mode
+#+LABEL:      unicorn-svg
+#+ATTR_DOCBOOK: scalefit="1" width="100%" depth="100%"
+[[./img/org-mode-unicorn.svg]]
+@end example
+@vindex org-export-docbook-inline-image-extensions
+By default, DocBook exporter recognizes the following image file types:
+@file{jpeg}, @file{jpg}, @file{png}, @file{gif}, and @file{svg}.  You can
+customize variable @code{org-export-docbook-inline-image-extensions} to add
+more types to this list as long as DocBook supports them.
+@node Special characters,  , Images in DocBook export, DocBook export
+@subsection Special characters in DocBook export
+@cindex Special characters in DocBook export
+@vindex org-export-docbook-doctype
+@vindex org-html-entities
+Special characters that are written in @TeX{}-like syntax, such as @code{\alpha},
+@code{\Gamma}, and @code{\Zeta}, are supported by DocBook exporter.  These
+characters are rewritten to XML entities, like @code{&alpha;},
+@code{&Gamma;}, and @code{&Zeta;}, based on the list saved in variable
+@code{org-html-entities}.  As long as the generated DocBook file includes the
+corresponding entities, these special characters are recognized.
+You can customize variable @code{org-export-docbook-doctype} to include the
+entities you need.  For example, you can set variable
+@code{org-export-docbook-doctype} to the following value to recognize all
+special characters included in XHTML entities:
+@example
+"<!DOCTYPE article [
+<!ENTITY % xhtml1-symbol PUBLIC
+\"-//W3C//ENTITIES Symbol for HTML//EN//XML\"
+\"http://www.w3.org/2003/entities/2007/xhtml1-symbol.ent\"
+>
+%xhtml1-symbol;
+]>
+"
+@end example
+@node XOXO export, iCalendar export, DocBook export, Exporting
 @section XOXO export
 @cindex XOXO export
 Org mode contains an exporter that produces XOXO-style output.
 Currently, this exporter only handles the general outline structure and
-does not interpret any additional Org mode features.
+does not interpret any additional Org-mode features.
 @table @kbd
 @kindex C-c C-e x
@@ -8365,22 +9370,27 @@ Export only the visible part of the document.
 @section iCalendar export
 @cindex iCalendar export
-Some people like to use Org mode for keeping track of projects, but still
+@vindex org-icalendar-include-todo
-prefer a standard calendar application for anniversaries and appointments.
+@vindex org-icalendar-use-deadline
-In this case it can be useful to have deadlines and other time-stamped items
+@vindex org-icalendar-use-scheduled
-in Org files show up in the calendar application.  Org mode can export
+@vindex org-icalendar-categories
-calendar information in the standard iCalendar format.  If you also want to
+Some people use Org mode for keeping track of projects, but still prefer a
-have TODO entries included in the export, configure the variable
+standard calendar application for anniversaries and appointments.  In this
-@code{org-icalendar-include-todo}.  iCalendar export will export plain time
+case it can be useful to show deadlines and other time-stamped items in Org
-stamps as VEVENT, and TODO items as VTODO.  It will also create events from
+files in the calendar application.  Org mode can export calendar information
-deadlines that are in non-TODO items.  Deadlines and scheduling dates in TODO
+in the standard iCalendar format.  If you also want to have TODO entries
-items will be used to set the start and due dates for the todo
+included in the export, configure the variable
-entry@footnote{See the variables @code{org-icalendar-use-deadline} and
+@code{org-icalendar-include-todo}.  Plain timestamps are exported as VEVENT,
-@code{org-icalendar-use-scheduled}.}.  As categories, it will use the tags
+and TODO items as VTODO.  It will also create events from deadlines that are
-locally defined in the heading, and the file/tree category@footnote{To add
+in non-TODO items.  Deadlines and scheduling dates in TODO items will be used
-inherited tags or the TODO state, configure the variable
+to set the start and due dates for the TODO entry@footnote{See the variables
-@code{org-icalendar-categories}.}.
+@code{org-icalendar-use-deadline} and @code{org-icalendar-use-scheduled}.}.
+As categories, it will use the tags locally defined in the heading, and the
+file/tree category@footnote{To add inherited tags or the TODO state,
+configure the variable @code{org-icalendar-categories}.}.
+@vindex org-icalendar-store-UID
+@cindex property, ID
 The iCalendar standard requires each entry to have a globally unique
 identifier (UID).  Org creates these identifiers during export.  If you set
 the variable @code{org-icalendar-store-UID}, the UID will be stored in the
@@ -8398,16 +9408,23 @@ Create iCalendar entries for the current file and store them in the same
 directory, using a file extension @file{.ics}.
 @kindex C-c C-e I
 @item C-c C-e I
+@vindex org-agenda-files
 Like @kbd{C-c C-e i}, but do this for all files in
 @code{org-agenda-files}.  For each of these files, a separate iCalendar
 file will be written.
 @kindex C-c C-e c
 @item C-c C-e c
+@vindex org-combined-agenda-icalendar-file
 Create a single large iCalendar file from all files in
 @code{org-agenda-files} and write it to the file given by
 @code{org-combined-agenda-icalendar-file}.
 @end table
+@vindex org-use-property-inheritance
+@vindex org-icalendar-include-body
+@cindex property, SUMMARY
+@cindex property, DESCRIPTION
+@cindex property, LOCATION
 The export will honor SUMMARY, DESCRIPTION and LOCATION@footnote{The LOCATION
 property can be inherited from higher in the hierarchy if you configure
 @code{org-use-property-inheritance} accordingly.} properties if the selected
@@ -8415,37 +9432,33 @@ entries have them.  If not, the summary will be derived from the headline,
 and the description from the body (limited to
 @code{org-icalendar-include-body} characters).
-How this calendar is best read and updated, that depends on the application
+How this calendar is best read and updated, depends on the application
 you are using.  The FAQ covers this issue.
 @node Publishing, Miscellaneous, Exporting, Top
 @chapter Publishing
 @cindex publishing
+@cindex O'Toole, David
-Org includes@footnote{@file{org-publish.el} is not distributed with
+Org includes a publishing management system that allows you to configure
-Emacs 21, if you are still using Emacs 21, you need you need to download
+automatic HTML conversion of @emph{projects} composed of interlinked org
-this file separately.} a publishing management system that allows you to
+files.  You can also configure Org to automatically upload your exported HTML
-configure automatic HTML conversion of @emph{projects} composed of
+pages and related attachments, such as images and source code files, to a web
-interlinked org files.  This system is called @emph{org-publish}.  You can
+server.
-also configure org-publish to automatically upload your exported HTML
-pages and related attachments, such as images and source code files, to
-a web server. Org-publish turns Org into a web-site authoring tool.
-You can also use Org-publish to convert files into La@TeX{}, or even
+You can also use Org to convert files into PDF, or even combine HTML and PDF
-combine HTML and La@TeX{} conversion so that files are available in both
+conversion so that files are available in both formats on the server.
-formats on the server@footnote{Since La@TeX{} files on a server are not
-that helpful, you surely want to perform further conversion on them --
-e.g. convert them to @code{PDF} format.}.
-Org-publish has been contributed to Org by David O'Toole.
+Publishing has been contributed to Org by David O'Toole.
 @menu
 * Configuration::               Defining projects
+* Uploading files::             How to get files up on the server
 * Sample configuration::        Example projects
 * Triggering publication::      Publication commands
 @end menu
-@node Configuration, Sample configuration, Publishing, Publishing
+@node Configuration, Uploading files, Publishing, Publishing
 @section Configuration
 Publishing needs significant configuration to specify files, destination
@@ -8466,48 +9479,48 @@ and many other properties of a project.
 @cindex org-publish-project-alist
 @cindex projects, for publishing
-Org-publish is configured almost entirely through setting the value of
+@vindex org-publish-project-alist
-one variable, called @code{org-publish-project-alist}.
+Publishing is configured almost entirely through setting the value of one
-Each element of the list configures one project, and may be in one of
+variable, called @code{org-publish-project-alist}.  Each element of the list
-the two following forms:
+configures one project, and may be in one of the two following forms:
 @lisp
-("project-name" :property value :property value ...)
+   ("project-name" :property value :property value ...)
 @r{or}
+   ("project-name" :components ("project-name" "project-name" ...))
-("project-name" :components ("project-name" "project-name" ...))
 @end lisp
-In both cases, projects are configured by specifying property values.
+In both cases, projects are configured by specifying property values.  A
-A project defines the set of files that will be published, as well as
+project defines the set of files that will be published, as well as the
-the publishing configuration to use when publishing those files.  When
+publishing configuration to use when publishing those files.  When a project
-a project takes the second form listed above, the individual members
+takes the second form listed above, the individual members of the
-of the ``components'' property are taken to be components of the
+@code{:components} property are taken to be sub-projects, which group
-project, which group together files requiring different publishing
+together files requiring different publishing options.  When you publish such
-options. When you publish such a ``meta-project'' all the components
+a ``meta-project'', all the components will also be published, in the
-will also publish.  The @code{:components} are published in the sequence
+sequence given.
-provided.
 @node Sources and destinations, Selecting files, Project alist, Configuration
 @subsection Sources and destinations for files
 @cindex directories, for publishing
-Most properties are optional, but some should always be set. In
+Most properties are optional, but some should always be set.  In
-particular, org-publish needs to know where to look for source files,
+particular, Org needs to know where to look for source files,
 and where to put published files.
 @multitable @columnfractions 0.3 0.7
 @item @code{:base-directory}
 @tab Directory containing publishing source files
 @item @code{:publishing-directory}
-@tab Directory (possibly remote) where output files will be published.
+@tab Directory where output files will be published.  You can directly
+publish to a webserver using a file name syntax appropriate for
+the Emacs @file{tramp} package.  Or you can publish to a local directory and
+use external tools to upload your website (@pxref{Uploading files}).
 @item @code{:preparation-function}
-@tab Function called before starting the publishing process, for example to
+@tab Function called before starting the publishing process, for example, to
 run @code{make} for updating files to be published.
 @item @code{:completion-function}
-@tab Function called after finishing the publishing process, for example to
+@tab Function called after finishing the publishing process, for example, to
 change permissions of the resulting files.
 @end multitable
 @noindent
@@ -8522,7 +9535,8 @@ properties
 @multitable @columnfractions 0.25 0.75
 @item @code{:base-extension}
 @tab Extension (without the dot!) of source files.  This actually is a
-regular expression.
+regular expression.  Set this to the symbol @code{any} if you want to get all
+files in @code{:base-directory}, even without extension.
 @item @code{:exclude}
 @tab Regular expression to match file names that should not be
@@ -8542,28 +9556,39 @@ Publishing means that a file is copied to the destination directory and
 possibly transformed in the process.  The default transformation is to export
 Org files as HTML files, and this is done by the function
 @code{org-publish-org-to-html} which calls the HTML exporter (@pxref{HTML
-export}). But you also can publish your files in La@TeX{} by using the
+export}).  But you also can publish your content as PDF files using
-function @code{org-publish-org-to-latex} instead, or as PDF files using
+@code{org-publish-org-to-pdf}.  If you want to publish the Org file itself,
-@code{org-publish-org-to-pdf}.  Other files like images only need to be
+but with @i{archived}, @i{commented}, and @i{tag-excluded} trees removed, use
-copied to the publishing destination. For non-Org files, you need to provide
+@code{org-publish-org-to-org} and set the parameters @code{:plain-source}
-your own publishing function:
+and/or @code{:htmlized-source}.  This will produce @file{file.org} and
+@file{file.org.html} in the publishing
+directory@footnote{@file{file-source.org} and @file{file-source.org.html} if
+source and publishing directories are equal.  Note that with this kind of
+setup, you need to add @code{:exclude "-source\\.org"} to the project
+definition in @code{org-publish-project-alist} to avoid that the published
+source files will be considered as new org files the next time the project is
+published.}.  Other files like images only
+need to be copied to the publishing destination, for this you may use
+@code{org-publish-attachment}.  For non-Org files, you always need to
+specify the publishing function:
 @multitable @columnfractions 0.3 0.7
 @item @code{:publishing-function}
 @tab Function executing the publication of a file.  This may also be a
 list of functions, which will all be called in turn.
+@item @code{:plain-source}
+@tab Non-nil means, publish plain source.
+@item @code{:htmlized-source}
+@tab Non-nil means, publish htmlized source.
 @end multitable
-The function must accept two arguments: a property list containing at
+The function must accept two arguments: a property list containing at least a
-least a @code{:publishing-directory} property, and the name of the file
+@code{:publishing-directory} property, and the name of the file to be
-to be published.  It should take the specified file, make the necessary
+published.  It should take the specified file, make the necessary
 transformation (if any) and place the result into the destination folder.
-You can write your own publishing function, but @code{org-publish}
-provides one for attachments (files that only need to be copied):
-@code{org-publish-attachment}.
 @node Publishing options, Publishing links, Publishing action, Configuration
-@subsection Options for the HTML/LaTeX exporters
+@subsection Options for the HTML/La@TeX{} exporters
 @cindex options, for publishing
 The property list can be used to set many export options for the HTML
@@ -8572,6 +9597,52 @@ variables in Org.  The table below lists these properties along
 with the variable they belong to.  See the documentation string for the
 respective variable for details.
+@vindex org-export-html-link-up
+@vindex org-export-html-link-home
+@vindex org-export-default-language
+@vindex org-display-custom-times
+@vindex org-export-headline-levels
+@vindex org-export-with-section-numbers
+@vindex org-export-section-number-format
+@vindex org-export-with-toc
+@vindex org-export-preserve-breaks
+@vindex org-export-with-archived-trees
+@vindex org-export-with-emphasize
+@vindex org-export-with-sub-superscripts
+@vindex org-export-with-special-strings
+@vindex org-export-with-footnotes
+@vindex org-export-with-drawers
+@vindex org-export-with-tags
+@vindex org-export-with-todo-keywords
+@vindex org-export-with-priority
+@vindex org-export-with-TeX-macros
+@vindex org-export-with-LaTeX-fragments
+@vindex org-export-skip-text-before-1st-heading
+@vindex org-export-with-fixed-width
+@vindex org-export-with-timestamps
+@vindex org-export-author-info
+@vindex org-export-creator-info
+@vindex org-export-with-tables
+@vindex org-export-highlight-first-table-line
+@vindex org-export-html-style-include-default
+@vindex org-export-html-style
+@vindex org-export-html-style-extra
+@vindex org-export-html-link-org-files-as-html
+@vindex org-export-html-inline-images
+@vindex org-export-html-extension
+@vindex org-export-html-table-tag
+@vindex org-export-html-expand
+@vindex org-export-html-with-timestamp
+@vindex org-export-publishing-directory
+@vindex org-export-html-preamble
+@vindex org-export-html-postamble
+@vindex org-export-html-auto-preamble
+@vindex org-export-html-auto-postamble
+@vindex user-full-name
+@vindex user-mail-address
+@vindex org-export-select-tags
+@vindex org-export-exclude-tags
 @multitable @columnfractions 0.32 0.68
 @item @code{:link-up}               @tab @code{org-export-html-link-up}
 @item @code{:link-home}             @tab @code{org-export-html-link-home}
@@ -8606,6 +9677,7 @@ respective variable for details.
 @item @code{:convert-org-links}     @tab @code{org-export-html-link-org-files-as-html}
 @item @code{:inline-images}         @tab @code{org-export-html-inline-images}
 @item @code{:html-extension}        @tab @code{org-export-html-extension}
+@item @code{:xml-declaration}       @tab @code{org-export-html-xml-declaration}
 @item @code{:html-table-tag}        @tab @code{org-export-html-table-tag}
 @item @code{:expand-quoted-html}    @tab @code{org-export-html-expand}
 @item @code{:timestamp}             @tab @code{org-export-html-with-timestamp}
@@ -8615,18 +9687,18 @@ respective variable for details.
 @item @code{:auto-preamble}         @tab @code{org-export-html-auto-preamble}
 @item @code{:auto-postamble}        @tab @code{org-export-html-auto-postamble}
 @item @code{:author}                @tab @code{user-full-name}
-@item @code{:email}                 @tab @code{user-mail-address}
+@item @code{:email}                 @tab @code{user-mail-address} : @code{addr;addr;..}
 @item @code{:select-tags}           @tab @code{org-export-select-tags}
 @item @code{:exclude-tags}          @tab @code{org-export-exclude-tags}
+@item @code{:latex-image-options}   @tab @code{org-export-latex-image-default-option}
 @end multitable
-If you use several email addresses, separate them by a semi-column.
 Most of the @code{org-export-with-*} variables have the same effect in
 both HTML and La@TeX{} exporters, except for @code{:TeX-macros} and
 @code{:LaTeX-fragments}, respectively @code{nil} and @code{t} in the
 La@TeX{} export.
+@vindex org-publish-project-alist
 When a property is given a value in @code{org-publish-project-alist},
 its setting overrides the value of the corresponding user variable (if
 any) during publishing.  Options set within a file (@pxref{Export
@@ -8638,17 +9710,20 @@ options}), however, override everything.
 To create a link from one Org file to another, you would use
 something like @samp{[[file:foo.org][The foo]]} or simply
-@samp{file:foo.org.} (@pxref{Hyperlinks}).  Upon publishing this link
+@samp{file:foo.org.} (@pxref{Hyperlinks}).  When published, this link
 becomes a link to @file{foo.html}.  In this way, you can interlink the
 pages of your "org web" project and the links will work as expected when
-you publish them to HTML.
+you publish them to HTML.  If you also publish the Org source file and want
+to link to that, use an @code{http:} link instead of a @code{file:} link,
+because @code{file:} links are converted to link to the corresponding
+@file{html} file.
-You may also link to related files, such as images. Provided you are
+You may also link to related files, such as images. Provided you are careful
-careful with relative pathnames, and provided you have also configured
+with relative file names, and provided you have also configured Org to upload
-@code{org-publish} to upload the related files, these links will work
+the related files, these links will work too. See @ref{Complex example}, for
-too. See @ref{Complex example} for an example of this usage.
+an example of this usage.
-Sometime an Org file to be published may contain links that are
+Sometimes an Org file to be published may contain links that are
 only valid in your production environment, but not in the publishing
 location.  In this case, use the property
@@ -8671,16 +9746,16 @@ file is part of any project in @code{org-publish-project-alist}.
 @cindex index, of published pages
 The following properties may be used to control publishing of an
-index of files or summary page for a given project.
+index of files or a summary page for a given project.
 @multitable @columnfractions 0.25 0.75
 @item @code{:auto-index}
-@tab When non-nil, publish an index during org-publish-current-project or
+@tab When non-nil, publish an index during @code{org-publish-current-project}
-org-publish-all.
+or @code{org-publish-all}.
 @item @code{:index-filename}
-@tab Filename for output of index. Defaults to @file{index.org} (which
+@tab Filename for output of index. Defaults to @file{sitemap.org} (which
-becomes @file{index.html}).
+becomes @file{sitemap.html}).
 @item @code{:index-title}
 @tab Title of index page. Defaults to name of file.
@@ -8691,7 +9766,40 @@ Defaults to @code{org-publish-org-index}, which generates a plain list
 of links to all files in the project.
 @end multitable
-@node Sample configuration, Triggering publication, Configuration, Publishing
+@node Uploading files, Sample configuration, Configuration, Publishing
+@section Uploading files
+@cindex rsync
+@cindex unison
+For those people already utilizing third party sync tools such as
+@command{rsync} or @command{unison}, it might be preferable not to use the built in
+@i{remote} publishing facilities of Org mode which rely heavily on
+Tramp.  Tramp, while very useful and powerful, tends not to be
+so efficient for multiple file transfer and has been known to cause problems
+under heavy usage.
+Specialized synchronization utilities offer several advantages.  In addition
+to timestamp comparison, they also do content and permissions/attribute
+checks.  For this reason you might prefer to publish your web to a local
+directory (possibly even @i{in place} with your Org files) and then use
+@file{unison} or @file{rsync} to do the synchronization with the remote host.
+Since Unison (for example) can be configured as to which files to transfer to
+a certain remote destination, it can greatly simplify the project publishing
+definition.  Simply keep all files in the correct location, process your Org
+files with @code{org-publish} and let the synchronization tool do the rest.
+You do not need, in this scenario, to include attachments such as @file{jpg},
+@file{css} or @file{gif} files in the project definition since the 3rd party
+tool syncs them.
+Publishing to a local directory is also much faster than to a remote one, so
+that you can afford more easily to republish entire projects.  If you set
+@code{org-publish-use-timestamps-flag} to @code{nil}, you gain the main
+benefit of re-including any changed external files such as source example
+files you might include with @code{#+INCLUDE}.  The timestamp mechanism in
+Org is not smart enough to detect if included files have been modified.
+@node Sample configuration, Triggering publication, Uploading files, Publishing
 @section Sample configuration
 Below we provide two example configurations.  The first one is a simple
@@ -8718,20 +9826,20 @@ directory on the local machine.
         :table-of-contents nil
         :style "<link rel=\"stylesheet\"
                href=\"../other/mystyle.css\"
-                type=\"text/css\">")))
+                type=\"text/css\"/>")))
 @end lisp
 @node Complex example,  , Simple example, Sample configuration
 @subsection Example: complex publishing configuration
 This more complicated example publishes an entire website, including
-org files converted to HTML, image files, emacs lisp source code, and
+Org files converted to HTML, image files, Emacs Lisp source code, and
-style sheets. The publishing-directory is remote and private files are
+style sheets. The publishing directory is remote and private files are
 excluded.
 To ensure that links are preserved, care should be taken to replicate
 your directory structure on the web server, and to use relative file
-paths. For example, if your org files are kept in @file{~/org} and your
+paths. For example, if your Org files are kept in @file{~/org} and your
 publishable images in @file{~/images}, you'd link to an image with
 @c
 @example
@@ -8754,7 +9862,7 @@ right place on the web server, and publishing images to it.
          :section-numbers nil
          :table-of-contents nil
          :style "<link rel=\"stylesheet\"
-                  href=\"../other/mystyle.css\" type=\"text/css\">"
+                  href=\"../other/mystyle.css\" type=\"text/css\"/>"
          :auto-preamble t
          :auto-postamble nil)
@@ -8775,25 +9883,32 @@ right place on the web server, and publishing images to it.
 @node Triggering publication,  , Sample configuration, Publishing
 @section Triggering publication
-Once org-publish is properly configured, you can publish with the
+Once properly configured, Org can publish with the following commands:
-following functions:
 @table @kbd
+@kindex C-c C-e C
 @item C-c C-e C
 Prompt for a specific project and publish all files that belong to it.
+@kindex C-c C-e P
 @item C-c C-e P
 Publish the project containing the current file.
+@kindex C-c C-e F
 @item C-c C-e F
 Publish only the current file.
-@item C-c C-e A
+@kindex C-c C-e E
-Publish all projects.
+@item C-c C-e E
+Publish every project.
 @end table
-Org uses timestamps to track when a file has changed. The above
+@vindex org-publish-use-timestamps-flag
-functions normally only publish changed files. You can override this and
+Org uses timestamps to track when a file has changed. The above functions
-force publishing of all files by giving a prefix argument.
+normally only publish changed files. You can override this and force
+publishing of all files by giving a prefix argument to any of the commands
+above, or by customizing the variable @code{org-publish-use-timestamps-flag}.
+This may be necessary in particular if files include other files via
+@code{#+SETUPFILE:} or @code{#+INCLUDE:}.
-@node Miscellaneous, Extensions, Publishing, Top
+@node Miscellaneous, Hacking, Publishing, Top
 @chapter Miscellaneous
 @menu
@@ -8804,9 +9919,9 @@ force publishing of all files by giving a prefix argument.
 * Clean view::                  Getting rid of leading stars in the outline
 * TTY keys::                    Using Org on a tty
 * Interaction::                 Other Emacs packages
-* Bugs::                        Things which do not work perfectly
 @end menu
 @node Completion, Customization, Miscellaneous, Miscellaneous
 @section Completion
 @cindex completion, of @TeX{} symbols
@@ -8857,7 +9972,7 @@ 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.
+@ie valid keys for this line.
 @item
 Elsewhere, complete dictionary words using Ispell.
 @end itemize
@@ -8892,6 +10007,7 @@ buffer, press @kbd{C-c C-c} with the cursor still in the line to
 activate the changes immediately.  Otherwise they become effective only
 when the file is visited again in a new Emacs session.
+@vindex org-archive-location
 @table @kbd
 @item #+ARCHIVE: %s_done::
 This line sets the archive location for the agenda file.  It applies for
@@ -8903,10 +10019,13 @@ This line sets the category for the agenda file.  The category applies
 for all subsequent lines until the next @samp{#+CATEGORY} line, or the
 end of the file.  The first such line also applies to any entries before it.
 @item #+COLUMNS: %25ITEM .....
+@cindex property, COLUMNS
 Set the default format for columns view.  This format applies when
-columns view is invoked in location where no @code{COLUMNS} property
+columns view is invoked in locations where no @code{COLUMNS} property
 applies.
 @item #+CONSTANTS: name1=value1 ...
+@vindex org-table-formula-constants
+@vindex org-table-formula
 Set file-local values for constants to be used in table formulas.  This
 line set the local variable @code{org-table-formula-constants-local}.
 The global version of this variable is
@@ -8915,33 +10034,43 @@ The global version of this variable is
 Set tags that can be inherited by any entry in the file, including the
 top-level entries.
 @item #+DRAWERS: NAME1 .....
+@vindex org-drawers
 Set the file-local set of drawers.  The corresponding global variable is
 @code{org-drawers}.
 @item #+LINK:  linkword replace
+@vindex org-link-abbrev-alist
 These lines (several are allowed) specify link abbreviations.
 @xref{Link abbreviations}.  The corresponding variable is
 @code{org-link-abbrev-alist}.
 @item #+PRIORITIES: highest lowest default
+@vindex org-highest-priority
+@vindex org-lowest-priority
+@vindex org-default-priority
 This line sets the limits and the default for the priorities.  All three
 must be either letters A-Z or numbers 0-9.  The highest priority must
 have a lower ASCII number that the lowest priority.
 @item #+PROPERTY: Property_Name Value
 This line sets a default inheritance value for entries in the current
 buffer, most useful for specifying the allowed values of a property.
+@cindex #+SETUPFILE
 @item #+SETUPFILE: file
 This line defines a file that holds more in-buffer setup.  Normally this is
 entirely ignored.  Only when the buffer is parsed for option-setting lines
-(i.e. when starting Org mode for a file, when pressing @kbd{C-c C-c} in a
+(@ie when starting Org mode for a file, when pressing @kbd{C-c C-c} in a
 settings line, or when exporting), then the contents of this file are parsed
 as if they had been included in the buffer.  In particular, the file can be
 any other Org mode file with internal setup.  You can visit the file the
 cursor is in the line with @kbd{C-c '}.
 @item #+STARTUP:
+@cindex #+STARTUP:
 This line sets options to be used at startup of Org mode, when an
-Org file is being visited.  The first set of options deals with the
+Org file is being visited.
-initial visibility of the outline tree.  The corresponding variable for
-global default settings is @code{org-startup-folded}, with a default
+The first set of options deals with the initial visibility of the outline
-value @code{t}, which means @code{overview}.
+tree.  The corresponding variable for global default settings is
+@code{org-startup-folded}, with a default value @code{t}, which means
+@code{overview}.
+@vindex org-startup-folded
 @cindex @code{overview}, STARTUP keyword
 @cindex @code{content}, STARTUP keyword
 @cindex @code{showall}, STARTUP keyword
@@ -8950,6 +10079,18 @@ overview   @r{top-level headlines only}
 content    @r{all headlines}
 showall    @r{no folding at all, show everything}
 @end example
+@vindex org-startup-indented
+@cindex @code{indent}, STARTUP keyword
+@cindex @code{noindent}, STARTUP keyword
+Dynamic virtual indentation is controlled by the variable
+@code{org-startup-indented}@footnote{Emacs 23 and Org-mode 6.29 are required}
+@example
+indent     @r{start with @code{org-indent-mode} turned on}
+noindent   @r{start with @code{org-indent-mode} turned off}
+@end example
+@vindex org-startup-align-all-tables
 Then there are options for aligning tables upon visiting a file.  This
 is useful in files containing narrowed table columns.  The corresponding
 variable is @code{org-startup-align-all-tables}, with a default value
@@ -8960,9 +10101,12 @@ variable is @code{org-startup-align-all-tables}, with a default value
 align      @r{align all tables}
 noalign    @r{don't align tables on startup}
 @end example
-Logging closing and reinstating TODO items, and clock intervals
+@vindex org-log-done
-(variables @code{org-log-done}, @code{org-log-note-clock-out}, and
+@vindex org-log-note-clock-out
-@code{org-log-repeat}) can be configured using these options.
+@vindex org-log-repeat
+Logging the closing and reopening of TODO items and clock intervals can be
+configured using these options (see variables @code{org-log-done},
+@code{org-log-note-clock-out} and @code{org-log-repeat})
 @cindex @code{logdone}, STARTUP keyword
 @cindex @code{lognotedone}, STARTUP keyword
 @cindex @code{nologdone}, STARTUP keyword
@@ -8981,6 +10125,8 @@ nologrepeat        @r{do not record when reinstating repeating item}
 lognoteclock-out   @r{record a note when clocking out}
 nolognoteclock-out @r{don't record a note when clocking out}
 @end example
+@vindex org-hide-leading-stars
+@vindex org-odd-levels-only
 Here are the options for hiding leading stars in outline headings, and for
 indenting outlines.  The corresponding variables are
 @code{org-hide-leading-stars} and @code{org-odd-levels-only}, both with a
@@ -8997,13 +10143,16 @@ noindent   @r{no virtual indentation according to outline level}
 odd        @r{allow only odd outline levels (1,3,...)}
 oddeven    @r{allow all outline levels}
 @end example
-To turn on custom format overlays over time stamps (variables
+@vindex org-put-time-stamp-overlays
+@vindex org-time-stamp-overlay-formats
+To turn on custom format overlays over timestamps (variables
 @code{org-put-time-stamp-overlays} and
 @code{org-time-stamp-overlay-formats}), use
 @cindex @code{customtime}, STARTUP keyword
 @example
 customtime @r{overlay custom time format}
 @end example
+@vindex constants-unit-system
 The following options influence the table spreadsheet (variable
 @code{constants-unit-system}).
 @cindex @code{constcgs}, STARTUP keyword
@@ -9012,16 +10161,21 @@ The following options influence the table spreadsheet (variable
 constcgs   @r{@file{constants.el} should use the c-g-s unit system}
 constSI    @r{@file{constants.el} should use the SI unit system}
 @end example
+@vindex org-footnote-define-inline
+@vindex org-footnote-auto-label
+@vindex org-footnote-auto-adjust
 To influence footnote settings, use the following keywords.  The
-corresponding variables are @code{org-footnote-define-inline} and
+corresponding variables are @code{org-footnote-define-inline},
-@code{org-footnote-auto-label}.
+@code{org-footnote-auto-label}, and @code{org-footnote-auto-adjust}.
 @cindex @code{fninline}, STARTUP keyword
-@cindex @code{fnnoinline}, STARTUP keyword
+@cindex @code{nofninline}, STARTUP keyword
 @cindex @code{fnlocal}, STARTUP keyword
 @cindex @code{fnprompt}, STARTUP keyword
 @cindex @code{fnauto}, STARTUP keyword
 @cindex @code{fnconfirm}, STARTUP keyword
 @cindex @code{fnplain}, STARTUP keyword
+@cindex @code{fnadjust}, STARTUP keyword
+@cindex @code{nofnadjust}, STARTUP keyword
 @example
 fninline    @r{define footnotes inline}
 fnnoinline  @r{define footnotes in separate section}
@@ -9030,20 +10184,36 @@ fnprompt    @r{prompt for footnote labels}
 fnauto      @r{create [fn:1]-like labels automatically (default)}
 fnconfirm   @r{offer automatic label for editing or confirmation}
 fnplain     @r{create [1]-like labels automatically}
+fnadjust    @r{automatically renumber and sort footnotes}
+nofnadjust  @r{do not renumber and sort automatically}
+@end example
+@cindex org-hide-block-startup
+To hide blocks on startup, use these keywords. The corresponding variable is
+@code{org-hide-block-startup}.
+@cindex @code{hideblocks}, STARTUP keyword
+@cindex @code{nohideblocks}, STARTUP keyword
+@example
+hideblocks   @r{Hide all begin/end blocks on startup}
+nohideblocks @r{Do not hide blocks on startup}
 @end example
 @item #+TAGS:  TAG1(c1) TAG2(c2)
+@vindex org-tag-alist
 These lines (several such lines are allowed) specify the valid tags in
 this file, and (potentially) the corresponding @emph{fast tag selection}
 keys.  The corresponding variable is @code{org-tag-alist}.
 @item #+TBLFM:
 This line contains the formulas for the table directly above the line.
-@item #+TITLE:, #+AUTHOR:, #+EMAIL:, #+LANGUAGE:, #+TEXT:, #+OPTIONS, #+DATE:
+@item #+TITLE:, #+AUTHOR:, #+EMAIL:, #+LANGUAGE:, #+TEXT:, #+DATE:,
+@itemx #+OPTIONS:, #+BIND:
+@itemx #+DESCRIPTION:, #+KEYWORDS:
+@itemx #+LATEX_HEADER:, #+STYLE:, #+LINK_UP:, #+LINK_HOME:,
+@itemx #+EXPORT_SELECT_TAGS:, #+EXPORT_EXCLUDE_TAGS:
 These lines provide settings for exporting files.  For more details see
 @ref{Export options}.
-@item #+SEQ_TODO:   #+TYP_TODO:
+@item #+TODO:    #+SEQ_TODO:   #+TYP_TODO:
+@vindex org-todo-keywords
 These lines set the TODO keywords and their interpretation in the
-current file.  The corresponding variables are @code{org-todo-keywords}
+current file.  The corresponding variable is @code{org-todo-keywords}.
-and @code{org-todo-interpretation}.
 @end table
 @node The very busy C-c C-c key, Clean view, In-buffer settings, Miscellaneous
@@ -9054,8 +10224,8 @@ and @code{org-todo-interpretation}.
 The key @kbd{C-c C-c} has many purposes in Org, which are all
 mentioned scattered throughout this manual.  One specific function of
 this key is to add @emph{tags} to a headline (@pxref{Tags}).  In many
-other circumstances it means something like @emph{Hey Org, look
+other circumstances it means something like @emph{``Hey Org, look
-here and update according to what you see here}.  Here is a summary of
+here and update according to what you see here''}.  Here is a summary of
 what this means in different contexts.
 @itemize @minus
@@ -9076,7 +10246,7 @@ the entire table.
 If the cursor is inside a table created by the @file{table.el} package,
 activate that table.
 @item
-If the current buffer is a remember buffer, close the note and file it.
+If the current buffer is a Remember buffer, close the note and file it.
 With a prefix argument, file it, without further interaction, to the
 default location.
 @item
@@ -9095,7 +10265,7 @@ of the checkbox.
 If the cursor is on a numbered item in a plain list, renumber the
 ordered list.
 @item
-If the cursor is on the @code{#+BEGIN} line of a dynamical block, the
+If the cursor is on the @code{#+BEGIN} line of a dynamic block, the
 block is updated.
 @end itemize
@@ -9106,13 +10276,11 @@ block is updated.
 @cindex odd-levels-only outlines
 @cindex clean outline view
-Some people find it noisy and distracting that the Org headlines are starting
+Some people find it noisy and distracting that the Org headlines start with a
-with a potentially large number of stars, and that text below the headlines
+potentially large number of stars, and that text below the headlines is not
-is not indented.  This is not really a problem when you are writing a book
+indented.  While this is no problem when writing a book where the outline
-where the outline headings are really section headlines.  However, in a more
+headings are really section headlines, in a more list-oriented outline,
-list-oriented outline, it is clear that an indented structure is a lot
+indented structure is a lot cleaner:
-cleaner, as can be seen by comparing the two columns in the following
-example:
 @example
 @group
@@ -9127,8 +10295,28 @@ more text                        |          more text
 @end example
 @noindent
-It is non-trivial to make such a look work in Emacs, but Org contains three
+If you are using Emacs 23 and at least version 6.29 of Org, this kind of view
-separate features that, combined, achieve just that.
+can be achieved dynamically at display time using @code{org-indent-mode}.  In
+this minor mode, all lines are prefixed for display with the necessary amount
+of space.  Also headlines are prefixed with additional stars, so that the
+amount of indentation shifts by two@footnote{See the variable
+@code{org-indent-indentation-per-level}.}  spaces per level.  All headline
+stars but the last one are made invisible using the @code{org-hide}
+face@footnote{Turning on @code{org-indent-mode} sets
+@code{org-hide-leading-stars} to @code{t} and @code{org-adapt-indentation} to
+@code{nil}.} - see below under @samp{2.} for more information on how this
+works.  You can turn on @code{org-indent-mode} for all files by customizing
+the variable @code{org-startup-indented}, or you can turn it on for
+individual files using
+@example
+#+STARTUP: indent
+@end example
+If you want a similar effect in earlier version of Emacs and/or Org, or if
+you want the indentation to be hard space characters so that the plain text
+file looks as similar as possible to the Emacs display, Org supports you in
+the following way:
 @enumerate
 @item
@@ -9141,15 +10329,13 @@ with the headline, like
    more text, now indented
 @end example
-A good way to get this indentation is by hand, and Org supports this with
+@vindex org-adapt-indentation
-paragraph filling, line wrapping, and structure editing@footnote{See also the
+Org supports this with paragraph filling, line wrapping, and structure
-variable @code{org-adapt-indentation}.} preserving or adapting the
+editing@footnote{See also the variable @code{org-adapt-indentation}.},
-indentation appropriate.  A different approach would be to have a way to
+preserving or adapting the indentation as appropriate.
-automatically indent lines according to outline structure by adding overlays
-or text properties.  But I have not yet found a robust and efficient way to
-do this in large files.
 @item
+@vindex org-hide-leading-stars
 @emph{Hiding leading stars}@* You can modify the display in such a way that
 all leading stars become invisible.  To do this in a global way, configure
 the variable @code{org-hide-leading-stars} or change this on a per-file basis
@@ -9157,11 +10343,9 @@ with
 @example
 #+STARTUP: hidestars
+#+STARTUP: showstars
 @end example
-@noindent
-Note that the opposite behavior is selected with @code{showstars}.
 With hidden stars, the tree becomes:
 @example
@@ -9174,22 +10358,24 @@ With hidden stars, the tree becomes:
 @end example
 @noindent
-Note that the leading stars are not truly replaced by whitespace, they
+@vindex org-hide @r{(face)}
-are only fontified with the face @code{org-hide} that uses the
+The leading stars are not truly replaced by whitespace, they are only
-background color as font color.  If you are not using either white or
+fontified with the face @code{org-hide} that uses the background color as
-black background, you may have to customize this face to get the wanted
+font color.  If you are not using either white or black background, you may
-effect.  Another possibility is to set this font such that the extra
+have to customize this face to get the wanted effect.  Another possibility is
-stars are @i{almost} invisible, for example using the color
+to set this font such that the extra stars are @i{almost} invisible, for
-@code{grey90} on a white background.
+example using the color @code{grey90} on a white background.
 @item
+@vindex org-odd-levels-only
 Things become cleaner still if you skip all the even levels and use only odd
 levels 1, 3, 5..., effectively adding two stars to go from one outline level
-to the next.  In this way we get the outline view shown at the beginning of
+to the next@footnote{When you need to specify a level for a property search
-this section.  In order to make the structure editing and export commands
+or refile targets, @samp{LEVEL=2} will correspond to 3 stars, etc@.}.  In this
-handle this convention correctly, configure the variable
+way we get the outline view shown at the beginning of this section.  In order
-@code{org-odd-levels-only}, or set this on a per-file basis with one of the
+to make the structure editing and export commands handle this convention
-following lines:
+correctly, configure the variable @code{org-odd-levels-only}, or set this on
+a per-file basis with one of the following lines:
 @example
 #+STARTUP: odd
@@ -9206,7 +10392,7 @@ org-convert-to-oddeven-levels}.
 @section Using Org on a tty
 @cindex tty key bindings
-Because Org contains a large number of commands, by default much of
+Because Org contains a large number of commands, by default many of
 Org's core commands are bound to keys that are generally not
 accessible on a tty, such as the cursor keys (@key{left}, @key{right},
 @key{up}, @key{down}), @key{TAB} and @key{RET}, in particular when used
@@ -9214,8 +10400,8 @@ together with modifiers like @key{Meta} and/or @key{Shift}.  To access
 these commands on a tty when special keys are unavailable, the following
 alternative bindings can be used.  The tty bindings below will likely be
 more cumbersome; you may find for some of the bindings below that a
-customized work-around suits you better.  For example, changing a time
+customized workaround suits you better.  For example, changing a timestamp
-stamp is really only fun with @kbd{S-@key{cursor}} keys, whereas on a
+is really only fun with @kbd{S-@key{cursor}} keys, whereas on a
 tty you would rather use @kbd{C-c .} to re-insert the timestamp.
 @multitable @columnfractions 0.15 0.2 0.2
@@ -9223,7 +10409,7 @@ tty you would rather use @kbd{C-c .} to re-insert the timestamp.
 @item @kbd{S-@key{TAB}}     @tab @kbd{C-u @key{TAB}}       @tab
 @item @kbd{M-@key{left}}    @tab @kbd{C-c C-x l}           @tab @kbd{@key{Esc} @key{left}}
 @item @kbd{M-S-@key{left}}  @tab @kbd{C-c C-x L}           @tab
-@item @kbd{M-@key{right}}   @tab @kbd{C-c C-x i}           @tab @kbd{@key{Esc} @key{right}}
+@item @kbd{M-@key{right}}   @tab @kbd{C-c C-x r}           @tab @kbd{@key{Esc} @key{right}}
 @item @kbd{M-S-@key{right}} @tab @kbd{C-c C-x R}           @tab
 @item @kbd{M-@key{up}}      @tab @kbd{C-c C-x u}           @tab @kbd{@key{Esc} @key{up}}
 @item @kbd{M-S-@key{up}}    @tab @kbd{C-c C-x U}           @tab
@@ -9240,7 +10426,8 @@ tty you would rather use @kbd{C-c .} to re-insert the timestamp.
 @item @kbd{C-S-@key{right}} @tab @kbd{C-c C-x @key{right}} @tab
 @end multitable
-@node Interaction, Bugs, TTY keys, Miscellaneous
+@node Interaction,  , TTY keys, Miscellaneous
 @section Interaction with other packages
 @cindex packages, interaction with other
 Org lives in the world of GNU Emacs and interacts in various ways
@@ -9256,50 +10443,57 @@ with other code out there.
 @table @asis
 @cindex @file{calc.el}
+@cindex Gillespie, Dave
 @item @file{calc.el} by Dave Gillespie
 Org uses the Calc package for implementing spreadsheet
 functionality in its tables (@pxref{The spreadsheet}).  Org
 checks for the availability of Calc by looking for the function
-@code{calc-eval} which should be autoloaded in your setup if Calc has
+@code{calc-eval} which will have been autoloaded during setup if Calc has
 been installed properly.  As of Emacs 22, Calc is part of the Emacs
 distribution.  Another possibility for interaction between the two
 packages is using Calc for embedded calculations. @xref{Embedded Mode,
 , Embedded Mode, Calc, GNU Emacs Calc Manual}.
-@cindex @file{constants.el}
 @item @file{constants.el} by Carsten Dominik
+@cindex @file{constants.el}
+@cindex Dominik, Carsten
+@vindex org-table-formula-constants
 In a table formula (@pxref{The spreadsheet}), it is possible to use
 names for natural constants or units.  Instead of defining your own
 constants in the variable @code{org-table-formula-constants}, install
 the @file{constants} package which defines a large number of constants
 and units, and lets you use unit prefixes like @samp{M} for
-@samp{Mega} etc.  You will need version 2.0 of this package, available
+@samp{Mega}, etc@.  You will need version 2.0 of this package, available
 at @url{http://www.astro.uva.nl/~dominik/Tools}. Org checks for
 the function @code{constants-get}, which has to be autoloaded in your
 setup.  See the installation instructions in the file
 @file{constants.el}.
 @item @file{cdlatex.el} by Carsten Dominik
 @cindex @file{cdlatex.el}
-Org mode can make use of the CDLaTeX package to efficiently enter
+@cindex Dominik, Carsten
-La@TeX{} fragments into Org files. See @ref{CDLaTeX mode}.
+Org mode can make use of the CDLa@TeX{} package to efficiently enter
+La@TeX{} fragments into Org files.  See @ref{CDLaTeX mode}.
 @item @file{imenu.el} by Ake Stenhoff and Lars Lindberg
 @cindex @file{imenu.el}
 Imenu allows menu access to an index of items in a file.  Org mode
-supports Imenu - all you need to do to get the index is the following:
+supports Imenu---all you need to do to get the index is the following:
 @lisp
 (add-hook 'org-mode-hook
          (lambda () (imenu-add-to-menubar "Imenu")))
 @end lisp
-By default the index is two levels deep - you can modify the depth using
+@vindex org-imenu-depth
+By default the index is two levels deep---you can modify the depth using
 the option @code{org-imenu-depth}.
 @item @file{remember.el} by John Wiegley
 @cindex @file{remember.el}
+@cindex Wiegley, John
 Org cooperates with remember, see @ref{Remember}.
 @file{Remember.el} is not part of Emacs, find it on the web.
 @item @file{speedbar.el} by Eric M. Ludlam
 @cindex @file{speedbar.el}
+@cindex Ludlam, Eric M.
 Speedbar is a package that creates a special frame displaying files and
 index items in files.  Org mode supports Speedbar and allows you to
-drill into Org files directly from the Speedbar.  It also allows to
+drill into Org files directly from the Speedbar.  It also allows you to
 restrict the scope of agenda commands to a file or a subtree by using
 the command @kbd{<} in the Speedbar frame.
 @cindex @file{table.el}
@@ -9307,6 +10501,7 @@ the command @kbd{<} in the Speedbar frame.
 @kindex C-c C-c
 @cindex table editor, @file{table.el}
 @cindex @file{table.el}
+@cindex Ota, Takaaki
 Complex ASCII tables with automatic line wrapping, column- and
 row-spanning, and alignment can be created using the Emacs table
@@ -9325,17 +10520,18 @@ table.el table.
 @c
 @kindex C-c ~
 @item C-c ~
-Insert a table.el table.  If there is already a table at point, this
+Insert a @file{table.el} table.  If there is already a table at point, this
-command converts it between the table.el format and the Org mode
+command converts it between the @file{table.el} format and the Org-mode
 format.  See the documentation string of the command
 @code{org-convert-table} for the restrictions under which this is
 possible.
 @end table
 @file{table.el} is part of Emacs 22.
-@cindex @file{footnote.el}
 @item @file{footnote.el} by Steven L. Baur
+@cindex @file{footnote.el}
+@cindex Baur, Steven L.
 Org mode recognizes numerical footnotes as provided by this package.
-However, Org-mode also has its own footnote support (@pxref{Footnotes}),
+However, Org mode also has its own footnote support (@pxref{Footnotes}),
 which makes using @file{footnote.el} unnecessary.
 @end table
@@ -9345,26 +10541,29 @@ which makes using @file{footnote.el} unnecessary.
 @table @asis
 @cindex @code{shift-selection-mode}
+@vindex org-support-shift-select
 In Emacs 23, @code{shift-selection-mode} is on by default, meaning that
 cursor motions combined with the shift key should start or enlarge regions.
 This conflicts with the use of @kbd{S-@key{cursor}} commands in Org to change
 timestamps, TODO keywords, priorities, and item bullet types if the cursor is
 at such a location.  By default, @kbd{S-@key{cursor}} commands outside
 special contexts don't do anything, but you can customize the variable
-@code{org-support-shift-select}.  Org-mode then tries to accommodate shift
+@code{org-support-shift-select}.  Org mode then tries to accommodate shift
 selection by (i) using it outside of the special contexts where special
 commands apply, and by (ii) extending an existing active region even if the
 cursor moves across a special context.
-@cindex @file{CUA.el}
 @item @file{CUA.el} by Kim. F. Storm
+@cindex @file{CUA.el}
+@cindex Storm, Kim. F.
+@vindex org-replace-disputed-keys
 Key bindings in Org conflict with the @kbd{S-<cursor>} keys used by CUA mode
-(as well as pc-select-mode and s-region-mode) to select and extend the
+(as well as @code{pc-select-mode} and @code{s-region-mode}) to select and extend the
 region.  In fact, Emacs 23 has this built-in in the form of
 @code{shift-selection-mode}, see previous paragraph.  If you are using Emacs
-23 you probably don't want to use another package for this purpose.  However,
+23, you probably don't want to use another package for this purpose.  However,
 if you prefer to leave these keys to a different package while working in
-Org-mode, configure the variable @code{org-replace-disputed-keys}.  When set,
+Org mode, configure the variable @code{org-replace-disputed-keys}.  When set,
 Org will move the following key bindings in Org files, and in the agenda
 buffer (but not during date selection).
@@ -9374,187 +10573,84 @@ S-LEFT    ->  M--             S-RIGHT    ->  M-+
 C-S-LEFT  ->  M-S--           C-S-RIGHT  ->  M-S-+
 @end example
+@vindex org-disputed-keys
 Yes, these are unfortunately more difficult to remember.  If you want
 to have other replacement keys, look at the variable
 @code{org-disputed-keys}.
+@item @file{yasnippet.el}
+@cindex @file{yasnippet.el}
+The way Org-mode binds the TAB key (binding to @code{[tab]} instead of
+@code{"\t"}) overrules yasnippets' access to this key.  The following code
+fixed this problem:
+@lisp
+(add-hook 'org-mode-hook
+          (lambda ()
+            (org-set-local 'yas/trigger-key [tab])
+            (define-key yas/keymap [tab] 'yas/next-field-group)))
+@end lisp
 @item @file{windmove.el} by Hovav Shacham
 @cindex @file{windmove.el}
-Also this package uses the @kbd{S-<cursor>} keys, so everything written
+This package also uses the @kbd{S-<cursor>} keys, so everything written
 in the paragraph above about CUA mode also applies here.
 @end table
+@node Hacking, History and Acknowledgments, Miscellaneous, Top
-@node Bugs,  , Interaction, Miscellaneous
-@section Bugs
-@cindex bugs
-Here is a list of things that should work differently, but which I
-have found too hard to fix.
-@itemize @bullet
-@item
-If a table field starts with a link, and if the corresponding table
-column is narrowed (@pxref{Narrow columns}) to a width too small to
-display the link, the field would look entirely empty even though it is
-not.  To prevent this, Org throws an error.  The work-around is to
-make the column wide enough to fit the link, or to add some text (at
-least 2 characters) before the link in the same field.
-@item
-Narrowing table columns does not work on XEmacs, because the
-@code{format} function does not transport text properties.
-@item
-Text in an entry protected with the @samp{QUOTE} keyword should not
-autowrap.
-@item
-When the application called by @kbd{C-c C-o} to open a file link fails
-(for example because the application does not exist or refuses to open
-the file), it does so silently.  No error message is displayed.
-@item
-Recalculating a table line applies the formulas from left to right.
-If a formula uses @emph{calculated} fields further down the row,
-multiple recalculation may be needed to get all fields consistent.  You
-may use the command @code{org-table-iterate} (@kbd{C-u C-c *}) to
-recalculate until convergence.
-@item
-The exporters work well, but could be made more efficient.
-@end itemize
-@node Extensions, Hacking, Miscellaneous, Top
-@appendix Extensions
-This appendix lists the extension modules that have been written for Org.
-Many of these extensions live in the @file{contrib} directory of the Org
-distribution, others are available somewhere on the web.
-@menu
-* Extensions in the contrib directory::  These come with the Org distro
-* Other extensions::            These you have to find on the web.
-@end menu
-@node Extensions in the contrib directory, Other extensions, Extensions, Extensions
-@section Extensions in the @file{contrib} directory
-A number of extension are distributed with Org when you download it from its
-homepage.  Please note that these extensions are @emph{not} distributed as
-part of Emacs, so if you use Org as delivered with Emacs, you still need to
-go to @url{http://orgmode.org} to get access to these modules.
-@table @asis
-@item @file{org-annotate-file.el} by @i{Philip Jackson}
-Annotate a file with org syntax, in a separate file, with links back to the
-annotated file.
-@item @file{org-annotation-helper.el} by @i{Bastien Guerry and Daniel E. German}
-Call @i{remember} directly from Firefox/Opera, or from Adobe Reader.  When
-activating a special link or bookmark, Emacs receives a trigger to create a
-note with a link back to the website.  Requires some setup, a detailed
-description is in @file{contrib/packages/org-annotation-helper}.
-@item @file{org-bookmark.el} by @i{Tokuya Kameshima}
-Support for links to Emacs bookmarks.
-@item @file{org-depend.el} by @i{Carsten Dominik}
-TODO dependencies for Org-mode.  Make TODO state changes in one entry trigger
-changes in another, or be blocked by the state of another entry.  Also,
-easily create chains of TODO items with exactly one active item at any time.
-@item @file{org-elisp-symbol.el} by @i{Bastien Guerry}
-Org links to emacs-lisp symbols.  This can create annotated links that
-exactly point to the definition location of a variable of function.
-@item @file{org-eval.el} by @i{Carsten Dominik}
-The @code{<lisp>} tag, adapted from Emacs Wiki and Emacs Muse, allows text to
-be included in a document that is the result of evaluating some code.  Other
-scripting languages like @code{perl} can be supported with this package as
-well.
-@item @file{org-eval-light.el} by @i{Eric Schulte}
-User-controlled evaluation of code in an Org buffer.
-@item @file{org-exp-blocks.el} by @i{Eric Schulte}
-Preprocess user-defined blocks for export.
-@item @file{org-expiry.el} by @i{Bastien Guerry}
-Expiry mechanism for Org entries.
-@item @file{org-indent.el} by @i{Carsten Dominik}
-Dynamic indentation of Org outlines.  The plan is to indent an outline
-according to level, but so far this is too hard for a proper and stable
-implementation.  Still, it works somewhat.
-@item @file{org-interactive-query.el} by @i{Christopher League}
-Interactive modification of tags queries.  After running a general query in
-Org, this package allows you to narrow down the results by adding more tags
-or keywords.
-@item @file{org-mairix.el} by @i{Georg C. F. Greve}
-Hook mairix search into Org for different MUAs.
-@item @file{org-man.el} by @i{Carsten Dominik}
-Support for links to manpages in Org-mode.
-@item @file{org-mtags.el} by @i{Carsten Dominik}
-Support for some Muse-like tags in Org-mode.  This package allows you to
-write @code{<example>} and @code{<src>} and other syntax copied from Emacs
-Muse, right inside an Org file.  The goal here is to make it easy to publish
-the same file using either org-publish or Muse.
-@item @file{org-panel.el} by @i{Lennart Borgman}
-Simplified and display-aided access to some Org commands.
-@item @file{org-registry.el} by @i{Bastien Guerry}
-A registry for Org links, to find out from where links point to a given file
-or location.
-@item @file{org2rem.el} by @i{Bastien Guerry}
-Convert org appointments into reminders for the @file{remind} program.
-@item @file{org-screen.el} by @i{Andrew Hyatt}
-Visit screen sessions through Org-mode links.
-@item @file{org-toc.el} by @i{Bastien Guerry}
-Table of contents in a separate buffer, with fast access to sections and easy
-visibility cycling.
-@item @file{orgtbl-sqlinsert.el} by @i{Jason Riedy}
-Convert Org-mode tables to SQL insertions.  Documentation for this can be
-found on the Worg pages.
-@end table
-@node Other extensions,  , Extensions in the contrib directory, Extensions
-@section Other extensions
-@i{TO BE DONE}
-@node Hacking, History and Acknowledgments, Extensions, Top
 @appendix Hacking
+@cindex hacking
 This appendix covers some aspects where users can extend the functionality of
 Org.
 @menu
+* Hooks::                       Who to reach into Org's internals
+* Add-on packages::             Available extensions
 * Adding hyperlink types::      New custom link types
-* Tables in arbitrary syntax::  Orgtbl for LaTeX and other programs
+* Context-sensitive commands::  How to add functionality to such commands
+* Tables in arbitrary syntax::  Orgtbl for La@TeX{} and other programs
 * Dynamic blocks::              Automatically filled blocks
 * Special agenda views::        Customized views
+* Extracting agenda information::  Postprocessing of agenda information
 * Using the property API::      Writing programs that use entry properties
 * Using the mapping API::       Mapping over all or selected entries
 @end menu
-@node Adding hyperlink types, Tables in arbitrary syntax, Hacking, Hacking
+@node Hooks, Add-on packages, Hacking, Hacking
+@section Hooks
+@cindex hooks
+Org has a large number of hook variables that can be used to add
+functionality.  This appendix about hacking is going to illustrate the
+use of some of them.  A complete list of all hooks with documentation is
+maintained by the Worg project and can be found at
+@uref{http://orgmode.org/worg/org-configs/org-hooks.php}.
+@node Add-on packages, Adding hyperlink types, Hooks, Hacking
+@section Add-on packages
+@cindex add-on packages
+A large number of add-on packages have been written by various authors.
+These packages are not part of Emacs, but they are distributed as contributed
+packages with the separate release available at the Org mode home page at
+@uref{http://orgmode.org}.  The list of contributed packages, along with
+documentation about each package, is maintained by the Worg project at
+@uref{http://orgmode.org/worg/org-contrib/}.
+@node Adding hyperlink types, Context-sensitive commands, Add-on packages, Hacking
 @section Adding hyperlink types
 @cindex hyperlinks, adding new types
 Org has a large number of hyperlink types built-in
-(@pxref{Hyperlinks}).  If you would like to add new link types, it
+(@pxref{Hyperlinks}).  If you would like to add new link types, Org
-provides an interface for doing so.  Let's look at an example file
+provides an interface for doing so.  Let's look at an example file,
-@file{org-man.el} that will add support for creating links like
+@file{org-man.el}, that will add support for creating links like
 @samp{[[man:printf][The printf manpage]]} to show Unix manual pages inside
-emacs:
+Emacs:
 @lisp
 ;;; org-man.el - Support for links to manpages in Org
@@ -9616,23 +10712,24 @@ The next line calls @code{org-add-link-type} to define a new link type
 with prefix @samp{man}.  The call also contains the name of a function
 that will be called to follow such a link.
 @item
+@vindex org-store-link-functions
 The next line adds a function to @code{org-store-link-functions}, in
 order to allow the command @kbd{C-c l} to record a useful link in a
 buffer displaying a man page.
 @end enumerate
 The rest of the file defines the necessary variables and functions.
-First there is a customization variable that determines which emacs
+First there is a customization variable that determines which Emacs
 command should be used to display man pages.  There are two options,
 @code{man} and @code{woman}.  Then the function to follow a link is
-defined.  It gets the link path as an argument - in this case the link
+defined.  It gets the link path as an argument---in this case the link
 path is just a topic for the manual command.  The function calls the
 value of @code{org-man-command} to display the man page.
 Finally the function @code{org-man-store-link} is defined.  When you try
-to store a link with @kbd{C-c l}, also this function will be called to
+to store a link with @kbd{C-c l}, this function will be called to
 try to make a link.  The function must first decide if it is supposed to
-create the link for this buffer type, we do this by checking the value
+create the link for this buffer type; we do this by checking the value
 of the variable @code{major-mode}.  If not, the function must exit and
 return the value @code{nil}.  If yes, the link is created by getting the
 manual topic from the buffer name and prefixing it with the string
@@ -9642,7 +10739,48 @@ can also set the @code{:description} property to provide a default for
 the link description when the link is later inserted into an Org
 buffer with @kbd{C-c C-l}.
-@node Tables in arbitrary syntax, Dynamic blocks, Adding hyperlink types, Hacking
+When is makes sense for your new link type, you may also define a function
+@code{org-PREFIX-complete-link} that implements special (@eg completion)
+support for inserting such a link with @kbd{C-c C-l}.  Such a function should
+not accept any arguments, and return the full link with prefix.
+@node Context-sensitive commands, Tables in arbitrary syntax, Adding hyperlink types, Hacking
+@section Context-sensitive commands
+@cindex context-sensitive commands, hooks
+@cindex add-ons, context-sensitive commands
+@vindex org-ctrl-c-ctrl-c-hook
+Org has several commands that act differently depending on context.  The most
+important example it the @kbd{C-c C-c} (@pxref{The very busy C-c C-c key}).
+Also the @kbd{M-cursor} and @kbd{M-S-cursor} keys have this property.
+Add-ons can tap into this functionality by providing a function that detects
+special context for that add-on and executes functionality appropriate for
+the context.  Here is an example from Dan Davison's @file{org-R.el} which
+allows you to evaluate commands based on the @file{R} programming language.  For
+this package, special contexts are lines that start with @code{#+R:} or
+@code{#+RR:}.
+@lisp
+(defun org-R-apply-maybe ()
+  "Detect if this is context for org-R and execute R commands."
+  (if (save-excursion
+        (beginning-of-line 1)
+        (looking-at "#\\+RR?:"))
+      (progn (call-interactively 'org-R-apply)
+             t) ;; to signal that we took action
+    nil)) ;; to signal that we did not
+(add-hook 'org-ctrl-c-ctrl-c-hook 'org-R-apply-maybe)
+@end lisp
+The function first checks if the cursor is in such a line.  If that is the
+case, @code{org-R-apply} is called and the function returns @code{t} to
+signal that action was taken, and @kbd{C-c C-c} will stop looking for other
+contexts.  If the function finds it should do nothing locally, it returns @code{nil} so that other, similar functions can have a try.
+@node Tables in arbitrary syntax, Dynamic blocks, Context-sensitive commands, Hacking
 @section Tables and lists in arbitrary syntax
 @cindex tables, in other modes
 @cindex lists, in other modes
@@ -9652,7 +10790,7 @@ Since Orgtbl mode can be used as a minor mode in arbitrary buffers, a
 frequent feature request has been to make it work with native tables in
 specific languages, for example La@TeX{}.  However, this is extremely
 hard to do in a general way, would lead to a customization nightmare,
-and would take away much of the simplicity of the Orgtbl mode table
+and would take away much of the simplicity of the Orgtbl-mode table
 editor.
@@ -9694,6 +10832,7 @@ between these lines, replacing whatever was there before.  For example:
 Just above the source table, we put a special line that tells
 Orgtbl mode how to translate this table and where to install it.  For
 example:
+@cindex #+ORGTBL
 @example
 #+ORGTBL: SEND table_name translation_function arguments....
 @end example
@@ -9733,19 +10872,19 @@ language.  For example, in C mode you could wrap the table between
 @samp{/*} and @samp{*/} lines.
 @item
 Sometimes it is possible to put the table after some kind of @i{END}
-statement, for example @samp{\bye} in TeX and @samp{\end@{document@}}
+statement, for example @samp{\bye} in @TeX{} and @samp{\end@{document@}}
 in La@TeX{}.
 @item
-You can just comment the table line by line whenever you want to process
+You can just comment the table line-by-line whenever you want to process
 the file, and uncomment it whenever you need to edit the table.  This
-only sounds tedious - the command @kbd{M-x orgtbl-toggle-comment} does
+only sounds tedious---the command @kbd{M-x orgtbl-toggle-comment}
-make this comment-toggling very easy, in particular if you bind it to a
+makes this comment-toggling very easy, in particular if you bind it to a
 key.
 @end itemize
 @node A LaTeX example, Translator functions, Radio tables, Tables in arbitrary syntax
-@subsection A LaTeX example of radio tables
+@subsection A La@TeX{} example of radio tables
-@cindex LaTeX, and Orgtbl mode
+@cindex La@TeX{}, and Orgtbl mode
 The best way to wrap the source table in La@TeX{} is to use the
 @code{comment} environment provided by @file{comment.sty}.  It has to be
@@ -9757,7 +10896,7 @@ modes.}  with the command @kbd{M-x orgtbl-insert-radio-table}.  You will
 be prompted for a table name, let's say we use @samp{salesfigures}.  You
 will then get the following template:
-@cindex #+ORGTBL: SEND
+@cindex #+ORGTBL, SEND
 @example
 % BEGIN RECEIVE ORGTBL salesfigures
 % END RECEIVE ORGTBL salesfigures
@@ -9768,15 +10907,16 @@ will then get the following template:
 @end example
 @noindent
+@vindex La@TeX{}-verbatim-environments
 The @code{#+ORGTBL: SEND} line tells Orgtbl mode to use the function
 @code{orgtbl-to-latex} to convert the table into La@TeX{} and to put it
 into the receiver location with name @code{salesfigures}.  You may now
 fill in the table, feel free to use the spreadsheet features@footnote{If
 the @samp{#+TBLFM} line contains an odd number of dollar characters,
-this may cause problems with font-lock in LaTeX mode.  As shown in the
+this may cause problems with font-lock in La@TeX{} mode.  As shown in the
 example you can fix this by adding an extra line inside the
 @code{comment} environment that is used to balance the dollar
-expressions.  If you are using AUCTeX with the font-latex library, a
+expressions.  If you are using AUC@TeX{} with the font-latex library, a
 much better solution is to add the @code{comment} environment to the
 variable @code{LaTeX-verbatim-environments}.}:
@@ -9800,9 +10940,9 @@ When you are done, press @kbd{C-c C-c} in the table to get the converted
 table inserted between the two marker lines.
 Now let's assume you want to make the table header by hand, because you
-want to control how columns are aligned etc.  In this case we make sure
+want to control how columns are aligned, etc@.  In this case we make sure
-that the table translator does skip the first 2 lines of the source
+that the table translator skips the first 2 lines of the source
-table, and tell the command to work as a @i{splice}, i.e. to not produce
+table, and tell the command to work as a @i{splice}, @ie to not produce
 header and footer commands of the target table:
 @example
@@ -9826,7 +10966,7 @@ Month & \multicolumn@{1@}@{c@}@{Days@} & Nr.\ sold & per day\\
 The La@TeX{} translator function @code{orgtbl-to-latex} is already part of
 Orgtbl mode.  It uses a @code{tabular} environment to typeset the table
 and marks horizontal lines with @code{\hline}.  Furthermore, it
-interprets the following parameters (see also @ref{Translator functions}):
+interprets the following parameters (see also @pxref{Translator functions}):
 @table @code
 @item :splice nil/t
@@ -9834,7 +10974,7 @@ When set to t, return only table body lines, don't wrap them into a
 tabular environment.  Default is nil.
 @item :fmt fmt
-A format to be used to wrap each field, should contain @code{%s} for the
+A format to be used to wrap each field, it should contain @code{%s} for the
 original field value.  For example, to wrap each field value in dollars,
 you could use @code{:fmt "$%s$"}.  This may also be a property list with
 column numbers and formats. for example @code{:fmt (2 "$%s$" 4 "%s\\%%")}.
@@ -9865,7 +11005,7 @@ code that produces tables during HTML export.}, these all use a generic
 translator, @code{orgtbl-to-generic}.  For example, @code{orgtbl-to-latex}
 itself is a very short function that computes the column definitions for the
 @code{tabular} environment, defines a few field and line separators and then
-hands over to the generic translator.  Here is the entire code:
+hands processing over to the generic translator.  Here is the entire code:
 @lisp
 @group
@@ -9885,7 +11025,7 @@ hands over to the generic translator.  Here is the entire code:
 As you can see, the properties passed into the function (variable
 @var{PARAMS}) are combined with the ones newly defined in the function
-(variable @var{PARAMS2}).  The ones passed into the function (i.e. the
+(variable @var{PARAMS2}).  The ones passed into the function (@ie the
 ones set by the @samp{ORGTBL SEND} line) take precedence.  So if you
 would like to use the La@TeX{} translator, but wanted the line endings to
 be @samp{\\[2mm]} instead of the default @samp{\\}, you could just
@@ -9899,7 +11039,7 @@ For a new language, you can either write your own converter function in
 analogy with the La@TeX{} translator, or you can use the generic function
 directly.  For example, if you have a language where a table is started
 with @samp{!BTBL!}, ended with @samp{!ETBL!}, and where table lines are
-started with @samp{!BL!}, ended with @samp{!EL!} and where the field
+started with @samp{!BL!}, ended with @samp{!EL!}, and where the field
 separator is a TAB, you could call the generic translator like this (on
 a single line!):
@@ -9911,7 +11051,7 @@ a single line!):
 @noindent
 Please check the documentation string of the function
 @code{orgtbl-to-generic} for a full list of parameters understood by
-that function and remember that you can pass each of them into
+that function, and remember that you can pass each of them into
 @code{orgtbl-to-latex}, @code{orgtbl-to-texinfo}, and any other function
 using the generic function.
@@ -9922,7 +11062,7 @@ line either the symbol @code{hline} or a list of fields.  The second
 argument is the property list containing all parameters specified in the
 @samp{#+ORGTBL: SEND} line.  The function must return a single string
 containing the formatted table.  If you write a generally useful
-translator, please post it on @code{emacs-orgmode@@gnu.org} so that
+translator, please post it on @email{emacs-orgmode@@gnu.org} so that
 others can benefit from your work.
 @node  Radio lists,  , Translator functions, Tables in arbitrary syntax
@@ -9946,12 +11086,13 @@ Use @code{ORGLST} instead of @code{ORGTBL}.
 The available translation functions for radio lists don't take
 parameters.
 @item
-`C-c C-c' will work when pressed on the first item of the list.
+@kbd{C-c C-c} will work when pressed on the first item of the list.
 @end itemize
 Here is a La@TeX{} example.  Let's say that you have this in your
 La@TeX{} file:
+@cindex #+ORGLIST
 @example
 % BEGIN RECEIVE ORGLST to-buy
 % END RECEIVE ORGLST to-buy
@@ -10030,10 +11171,10 @@ The corresponding block writer function could look like this:
 If you want to make sure that all dynamic blocks are always up-to-date,
 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
+written in a way such that it does nothing in buffers that are not in
 @code{org-mode}.
-@node Special agenda views, Using the property API, Dynamic blocks, Hacking
+@node Special agenda views, Extracting agenda information, Dynamic blocks, Hacking
 @section Special agenda views
 @cindex agenda views, user-defined
@@ -10074,14 +11215,19 @@ like this:
    (org-agenda-overriding-header "Projects waiting for something: "))))
 @end lisp
+@vindex org-agenda-overriding-header
 Note that this also binds @code{org-agenda-overriding-header} to get a
 meaningful header in the agenda view.
+@vindex org-odd-levels-only
+@vindex org-agenda-skip-function
 A general way to create custom searches is to base them on a search for
 entries with a certain level limit.  If you want to study all entries with
-your custom search function, simply do a search for @samp{LEVEL>0}, and then
+your custom search function, simply do a search for
-use @code{org-agenda-skip-function} to select the entries you really want to
+@samp{LEVEL>0}@footnote{Note that, when using @code{org-odd-levels-only}, a
-have.
+level number corresponds to order in the hierarchy, not to the number of
+stars.}, and then use @code{org-agenda-skip-function} to select the entries
+you really want to have.
 You may also put a Lisp form into @code{org-agenda-skip-function}.  In
 particular, you may use the functions @code{org-agenda-skip-entry-if}
@@ -10096,6 +11242,8 @@ Skip current entry if it has not been scheduled.
 Skip current entry if it has a deadline.
 @item '(org-agenda-skip-entry-if 'scheduled 'deadline)
 Skip current entry if it has a deadline, or if it is scheduled.
+@item '(org-agenda-skip-entry-if 'timestamp)
+Skip current entry if it has any timestamp, may also be deadline or scheduled.
 @item '(org-agenda-skip-entry 'regexp "regular expression")
 Skip current entry if the regular expression matches in the entry.
 @item '(org-agenda-skip-entry 'notregexp "regular expression")
@@ -10115,7 +11263,123 @@ like this, even without defining a special function:
    (org-agenda-overriding-header "Projects waiting for something: "))))
 @end lisp
-@node Using the property API, Using the mapping API, Special agenda views, Hacking
+@node Extracting agenda information, Using the property API, Special agenda views, Hacking
+@section Extracting agenda information
+@cindex agenda, pipe
+@cindex Scripts, for agenda processing
+@vindex org-agenda-custom-commands
+Org provides commands to access agenda information for the command
+line in Emacs batch mode.  This extracted information can be sent
+directly to a printer, or it can be read by a program that does further
+processing of the data.  The first of these commands is the function
+@code{org-batch-agenda}, that produces an agenda view and sends it as
+ASCII text to STDOUT.  The command takes a single string as parameter.
+If the string has length 1, it is used as a key to one of the commands
+you have configured in @code{org-agenda-custom-commands}, basically any
+key you can use after @kbd{C-c a}.  For example, to directly print the
+current TODO list, you could use
+@example
+emacs -batch -l ~/.emacs -eval '(org-batch-agenda "t")' | lpr
+@end example
+If the parameter is a string with 2 or more characters, it is used as a
+tags/TODO match string.  For example, to print your local shopping list
+(all items with the tag @samp{shop}, but excluding the tag
+@samp{NewYork}), you could use
+@example
+emacs -batch -l ~/.emacs                                      \
+      -eval '(org-batch-agenda "+shop-NewYork")' | lpr
+@end example
+@noindent
+You may also modify parameters on the fly like this:
+@example
+emacs -batch -l ~/.emacs                                      \
+   -eval '(org-batch-agenda "a"                               \
+            org-agenda-ndays 30                               \
+            org-agenda-include-diary nil                      \
+            org-agenda-files (quote ("~/org/project.org")))'  \
+   | lpr
+@end example
+@noindent
+which will produce a 30-day agenda, fully restricted to the Org file
+@file{~/org/projects.org}, not even including the diary.
+If you want to process the agenda data in more sophisticated ways, you
+can use the command @code{org-batch-agenda-csv} to get a comma-separated
+list of values for each agenda item.  Each line in the output will
+contain a number of fields separated by commas.  The fields in a line
+are:
+@example
+category     @r{The category of the item}
+head         @r{The headline, without TODO keyword, TAGS and PRIORITY}
+type         @r{The type of the agenda entry, can be}
+                todo               @r{selected in TODO match}
+                tagsmatch          @r{selected in tags match}
+                diary              @r{imported from diary}
+                deadline           @r{a deadline}
+                scheduled          @r{scheduled}
+                timestamp          @r{appointment, selected by timestamp}
+                closed             @r{entry was closed on date}
+                upcoming-deadline  @r{warning about nearing deadline}
+                past-scheduled     @r{forwarded scheduled item}
+                block              @r{entry has date block including date}
+todo         @r{The TODO keyword, if any}
+tags         @r{All tags including inherited ones, separated by colons}
+date         @r{The relevant date, like 2007-2-14}
+time         @r{The time, like 15:00-16:50}
+extra        @r{String with extra planning info}
+priority-l   @r{The priority letter if any was given}
+priority-n   @r{The computed numerical priority}
+@end example
+@noindent
+Time and date will only be given if a timestamp (or deadline/scheduled)
+led to the selection of the item.
+A CSV list like this is very easy to use in a post-processing script.
+For example, here is a Perl program that gets the TODO list from
+Emacs/Org and prints all the items, preceded by a checkbox:
+@example
+#!/usr/bin/perl
+# define the Emacs command to run
+$cmd = "emacs -batch -l ~/.emacs -eval '(org-batch-agenda-csv \"t\")'";
+# run it and capture the output
+$agenda = qx@{$cmd 2>/dev/null@};
+# loop over all lines
+foreach $line (split(/\n/,$agenda)) @{
+  # get the individual values
+  ($category,$head,$type,$todo,$tags,$date,$time,$extra,
+   $priority_l,$priority_n) = split(/,/,$line);
+  # process and print
+  print "[ ] $head\n";
+@}
+@end example
+@node Using the property API, Using the mapping API, Extracting agenda information, Hacking
 @section Using the property API
 @cindex API, for properties
 @cindex properties, API
@@ -10124,15 +11388,16 @@ Here is a description of the functions that can be used to work with
 properties.
 @defun org-entry-properties &optional pom which
-Get all properties of the entry at point-or-marker POM.
+Get all properties of the entry at point-or-marker POM.@*
 This includes the TODO keyword, the tags, time strings for deadline,
 scheduled, and clocking, and any additional properties defined in the
 entry.  The return value is an alist, keys may occur multiple times
-if the property key was used several times.
+if the property key was used several times.@*
 POM may also be nil, in which case the current entry is used.
 If WHICH is nil or `all', get all properties.  If WHICH is
 `special' or `standard', only get that subclass.
 @end defun
+@vindex org-use-property-inheritance
 @defun org-entry-get pom property &optional inherit
 Get value of PROPERTY for entry at point-or-marker POM.  By default,
 this only looks at properties defined locally in the entry.  If INHERIT
@@ -10197,11 +11462,22 @@ is:
 @defun org-map-entries func &optional match scope &rest skip
 Call FUNC at each headline selected by MATCH in SCOPE.
-FUNC is a function or a lisp form.  The function will be called without
+FUNC is a function or a Lisp form.  The function will be called without
 arguments, with the cursor positioned at the beginning of the headline.
 The return values of all calls to the function will be collected and
 returned as a list.
+The call to FUNC will be wrapped into a save-excursion form, so FUNC
+does not need to preserve point.  After evaluation, the cursor will be
+moved to the end of the line (presumably of the headline of the
+processed entry) and search continues from there.  Under some
+circumstances, this may not produce the wanted results.  For example,
+if you have removed (@eg archived) the current (sub)tree it could
+mean that the next entry will be skipped entirely.  In such cases, you
+can specify the position from where search should continue by making
+FUNC set the variable `org-map-continue-from' to the desired buffer
+position.
 MATCH is a tags/property/todo match as it is used in the agenda match view.
 Only headlines that are matched by this query will be considered during
 the iteration.  When MATCH is nil or t, all headlines will be
@@ -10221,10 +11497,11 @@ agenda-with-archives
 (file1 file2 ...)
        @r{if this is a list, all files in the list will be scanned}
 @end example
+@noindent
 The remaining args are treated as settings for the skipping facilities of
 the scanner.  The following items can be given here:
+@vindex org-agenda-skip-function
 @example
 archive   @r{skip trees with the archive tag}
 comment   @r{skip trees with the COMMENT keyword}
@@ -10287,30 +11564,30 @@ The following example counts the number of entries with TODO keyword
 @cindex history
 @cindex thanks
-Org was borne in 2003, out of frustration over the user interface
+Org was born in 2003, out of frustration over the user interface
 of the Emacs Outline mode.  I was trying to organize my notes and
 projects, and using Emacs seemed to be the natural way to go.  However,
 having to remember eleven different commands with two or three keys per
 command, only to hide and show parts of the outline tree, that seemed
 entirely unacceptable to me.  Also, when using outlines to take notes, I
-constantly want to restructure the tree, organizing it parallel to my
+constantly wanted to restructure the tree, organizing it parallel to my
 thoughts and plans.  @emph{Visibility cycling} and @emph{structure
 editing} were originally implemented in the package
 @file{outline-magic.el}, but quickly moved to the more general
 @file{org.el}.  As this environment became comfortable for project
-planning, the next step was adding @emph{TODO entries}, basic @emph{time
+planning, the next step was adding @emph{TODO entries}, basic
-stamps}, and @emph{table support}.  These areas highlight the two main
+@emph{timestamps}, and @emph{table support}.  These areas highlighted the two main
-goals that Org still has today: To create a new, outline-based,
+goals that Org still has today: to be a new, outline-based,
 plain text mode with innovative and intuitive editing features, and to
 incorporate project planning functionality directly into a notes file.
 A special thanks goes to @i{Bastien Guerry} who has not only written a large
 number of extensions to Org (most of them integrated into the core by now),
-but has also helped the development and maintenance of Org so much that he
+but who has also helped in the development and maintenance of Org so much that he
 should be considered the main co-contributor to this package.
-Since the first release, literally thousands of emails to me or on
+Since the first release, literally thousands of emails to me or to
-@code{emacs-orgmode@@gnu.org} have provided a constant stream of bug
+@email{emacs-orgmode@@gnu.org} have provided a constant stream of bug
 reports, feedback, new ideas, and sometimes patches and add-on code.
 Many thanks to everyone who has helped to improve this package.  I am
 trying to keep here a list of the people who had significant influence
@@ -10328,7 +11605,11 @@ let me know.
 @i{Christophe Bataillon} created the great unicorn logo that we use on the
 Org-mode website.
 @item
-@i{Alex Bochannek} provided a patch for rounding time stamps.
+@i{Alex Bochannek} provided a patch for rounding timestamps.
+@item
+@i{Brad Bozarth} showed how to pull RSS feed data into Org-mode files.
+@item
+@i{Tom Breton} wrote @file{org-choose.el}.
 @item
 @i{Charles Cave}'s suggestion sparked the implementation of templates
 for Remember.
@@ -10336,16 +11617,20 @@ for Remember.
 @i{Pavel Chalmoviansky} influenced the agenda treatment of items with
 specified time.
 @item
-@i{Gregory Chernov} patched support for lisp forms into table
+@i{Gregory Chernov} patched support for Lisp forms into table
 calculations and improved XEmacs compatibility, in particular by porting
 @file{nouline.el} to XEmacs.
 @item
-@i{Sacha Chua} suggested to copy some linking code from Planner.
+@i{Sacha Chua} suggested copying some linking code from Planner.
+@item
+@i{Baoqiu Cui} contributed the DocBook exporter.
 @item
 @i{Eddward DeVilla} proposed and tested checkbox statistics.  He also
 came up with the idea of properties, and that there should be an API for
 them.
 @item
+@i{Nick Dokos} tracked down several nasty bugs.
+@item
 @i{Kees Dullemond} used to edit projects lists directly in HTML and so
 inspired some of the early development, including HTML export.  He also
 asked for a way to narrow wide table columns.
@@ -10372,9 +11657,9 @@ has been prolific with patches, ideas, and bug reports.
 @item
 @i{Bernt Hansen} has driven much of the support for auto-repeating tasks,
 task state change logging, and the clocktable.  His clear explanations have
-been critical when we started to adopt the GIT version control system.
+been critical when we started to adopt the Git version control system.
 @item
-@i{Manuel Hermenegildo} has contributed various ideas, small fixed and
+@i{Manuel Hermenegildo} has contributed various ideas, small fixes and
 patches.
 @item
 @i{Phil Jackson} wrote @file{org-irc.el}.
@@ -10400,10 +11685,12 @@ basis.
 @i{Stefan Monnier} provided a patch to keep the Emacs-Lisp compiler
 happy.
 @item
-@i{Rick Moynihan} proposed to allow multiple TODO sequences in a file
+@i{Rick Moynihan} proposed allowing multiple TODO sequences in a file
-and to be able to quickly restrict the agenda to a subtree.
+and being able to quickly restrict the agenda to a subtree.
 @item
-@i{Todd Neal} provided patches for links to Info files and elisp forms.
+@i{Todd Neal} provided patches for links to Info files and Elisp forms.
+@item
+@i{Greg Newman} refreshed the unicorn logo into its current form.
 @item
 @i{Tim O'Callaghan} suggested in-file links, search options for general
 file links, and TAGS.
@@ -10419,6 +11706,9 @@ links, among other things.
 @i{Pete Phillips} helped during the development of the TAGS feature, and
 provided frequent feedback.
 @item
+@i{Martin Pohlack} provided the code snippet to bundle character insertion
+into bundles of 20 for undo.
+@item
 @i{T.V. Raman} reported bugs and suggested improvements.
 @item
 @i{Matthias Rempe} (Oelde) provided ideas, Windows support, and quality
@@ -10429,13 +11719,13 @@ control.
 @i{Kevin Rogers} contributed code to access VM files on remote hosts.
 @item
 @i{Sebastian Rose} wrote @file{org-info.js}, a Java script for displaying
-webpages derived from Org using an Info-like, or a folding interface with
+webpages derived from Org using an Info-like or a folding interface with
-single key navigation.
+single-key navigation.
 @item
 @i{Frank Ruell} solved the mystery of the @code{keymapp nil} bug, a
 conflict with @file{allout.el}.
 @item
-@i{Jason Riedy} generalized the send-receive mechanism for orgtbl tables with
+@i{Jason Riedy} generalized the send-receive mechanism for Orgtbl tables with
 extensive patches.
 @item
 @i{Philip Rooke} created the Org reference card, provided lots
@@ -10444,7 +11734,8 @@ of feedback, developed and applied standards to the Org documentation.
 @i{Christian Schlauer} proposed angular brackets around links, among
 other things.
 @item
-@i{Eric Schulte} wrote @file{org-plot.el}.
+@i{Eric Schulte} wrote @file{org-plot.el} and contributed various patches,
+small features and modules.
 @item
 Linking to VM/BBDB/Gnus was first inspired by @i{Tom Shannon}'s
 @file{organizer-mode.el}.
@@ -10502,15 +11793,24 @@ and contributed various ideas and code snippets.
 @node Main Index, Key Index, History and Acknowledgments, Top
-@unnumbered The Main Index
+@unnumbered Concept Index
 @printindex cp
-@node Key Index,  , Main Index, Top
+@node Key Index, Variable Index, Main Index, Top
 @unnumbered Key Index
 @printindex ky
+@node Variable Index,  , Key Index, Top
+@unnumbered Variable Index
+This is not a complete index of variables and faces, only the ones that are
+mentioned in the manual.  For a more complete list, use @kbd{M-x
+org-customize @key{RET}} and then klick yourself through the tree.
+@printindex vr
 @bye
 @ignore
author	Carsten Dominik	2009-08-06 09:14:10 +0000
committer	Carsten Dominik	2009-08-06 09:14:10 +0000
commit	c8d0cf5ca023b996beb0ca15f7b054951acf9c7e (patch)
tree	b1c465c4840dd899dc51ea577a3f5f70c4079e71 /doc/misc
parent	8c914fdb1828b576dd66fd4ef546c32d62252c06 (diff)
download	emacs-c8d0cf5ca023b996beb0ca15f7b054951acf9c7e.tar.gz emacs-c8d0cf5ca023b996beb0ca15f7b054951acf9c7e.zip