Update Org to v9.0.9

Please see etc/ORG-NEWS for details.

1 files changed, 5357 insertions, 4518 deletions

diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index fca5185337e..272788b1a11 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -4,7 +4,8 @@
 @settitle The Org Manual
 @include docstyle.texi
 
-@set VERSION 8.2.9
+@set VERSION 9.0.9
+@set DATE 2017-06-22
 
 @c Version and Contact Info
 @set MAINTAINERSITE @uref{http://orgmode.org,maintainers web page}
@@ -284,8 +285,8 @@ modify this GNU manual.''
 
 @subtitle Release @value{VERSION}
 @author by Carsten Dominik
-with contributions by David O'Toole, Bastien Guerry, Philip Rooke, Dan
-Davison, Eric Schulte, Thomas Dye, Jambunathan K and Nicolas Goaziou.
+with contributions by Bastien Guerry, Nicolas Goaziou, Eric Schulte,
+Jambunathan K, Dan Davison, Thomas Dye, David O'Toole, and Philip Rooke.
 
 @c The following two commands start the copyright page.
 @page
@@ -293,13 +294,14 @@ Davison, Eric Schulte, Thomas Dye, Jambunathan K and Nicolas Goaziou.
 @insertcopying
 @end titlepage
 
+@c Output the short table of contents at the beginning.
+@shortcontents
+
 @c Output the table of contents at the beginning.
 @contents
 
 @ifnottex
-@c FIXME These hand-written next,prev,up node pointers make editing a lot
-@c harder.  There should be no need for them, makeinfo can do it
-@c automatically for any document with a normal structure.
+
 @node Top, Introduction, (dir), (dir)
 @top Org Mode Manual
 
@@ -308,23 +310,23 @@ Davison, Eric Schulte, Thomas Dye, Jambunathan K and Nicolas Goaziou.
 
 @menu
 * Introduction::                Getting started
-* Document Structure::          A tree works like your brain
+* Document structure::          A tree works like your brain
 * Tables::                      Pure magic for quick formatting
 * Hyperlinks::                  Notes in context
-* TODO Items::                  Every tree branch can be a TODO item
+* TODO items::                  Every tree branch can be a TODO item
 * Tags::                        Tagging headlines and matching sets of tags
-* Properties and Columns::      Storing information about an entry
-* Dates and Times::             Making items useful for planning
+* Properties and columns::      Storing information about an entry
+* Dates and times::             Making items useful for planning
 * Capture - Refile - Archive::  The ins and outs for projects
-* Agenda Views::                Collecting information into views
+* Agenda views::                Collecting information into views
 * Markup::                      Prepare text for rich export
 * Exporting::                   Sharing and publishing notes
 * Publishing::                  Create a web site of linked Org files
-* Working With Source Code::    Export, evaluate, and tangle code blocks
+* Working with source code::    Export, evaluate, and tangle code blocks
 * Miscellaneous::               All the rest which did not fit elsewhere
 * Hacking::                     How to hack your way around
 * MobileOrg::                   Viewing and capture on a mobile device
-* History and Acknowledgments::  How Org came into being
+* History and acknowledgments::  How Org came into being
 * GNU Free Documentation License::  The license for this documentation.
 * Main Index::                  An index of Org's concepts and features
 * Key Index::                   Key bindings and where they are described
@@ -363,11 +365,6 @@ Visibility cycling
 * Initial visibility::          Setting the initial visibility state
 * Catching invisible edits::    Preventing mistakes when editing invisible parts
 
-Global and local cycling
-
-* Initial visibility::          Setting the initial visibility state
-* Catching invisible edits::    Preventing mistakes when editing invisible parts
-
 Tables
 
 * Built-in table editor::       Simple tables
@@ -434,7 +431,7 @@ Tags
 
 * Tag inheritance::             Tags use the tree structure of the outline
 * Setting tags::                How to assign tags to a headline
-* Tag groups::                  Use one tag to search for several tags
+* Tag hierarchy::               Create a hierarchy of tags
 * Tag searches::                Searching for combinations of tags
 
 Properties and columns
@@ -464,8 +461,7 @@ Dates and times
 * Deadlines and scheduling::    Planning your work
 * Clocking work time::          Tracking how long you spend on a task
 * Effort estimates::            Planning work effort in advance
-* Relative timer::              Notes with a running timer
-* Countdown timer::             Starting a countdown timer for a task
+* Timers::                      Notes with a running timer
 
 Creating timestamps
 
@@ -487,7 +483,7 @@ Capture - Refile - Archive
 
 * Capture::                     Capturing new stuff
 * Attachments::                 Add files to tasks
-* RSS Feeds::                   Getting input from RSS feeds
+* RSS feeds::                   Getting input from RSS feeds
 * Protocols::                   External (e.g., Browser) access to Emacs and Org
 * Refile and copy::             Moving/copying a tree from one place to another
 * Archiving::                   What to do with finished projects
@@ -517,7 +513,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::      Writing a view to a file
+* Exporting agenda views::      Writing a view to a file
 * Agenda column view::          Using column view for collected entries
 
 The built-in agenda views
@@ -540,114 +536,127 @@ 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
+* Setting options::             Changing the rules
 
 Markup for rich export
 
-* Structural markup elements::  The basic structure as seen by the exporter
+* Paragraphs::                  The basic unit of text
+* Emphasis and monospace::      Bold, italic, etc.
+* Horizontal rules::            Make a line
 * Images and tables::           Images, tables and caption mechanism
 * Literal examples::            Source code examples with special formatting
-* Include files::               Include additional files into a document
-* Index entries::               Making an index
-* Macro replacement::           Use macros to create templates
+* Special symbols::             Greek letters and other symbols
+* Subscripts and superscripts::  Simple syntax for raising/lowering text
 * Embedded @LaTeX{}::           LaTeX can be freely used inside Org documents
-* Special blocks::              Containers targeted at export back-ends
-
-Structural markup elements
-
-* Document title::              Where the title is taken from
-* Headings and sections::       The document structure as seen by the exporter
-* Table of contents::           The if and where of the table of contents
-* Lists::                       Lists
-* Paragraphs::                  Paragraphs
-* Footnote markup::             Footnotes
-* Emphasis and monospace::      Bold, italic, etc.
-* Horizontal rules::            Make a line
-* Comment lines::               What will *not* be exported
 
 Embedded @LaTeX{}
 
-* Special symbols::             Greek letters and other symbols
-* Subscripts and superscripts::  Simple syntax for raising/lowering text
 * @LaTeX{} fragments::          Complex formulas made easy
 * Previewing @LaTeX{} fragments::  What will this snippet look like?
 * CDLaTeX mode::                Speed up entering of formulas
 
 Exporting
 
-* The Export Dispatcher::       The main exporter interface
-* Export back-ends::            Built-in export formats
-* Export settings::             Generic export settings
+* The export dispatcher::       The main interface
+* Export settings::             Common export settings
+* Table of contents::           The if and where of the table of contents
+* Include files::               Include additional files into a document
+* Macro replacement::           Use macros to create templates
+* Comment lines::               What will not be exported
 * ASCII/Latin-1/UTF-8 export::  Exporting to flat files with encoding
 * Beamer export::               Exporting as a Beamer presentation
 * HTML export::                 Exporting to HTML
-* @LaTeX{} and PDF export::     Exporting to @LaTeX{}, and processing to PDF
+* @LaTeX{} export::             Exporting to @LaTeX{}, and processing to PDF
 * Markdown export::             Exporting to Markdown
 * OpenDocument Text export::    Exporting to OpenDocument Text
 * Org export::                  Exporting to Org
 * Texinfo export::              Exporting to Texinfo
 * iCalendar export::            Exporting to iCalendar
 * Other built-in back-ends::    Exporting to a man page
-* Export in foreign buffers::   Author tables and lists in Org syntax
 * Advanced configuration::      Fine-tuning the export output
+* Export in foreign buffers::   Author tables and lists in Org syntax
+
+Beamer export
+
+* Beamer export commands::      For creating Beamer documents.
+* Beamer specific export settings::  For customizing Beamer export.
+* Sectioning Frames and Blocks in Beamer::  For composing Beamer slides.
+* Beamer specific syntax::      For using in Org documents.
+* Editing support::             For using helper functions.
+* A Beamer example::            A complete presentation.
 
 HTML export
 
-* HTML Export commands::        How to invoke HTML export
-* HTML doctypes::               Org can export to various (X)HTML flavors
-* HTML preamble and postamble::  How to insert a preamble and a postamble
-* Quoting HTML tags::           Using direct HTML in Org mode
-* Links in HTML export::        How links will be interpreted and formatted
-* Tables in HTML export::       How to modify the formatting of tables
-* Images in HTML export::       How to insert figures into HTML output
-* Math formatting in HTML export::  Beautiful math also on the web
-* 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
-
-* @LaTeX{} export commands::    How to export to LaTeX and PDF
-* Header and sectioning::       Setting up the export file structure
-* Quoting @LaTeX{} code::       Incorporating literal @LaTeX{} code
-* @LaTeX{} specific attributes::  Controlling @LaTeX{} output
+* HTML Export commands::        Invoking HTML export
+* HTML Specific export settings::  Settings for HTML export
+* HTML doctypes::               Exporting various (X)HTML flavors
+* HTML preamble and postamble::  Inserting preamble and postamble
+* Quoting HTML tags::           Using direct HTML in Org files
+* Links in HTML export::        Interpreting and formatting links
+* Tables in HTML export::       Formatting and modifying tables
+* Images in HTML export::       Inserting figures with HTML output
+* Math formatting in HTML export::  Handling math equations
+* Text areas in HTML export::   Showing an alternate approach, an example
+* CSS support::                 Styling HTML output
+* JavaScript support::          Folding scripting in the web browser
+
+@LaTeX{} export
+
+* @LaTeX{} export commands::    For producing @LaTeX{} and PDF documents.
+* @LaTeX{} specific export settings::  Unique to this @LaTeX{} back-end.
+* @LaTeX{} header and sectioning::  For file structure.
+* Quoting @LaTeX{} code::       Directly in the Org document.
+* Tables in @LaTeX{} export::   Attributes specific to tables.
+* Images in @LaTeX{} export::   Attributes specific to images.
+* Plain lists in @LaTeX{} export::  Attributes specific to lists.
+* Source blocks in @LaTeX{} export::  Attributes specific to source code blocks.
+* Example blocks in @LaTeX{} export::  Attributes specific to example blocks.
+* Special blocks in @LaTeX{} export::  Attributes specific to special blocks.
+* Horizontal rules in @LaTeX{} export::  Attributes specific to horizontal rules.
 
 OpenDocument Text export
 
-* Pre-requisites for ODT export::  What packages ODT exporter relies on
-* ODT export commands::         How to invoke ODT export
-* Extending ODT export::        How to produce @samp{doc}, @samp{pdf} files
-* Applying custom styles::      How to apply custom styles to the output
-* Links in ODT export::         How links will be interpreted and formatted
-* Tables in ODT export::        How Tables are exported
-* Images in ODT export::        How to insert images
-* Math formatting in ODT export::  How @LaTeX{} fragments are formatted
-* Labels and captions in ODT export::  How captions are rendered
-* Literal examples in ODT export::  How source and example blocks are formatted
-* Advanced topics in ODT export::  Read this if you are a power user
+* Pre-requisites for ODT export::  Required packages.
+* ODT export commands::         Invoking export.
+* ODT specific export settings::  Configuration options.
+* Extending ODT export::        Producing @file{.doc}, @file{.pdf} files.
+* Applying custom styles::      Styling the output.
+* Links in ODT export::         Handling and formatting links.
+* Tables in ODT export::        Org table conversions.
+* Images in ODT export::        Inserting images.
+* Math formatting in ODT export::  Formatting @LaTeX{} fragments.
+* Labels and captions in ODT export::  Rendering objects.
+* Literal examples in ODT export::  For source code and example blocks.
+* Advanced topics in ODT export::  For power users.
 
 Math formatting in ODT export
 
-* Working with @LaTeX{} math snippets::  How to embed @LaTeX{} math fragments
-* Working with MathML or OpenDocument formula files::  How to embed equations in native format
+* Working with @LaTeX{} math snippets::  Embedding in @LaTeX{} format.
+* Working with MathML or OpenDocument formula files::  Embedding in native format.
 
 Advanced topics in ODT export
 
-* Configuring a document converter::  How to register a document converter
-* Working with OpenDocument style files::  Explore the internals
-* Creating one-off styles::     How to produce custom highlighting etc
-* Customizing tables in ODT export::  How to define and use Table templates
-* Validating OpenDocument XML::  How to debug corrupt OpenDocument files
+* Configuring a document converter::  Registering a document converter.
+* Working with OpenDocument style files::  Exploring internals.
+* Creating one-off styles::     Customizing styles, highlighting.
+* Customizing tables in ODT export::  Defining table templates.
+* Validating OpenDocument XML::  Debugging corrupted OpenDocument files.
 
 Texinfo export
 
-* Texinfo export commands::     How to invoke Texinfo export
-* Document preamble::           File header, title and copyright page
-* Headings and sectioning structure:: Building document structure
-* Indices::                     Creating indices
-* Quoting Texinfo code::        Incorporating literal Texinfo code
-* Texinfo specific attributes:: Controlling Texinfo output
-* An example::
+* Texinfo export commands::     Invoking commands.
+* Texinfo specific export settings::  Setting the environment.
+* Texinfo file header::         Generating the header.
+* Texinfo title and copyright page::  Creating preamble pages.
+* Info directory file::     Installing a manual in Info file hierarchy.
+* Headings and sectioning structure::  Building document structure.
+* Indices::                     Creating indices.
+* Quoting Texinfo code::        Incorporating literal Texinfo code.
+* Plain lists in Texinfo export::  List attributes.
+* Tables in Texinfo export::    Table attributes.
+* Images in Texinfo export::    Image attributes.
+* Special blocks in Texinfo export::  Special block attributes.
+* A Texinfo example::           Processing Org to Texinfo.
 
 Publishing
 
@@ -694,36 +703,32 @@ Header arguments
 
 Using header arguments
 
-* System-wide header arguments::  Set global default values
-* Language-specific header arguments::  Set default values by language
-* Header arguments in Org mode properties::  Set default values for a buffer or heading
-* Language-specific header arguments in Org mode properties::  Set language-specific default values for a buffer or heading
-* Code block specific header arguments::  The most common way to set values
-* Header arguments in function calls::  The most specific level
+* System-wide header arguments::  Set globally, language-specific
+* Language-specific header arguments::  Set in the Org file's headers
+* Header arguments in Org mode properties::  Set in the Org file
+* Language-specific mode properties::
+* Code block specific header arguments::  The most commonly used method
+* Arguments in function calls::  The most specific level, takes highest priority
 
 Specific header arguments
 
-* var::                         Pass arguments to code blocks
-* results::                     Specify the type of results and how they will
-                                be collected and handled
-* file::                        Specify a path for file output
+* var::                         Pass arguments to @samp{src} code blocks
+* results::                     Specify results type; how to collect
+* file::                        Specify a path for output file
 * file-desc::                   Specify a description for file results
-* dir::                         Specify the default (possibly remote)
-                                directory for code block execution
-* exports::                     Export code and/or results
-* tangle::                      Toggle tangling and specify file name
-* mkdirp::                      Toggle creation of parent directories of target
-                                files during tangling
-* comments::                    Toggle insertion of comments in tangled
-                                code files
-* padline::                     Control insertion of padding lines in tangled
-                                code files
-* no-expand::                   Turn off variable assignment and noweb
-                                expansion during tangling
+* file-ext::                    Specify an extension for file output
+* output-dir::                  Specify a directory for output file
+* dir::                         Specify the default directory for code block execution
+* exports::                     Specify exporting code, results, both, none
+* tangle::                      Toggle tangling; or specify file name
+* mkdirp::                      Toggle for parent directory creation for target files during tangling
+* comments::                    Toggle insertion of comments in tangled code files
+* padline::                     Control insertion of padding lines in tangled code files
+* no-expand::                   Turn off variable assignment and noweb expansion during tangling
 * session::                     Preserve the state of code evaluation
 * noweb::                       Toggle expansion of noweb references
 * noweb-ref::                   Specify block's noweb reference resolution target
-* noweb-sep::                   String used to separate noweb references
+* noweb-sep::                   String to separate noweb references
 * cache::                       Avoid re-evaluating unchanged code blocks
 * sep::                         Delimiter for writing tabular results outside Org
 * hlines::                      Handle horizontal lines in tables
@@ -733,22 +738,22 @@ Specific header arguments
 * tangle-mode::                 Set permission of tangled files
 * eval::                        Limit evaluation of specific code blocks
 * wrap::                        Mark source block evaluation results
-* post::                        Post processing of code block results
-* prologue::                    Text to prepend to code block body
-* epilogue::                    Text to append to code block body
+* post::                        Post processing of results of code block evaluation
+* prologue::                    Text to prepend to body of code block
+* epilogue::                    Text to append to body of code block
 
 Miscellaneous
 
-* Completion::                  M-TAB knows what you need
-* Easy Templates::              Quick insertion of structural elements
+* Completion::                  M-TAB guesses completions
+* Easy templates::              Quick insertion of structural elements
 * Speed keys::                  Electric commands at the beginning of a headline
 * Code evaluation security::    Org mode files evaluate inline code
-* Customization::               Adapting Org to your taste
+* Customization::               Adapting Org to changing tastes
 * In-buffer settings::          Overview of the #+KEYWORDS
 * The very busy C-c C-c key::   When in doubt, press C-c C-c
 * Clean view::                  Getting rid of leading stars in the outline
 * TTY keys::                    Using Org on a tty
-* Interaction::                 Other Emacs packages
+* Interaction::                 With other Emacs packages
 * org-crypt::                   Encrypting Org files
 
 Interaction with other packages
@@ -780,14 +785,14 @@ Tables and lists in arbitrary syntax
 
 MobileOrg
 
-* Setting up the staging area::  Where to interact with the mobile device
+* Setting up the staging area::  For the mobile device
 * Pushing to MobileOrg::        Uploading Org files and agendas
 * Pulling from MobileOrg::      Integrating captured and flagged items
 
 @end detailmenu
 @end menu
 
-@node Introduction, Document Structure, Top, Top
+@node Introduction
 @chapter Introduction
 @cindex introduction
 
@@ -799,79 +804,65 @@ MobileOrg
 * Conventions::                 Typesetting conventions in the manual
 @end menu
 
-@node Summary, Installation, Introduction, Introduction
+@node Summary
 @section Summary
 @cindex summary
 
-Org is a mode for keeping notes, maintaining TODO lists, and doing
-project planning with a fast and effective plain-text system.
-
-Org develops organizational tasks around NOTES files that contain
-lists or information about projects as plain text.  Org is
-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,
-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.
-For printing and sharing notes, an Org file can be exported as a
-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.
-
-As a project planning environment, Org works by adding metadata to outline
-nodes.  Based on this data, specific entries can be extracted in queries and
-create dynamic @i{agenda views}.
-
-Org mode contains the Org Babel environment which allows you to work with
-embedded source code blocks in a file, to facilitate code evaluation,
-documentation, and literate programming techniques.
-
-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 @LaTeX{}.  The structure
-editing and list creation capabilities can be used outside Org with
-the minor Orgstruct mode.
-
-Org keeps simple things simple.  When first fired up, it should
-feel like a straightforward, easy to use outliner.  Complexity is not
-imposed, but a large amount of functionality is available when you need
-it.  Org is a toolbox and can be used in different ways and for different
-ends, for example:
-
-@example
-@r{@bullet{} an outline extension with visibility cycling and structure editing}
-@r{@bullet{} an ASCII system and table editor for taking structured notes}
-@r{@bullet{} a TODO list editor}
-@r{@bullet{} a full agenda and planner with deadlines and work scheduling}
-@pindex GTD, Getting Things Done
-@r{@bullet{} an environment in which to implement David Allen's GTD system}
-@r{@bullet{} a simple hypertext system, with HTML and @LaTeX{} export}
-@r{@bullet{} a publishing tool to create a set of interlinked web pages}
-@r{@bullet{} an environment for literate programming}
-@end example
+Org is a mode for keeping notes, maintaining TODO lists, and project planning
+with a fast and effective plain-text system.  It also is an authoring system
+with unique support for literate programming and reproducible research.
+
+Org is 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.  Plain text URL-like links connect to websites,
+emails, Usenet messages, BBDB entries, and any files related to the projects.
+
+Org develops organizational tasks around notes files that contain lists or
+information about projects as plain text.  Project planning and task
+management makes use of metadata which is part of an outline node.  Based on
+this data, specific entries can be extracted in queries and create dynamic
+@i{agenda views} that also integrate the Emacs calendar and diary.  Org can
+be used to implement many different project planning schemes, such as David
+Allen's GTD system.
+
+Org files can serve as a single source authoring system with export to many
+different formats such as HTML, @LaTeX{}, Open Document, and Markdown.  New
+export backends can be derived from existing ones, or defined from scratch.
+
+Org files can include source code blocks, which makes Org uniquely suited for
+authoring technical documents with code examples. Org source code blocks are
+fully functional; they can be evaluated in place and their results can be
+captured in the file.  This makes it possible to create a single file
+reproducible research compendium.
+
+Org keeps simple things simple.  When first fired up, it should feel like a
+straightforward, easy to use outliner.  Complexity is not imposed, but a
+large amount of functionality is available when needed.  Org is a toolbox.
+Many users actually run only a (very personal) fraction of Org's capabilities, and
+know that there is more whenever they need it.
+
+All of this is achieved with strictly plain text files, the most portable and
+future-proof file format.  Org runs in Emacs.  Emacs is one of the most
+widely ported programs, so that Org mode is available on every major
+platform.
 
 @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
 @uref{http://orgmode.org}.
-
 @cindex print edition
-The version 7.3 of this manual is available as a
-@uref{http://www.network-theory.co.uk/org/manual/, paperback book from Network
-Theory Ltd.}
 
-@page
+An earlier version (7.3) of this manual is available as a
+@uref{http://www.network-theory.co.uk/org/manual/, paperback book from
+Network Theory Ltd.}
 
+@page
 
-@node Installation, Activation, Summary, Introduction
+@node Installation
 @section Installation
 @cindex installation
-@cindex XEmacs
 
 Org is part of recent distributions of GNU Emacs, so you normally don't need
 to install it.  If, for one reason or another, you want to install Org on top
@@ -895,7 +886,7 @@ been visited, i.e., where no Org built-in function have been loaded.
 Otherwise autoload Org functions will mess up the installation.
 
 Then, to make sure your Org configuration is taken into account, initialize
-the package system with @code{(package-initialize)} in your @file{.emacs}
+the package system with @code{(package-initialize)} in your Emacs init file
 before setting any Org option.  If you want to use Org's package repository,
 check out the @uref{http://orgmode.org/elpa.html, Org ELPA page}.
 
@@ -903,7 +894,7 @@ check out the @uref{http://orgmode.org/elpa.html, Org ELPA page}.
 
 You can download Org latest release from @uref{http://orgmode.org/, Org's
 website}.  In this case, make sure you set the load-path correctly in your
-@file{.emacs}:
+Emacs init file:
 
 @lisp
 (add-to-list 'load-path "~/path/to/orgdir/lisp")
@@ -945,7 +936,7 @@ For more detailed explanations on Org's build system, please check the Org
 Build System page on @uref{http://orgmode.org/worg/dev/org-build-system.html,
 Worg}.
 
-@node Activation, Feedback, Installation, Introduction
+@node Activation
 @section Activation
 @cindex activation
 @cindex autoload
@@ -957,14 +948,6 @@ Worg}.
 @findex org-store-link
 @findex org-iswitchb
 
-Since Emacs 22.2, files with the @file{.org} extension use Org mode by
-default.  If you are using an earlier version of Emacs, add this line to your
-@file{.emacs} file:
-
-@lisp
-(add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))
-@end lisp
-
 Org mode buffers need font-lock to be turned on: this is the default in
 Emacs@footnote{If you don't use font-lock globally, turn it on in Org buffer
 with @code{(add-hook 'org-mode-hook 'turn-on-font-lock)}}.
@@ -979,15 +962,15 @@ suggested bindings for these keys, please modify the keys to your own
 liking.
 @lisp
 (global-set-key "\C-cl" 'org-store-link)
-(global-set-key "\C-cc" 'org-capture)
 (global-set-key "\C-ca" 'org-agenda)
+(global-set-key "\C-cc" 'org-capture)
 (global-set-key "\C-cb" 'org-iswitchb)
 @end lisp
 
 @cindex Org mode, turning on
-With this setup, all files with extension @samp{.org} will be put
-into Org mode.  As an alternative, make the first line of a file look
-like this:
+Files with the @file{.org} extension use Org mode by default.  To turn on Org
+mode in a file that does not have the extension @file{.org}, make the first
+line of a file look like this:
 
 @example
 MY PROJECTS    -*- mode: org; -*-
@@ -999,17 +982,12 @@ 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 @i{active}.  To make
-use of this, you need to have @code{transient-mark-mode}
-(@code{zmacs-regions} in XEmacs) turned on.  In Emacs 23 this is the default,
-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
+use of this, you need to have @code{transient-mark-mode} turned on, which is
+the default.  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
+@node Feedback
 @section Feedback
 @cindex feedback
 @cindex bug reports
@@ -1018,6 +996,8 @@ active region by using the mouse to select a region, or pressing
 
 If you find problems with Org, or if you have questions, remarks, or ideas
 about it, please mail to the Org mailing list @email{emacs-orgmode@@gnu.org}.
+You can subscribe to the list
+@uref{https://lists.gnu.org/mailman/listinfo/emacs-orgmode, on this web page}.
 If you are not a member of the mailing list, your mail will be passed to the
 list after a moderator has approved it@footnote{Please consider subscribing
 to the mailing list, in order to minimize the work the mailing list
@@ -1028,13 +1008,13 @@ version of Org available---if you are running an outdated version, it is
 quite possible that the bug has been fixed already.  If the bug persists,
 prepare a report and provide as much information as possible, including the
 version information of Emacs (@kbd{M-x emacs-version @key{RET}}) and Org
-(@kbd{M-x org-version RET}), as well as the Org related setup in
-@file{.emacs}.  The easiest way to do this is to use the command
+(@kbd{M-x org-version RET}), as well as the Org related setup in the Emacs
+init file.  The easiest way to do this is to use the command
 @example
 @kbd{M-x org-submit-bug-report RET}
 @end example
 @noindent which will put all this information into an Emacs mail buffer so
-that you only need to add your description.  If you re not sending the Email
+that you only need to add your description.  If you are not sending the Email
 from within Emacs, please copy and paste the content into your Email program.
 
 Sometimes you might face a problem due to an error in your Emacs or Org mode
@@ -1097,8 +1077,7 @@ To do this, use
 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).
+Go to the @code{Options} menu and select @code{Enter Debugger on Error}.
 @item
 Do whatever you have to do to hit the error.  Don't forget to
 document the steps you take.
@@ -1108,7 +1087,7 @@ screen.  Save this buffer to a file (for example using @kbd{C-x C-w}) and
 attach it to your bug report.
 @end enumerate
 
-@node Conventions,  , Feedback, Introduction
+@node Conventions
 @section Typesetting conventions used in this manual
 
 @subsubheading TODO keywords, tags, properties, etc.
@@ -1132,21 +1111,20 @@ special meaning are written with all capitals.
 @end table
 
 Moreover, Org uses @i{option keywords} (like @code{#+TITLE} to set the title)
-and @i{environment keywords} (like @code{#+BEGIN_HTML} to start a @code{HTML}
-environment).  They are written in uppercase in the manual to enhance its
-readability, but you can use lowercase in your Org files@footnote{Easy
-templates insert lowercase keywords and Babel dynamically inserts
-@code{#+results}.}.
+and @i{environment keywords} (like @code{#+BEGIN_EXPORT html} to start
+a @code{HTML} environment).  They are written in uppercase in the manual to
+enhance its readability, but you can use lowercase in your Org file.
 
-@subsubheading Keybindings and commands
+@subsubheading Key bindings and commands
 @kindex C-c a
 @findex org-agenda
 @kindex C-c c
 @findex org-capture
 
-The manual suggests two global keybindings: @kbd{C-c a} for @code{org-agenda}
-and @kbd{C-c c} for @code{org-capture}.  These are only suggestions, but the
-rest of the manual assumes that you are using these keybindings.
+The manual suggests a few global key bindings, in particular @kbd{C-c a} for
+@code{org-agenda} and @kbd{C-c c} for @code{org-capture}.  These are only
+suggestions, but the rest of the manual assumes that these key bindings are in
+place in order to list commands by key access.
 
 Also, the manual lists both the keys and the corresponding commands for
 accessing a functionality.  Org mode often uses the same key for different
@@ -1159,7 +1137,7 @@ will be listed to call @code{org-table-move-column-right}.  If you prefer,
 you can compile the manual without the command names by unsetting the flag
 @code{cmdnames} in @file{org.texi}.
 
-@node Document Structure, Tables, Introduction, Top
+@node Document structure
 @chapter Document structure
 @cindex document structure
 @cindex structure of document
@@ -1182,7 +1160,7 @@ edit the structure of the document.
 * Org syntax::                  Formal description of Org's syntax
 @end menu
 
-@node Outlines, Headlines, Document Structure, Document Structure
+@node Outlines
 @section Outlines
 @cindex outlines
 @cindex Outline mode
@@ -1196,7 +1174,7 @@ 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.
 
-@node Headlines, Visibility cycling, Outlines, Document Structure
+@node Headlines
 @section Headlines
 @cindex headlines
 @cindex outline tree
@@ -1209,7 +1187,7 @@ start with one or more stars, on the left margin@footnote{See the variables
 @code{org-special-ctrl-a/e}, @code{org-special-ctrl-k}, and
 @code{org-ctrl-k-protect-subtree} to configure special behavior of @kbd{C-a},
 @kbd{C-e}, and @kbd{C-k} in headlines.} @footnote{Clocking only works with
-headings indented less then 30 stars.}.  For example:
+headings indented less than 30 stars.}.  For example:
 
 @example
 * Top level headline
@@ -1222,7 +1200,12 @@ headings indented less then 30 stars.}.  For example:
 * Another top level headline
 @end example
 
-@noindent Some people find the many stars too noisy and would prefer an
+@vindex org-footnote-section
+@noindent Note that a headline named after @code{org-footnote-section},
+which defaults to @samp{Footnotes}, is considered as special.  A subtree with
+this headline will be silently ignored by exporting functions.
+
+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.
 
@@ -1233,7 +1216,7 @@ least two empty lines, one empty line will remain visible after folding
 the subtree, in order to structure the collapsed view.  See the
 variable @code{org-cycle-separator-lines} to modify this behavior.
 
-@node Visibility cycling, Motion, Headlines, Document Structure
+@node Visibility cycling
 @section Visibility cycling
 @cindex cycling, visibility
 @cindex visibility cycling
@@ -1247,7 +1230,7 @@ variable @code{org-cycle-separator-lines} to modify this behavior.
 * Catching invisible edits::    Preventing mistakes when editing invisible parts
 @end menu
 
-@node Global and local cycling, Initial visibility, Visibility cycling, Visibility cycling
+@node Global and local cycling
 @subsection Global and local cycling
 
 Outlines make it possible to hide parts of the text in the buffer.
@@ -1299,7 +1282,7 @@ tables, @kbd{S-@key{TAB}} jumps to the previous field.
 @orgcmd{C-u C-u @key{TAB},org-set-startup-visibility}
 Switch back to the startup visibility of the buffer (@pxref{Initial visibility}).
 @cindex show all, command
-@orgcmd{C-u C-u C-u @key{TAB},show-all}
+@orgcmd{C-u C-u C-u @key{TAB},outline-show-all}
 Show all, including drawers.
 @cindex revealing context
 @orgcmd{C-c C-r,org-reveal}
@@ -1310,37 +1293,25 @@ exposed by a sparse tree command (@pxref{Sparse trees}) or an agenda command
 level, all sibling headings.  With a double prefix argument, also show the
 entire subtree of the parent.
 @cindex show branches, command
-@orgcmd{C-c C-k,show-branches}
+@orgcmd{C-c C-k,outline-show-branches}
 Expose all the headings of the subtree, CONTENT view for just one subtree.
 @cindex show children, command
-@orgcmd{C-c @key{TAB},show-children}
+@orgcmd{C-c @key{TAB},outline-show-children}
 Expose all direct children of the subtree.  With a numeric prefix argument N,
 expose all children down to level N@.
 @orgcmd{C-c C-x b,org-tree-to-indirect-buffer}
-Show the current subtree in an indirect buffer@footnote{The indirect
-buffer
-@ifinfo
-(@pxref{Indirect Buffers,,,emacs,GNU Emacs Manual})
-@end ifinfo
-@ifnotinfo
-(see the Emacs manual for more information about indirect buffers)
-@end ifnotinfo
-will contain the entire buffer, but will be narrowed to the current
-tree.  Editing the indirect buffer will also change the original buffer,
-but without affecting visibility in that buffer.}.  With a numeric
-prefix argument N, go up to level N and then take that tree.  If N is
-negative then go up that many levels.  With a @kbd{C-u} prefix, do not remove
-the previously used indirect buffer.
+Show the current subtree in an indirect buffer@footnote{The indirect buffer
+(@pxref{Indirect Buffers,,,emacs,GNU Emacs Manual}) will contain the entire
+buffer, but will be narrowed to the current tree.  Editing the indirect
+buffer will also change the original buffer, but without affecting visibility
+in that buffer.}.  With a numeric prefix argument N, go up to level N and
+then take that tree.  If N is negative then go up that many levels.  With a
+@kbd{C-u} prefix, do not remove the previously used indirect buffer.
 @orgcmd{C-c C-x v,org-copy-visible}
 Copy the @i{visible} text in the region into the kill ring.
 @end table
 
-@menu
-* Initial visibility::          Setting the initial visibility state
-* Catching invisible edits::    Preventing mistakes when editing invisible parts
-@end menu
-
-@node Initial visibility, Catching invisible edits, Global and local cycling, Visibility cycling
+@node Initial visibility
 @subsection Initial visibility
 
 @cindex visibility, initialize
@@ -1366,14 +1337,10 @@ following lines anywhere in the buffer:
 #+STARTUP: showeverything
 @end example
 
-The startup visibility options are ignored when the file is open for the
-first time during the agenda generation: if you want the agenda to honor
-the startup visibility, set @code{org-agenda-inhibit-startup} to @code{nil}.
-
 @cindex property, VISIBILITY
 @noindent
 Furthermore, any entries with a @samp{VISIBILITY} property (@pxref{Properties
-and Columns}) will get their visibility adapted accordingly.  Allowed values
+and columns}) will get their visibility adapted accordingly.  Allowed values
 for this property are @code{folded}, @code{children}, @code{content}, and
 @code{all}.
 
@@ -1384,7 +1351,7 @@ requested by startup options and @samp{VISIBILITY} properties in individual
 entries.
 @end table
 
-@node Catching invisible edits,  , Initial visibility, Visibility cycling
+@node Catching invisible edits
 @subsection Catching invisible edits
 
 @vindex org-catch-invisible-edits
@@ -1395,7 +1362,7 @@ confused on what has been edited and how to undo the mistake.  Setting
 docstring of this option on how Org should catch invisible edits and process
 them.
 
-@node Motion, Structure editing, Visibility cycling, Document Structure
+@node Motion
 @section Motion
 @cindex motion, between headlines
 @cindex jumping, to headlines
@@ -1403,9 +1370,9 @@ them.
 The following commands jump to other headlines in the buffer.
 
 @table @asis
-@orgcmd{C-c C-n,outline-next-visible-heading}
+@orgcmd{C-c C-n,org-next-visible-heading}
 Next heading.
-@orgcmd{C-c C-p,outline-previous-visible-heading}
+@orgcmd{C-c C-p,org-previous-visible-heading}
 Previous heading.
 @orgcmd{C-c C-f,org-forward-same-level}
 Next heading same level.
@@ -1435,7 +1402,7 @@ q            @r{Quit}
 See also the option @code{org-goto-interface}.
 @end table
 
-@node Structure editing, Sparse trees, Motion, Document Structure
+@node Structure editing
 @section Structure editing
 @cindex structure editing
 @cindex headline, promotion and demotion
@@ -1451,24 +1418,23 @@ See also the option @code{org-goto-interface}.
 @table @asis
 @orgcmd{M-@key{RET},org-insert-heading}
 @vindex org-M-RET-may-split-line
-Insert a new heading/item with the same level than the one at point.
-If the cursor is in a plain list item, a new item is created
-(@pxref{Plain lists}).  To prevent this behavior in lists, call the
-command with a prefix argument.  When this command is used in the
-middle of a line, the line is split and the rest of the line becomes
-the new item or headline@footnote{If you do not want the line to be
-split, customize the variable @code{org-M-RET-may-split-line}.}.  If
-the command is used at the @emph{beginning} of a headline, the new
-headline is created before the current line.  If the command is used
-at the @emph{end} of a folded subtree (i.e., behind the ellipses at
-the end of a headline), then a headline will be
-inserted after the end of the subtree.  Calling this command with
-@kbd{C-u C-u} will unconditionally respect the headline's content and
-create a new item at the end of the parent subtree.
+Insert a new heading/item with the same level as the one at point.
+
+If the command is used at the @emph{beginning} of a line, and if there is
+a heading or a plain list item (@pxref{Plain lists}) at point, the new
+heading/item is created @emph{before} the current line.  When used at the
+beginning of a regular line of text, turn that line into a heading.
+
+When this command is used in the middle of a line, the line is split and the
+rest of the line becomes the new item or headline.  If you do not want the
+line to be split, customize @code{org-M-RET-may-split-line}.
+
+Calling the command with a @kbd{C-u} prefix unconditionally inserts a new
+heading at the end of the current subtree, thus preserving its contents.
+With a double @kbd{C-u C-u} prefix, the new heading is created at the end of
+the parent subtree instead.
 @orgcmd{C-@key{RET},org-insert-heading-respect-content}
-Just like @kbd{M-@key{RET}}, except when adding a new heading below the
-current heading, the new heading is placed after the body instead of before
-it.  This command works from anywhere in the entry.
+Insert a new heading at the end of the current subtree.
 @orgcmd{M-S-@key{RET},org-insert-todo-heading}
 @vindex org-treat-insert-todo-heading-as-state-change
 Insert new TODO entry with same level as current heading.  See also the
@@ -1572,33 +1538,29 @@ inside a table (@pxref{Tables}), the Meta-Cursor keys have different
 functionality.
 
 
-@node Sparse trees, Plain lists, Structure editing, Document Structure
+@node Sparse trees
 @section Sparse trees
 @cindex sparse trees
 @cindex trees, sparse
 @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
+@vindex org-show-context-detail
 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
 visible along with the headline structure above it@footnote{See also the
-variables @code{org-show-hierarchy-above}, @code{org-show-following-heading},
-@code{org-show-siblings}, and @code{org-show-entry-below} for detailed
-control on how much context is shown around each match.}.  Just try it out
-and you will see immediately how it works.
+variable @code{org-show-context-detail} to decide how much context is shown
+around each match.}.  Just try it out and you will see immediately how it
+works.
 
-Org mode contains several commands creating such trees, all these
+Org mode contains several commands for creating such trees, all these
 commands can be accessed through a dispatcher:
 
 @table @asis
 @orgcmd{C-c /,org-sparse-tree}
 This prompts for an extra key to select a sparse-tree creating command.
-@orgcmd{C-c / r,org-occur}
+@orgcmdkkc{C-c / r,C-c / /,org-occur}
 @vindex org-remove-highlights-with-change
 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
@@ -1639,13 +1601,11 @@ tags, or properties and will be discussed later in this manual.
 @cindex printing sparse trees
 @cindex visible text, printing
 To print a sparse tree, you can use the Emacs command
-@code{ps-print-buffer-with-faces} which does not print invisible parts
-of the document @footnote{This does not work under XEmacs, because
-XEmacs uses selective display for outlining, not text properties.}.
-Or you can use @kbd{C-c C-e C-v} to export only the visible part of
-the document and print the resulting file.
+@code{ps-print-buffer-with-faces} which does not print invisible parts of the
+document.  Or you can use @kbd{C-c C-e C-v} to export only the visible part
+of the document and print the resulting file.
 
-@node Plain lists, Drawers, Sparse trees, Document Structure
+@node Plain lists
 @section Plain lists
 @cindex plain lists
 @cindex lists, plain
@@ -1714,25 +1674,23 @@ In that case, all items are closed.  Here is an example:
    But in the end, no individual scenes matter but the film as a whole.
    Important actors in this film are:
    - @b{Elijah Wood} :: He plays Frodo
-   - @b{Sean Austin} :: He plays Sam, Frodo's friend.  I still remember
+   - @b{Sean Astin} :: He plays Sam, Frodo's friend.  I still remember
      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 deal with
-them correctly@footnote{Org only changes the filling settings for Emacs.  For
-XEmacs, you should use Kyle E. Jones' @file{filladapt.el}.  To turn this on,
-put into @file{.emacs}: @code{(require 'filladapt)}}, and by exporting them
-properly (@pxref{Exporting}).  Since indentation is what governs the
-structure of these lists, many structural constructs like @code{#+BEGIN_...}
-blocks can be indented to signal that they belong to a particular item.
+them correctly, and by exporting them properly (@pxref{Exporting}).  Since
+indentation is what governs the structure of these lists, many structural
+constructs like @code{#+BEGIN_...} blocks can be indented to signal that they
+belong to a particular item.
 
 @vindex org-list-demote-modify-bullet
 @vindex org-list-indent-offset
 If you find that using a different bullet for a sub-list (than that used for
 the current list-level) improves readability, customize the variable
 @code{org-list-demote-modify-bullet}.  To get a greater difference of
-indentation between items and theirs sub-items, customize
+indentation between items and their sub-items, customize
 @code{org-list-indent-offset}.
 
 @vindex org-list-automatic-rules
@@ -1824,10 +1782,10 @@ Cycle the entire list level through the different itemize/enumerate bullets
 (@samp{-}, @samp{+}, @samp{*}, @samp{1.}, @samp{1)}) or a subset of them,
 depending on @code{org-plain-list-ordered-item-terminator}, the type of list,
 and its indentation.  With a numeric prefix argument N, select the Nth bullet
-from this list.  If there is an active region when calling this, selected
-text will be changed into an item.  With a prefix argument, all lines will be
-converted to list items.  If the first line already was a list item, any item
-marker will be removed from the list.  Finally, even without an active
+from this list.  If there is an active region when calling this, all selected
+lines are converted to list items.  With a prefix argument, selected text is
+changed into a single item.  If the first line already was a list item, any
+item marker 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 *
@@ -1853,20 +1811,17 @@ numerically, alphabetically, by time, by checked status for check lists,
 or by a custom function.
 @end table
 
-@node Drawers, Blocks, Plain lists, Document Structure
+@node Drawers
 @section Drawers
 @cindex drawers
-@cindex #+DRAWERS
 @cindex visibility cycling, drawers
 
-@vindex org-drawers
 @cindex org-insert-drawer
 @kindex C-c C-x d
 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 option @code{org-drawers}@footnote{You
-can define additional drawers on a per-file basis with a line like
-@code{#+DRAWERS: HIDDEN STATE}}.  Drawers look like this:
+normally don't want to see it.  For this, Org mode has @emph{drawers}.  They
+can contain anything but a headline and another drawer.  Drawers look like
+this:
 
 @example
 ** This is a headline
@@ -1880,18 +1835,21 @@ can define additional drawers on a per-file basis with a line like
 You can interactively insert drawers at point by calling
 @code{org-insert-drawer}, which is bound to @key{C-c C-x d}.  With an active
 region, this command will put the region inside the drawer.  With a prefix
-argument, this command calls @code{org-insert-property-drawer} and add a
-property drawer right below the current headline.  Completion over drawer
-keywords is also possible using @key{M-TAB}.
+argument, this command calls @code{org-insert-property-drawer} and add
+a property drawer right below the current headline.  Completion over drawer
+keywords is also possible using @kbd{M-@key{TAB}}@footnote{Many desktops
+intercept @kbd{M-@key{TAB}} to switch windows.  Use @kbd{C-M-i} or
+@kbd{@key{ESC} @key{TAB}} instead for completion (@pxref{Completion}).}.
 
 Visibility cycling (@pxref{Visibility cycling}) on the headline will hide and
 show the entry, but keep the drawer collapsed to a single line.  In order to
 look inside the drawer, you need to move the cursor to the drawer line and
 press @key{TAB} there.  Org mode uses the @code{PROPERTIES} drawer for
-storing properties (@pxref{Properties and Columns}), and you can also arrange
+storing properties (@pxref{Properties and columns}), and you can also arrange
 for state change notes (@pxref{Tracking TODO state changes}) and clock times
 (@pxref{Clocking work time}) to be stored in a drawer @code{LOGBOOK}.  If you
-want to store a quick note in the LOGBOOK drawer, in a similar way to state changes, use
+want to store a quick note in the LOGBOOK drawer, in a similar way to state
+changes, use
 
 @table @kbd
 @kindex C-c C-z
@@ -1900,12 +1858,13 @@ Add a time-stamped note to the LOGBOOK drawer.
 @end table
 
 @vindex org-export-with-drawers
+@vindex org-export-with-properties
 You can select the name of the drawers which should be exported with
 @code{org-export-with-drawers}.  In that case, drawer contents will appear in
-export output.  Property drawers are not affected by this variable and are
-never exported.
+export output.  Property drawers are not affected by this variable: configure
+@code{org-export-with-properties} instead.
 
-@node Blocks, Footnotes, Drawers, Document Structure
+@node Blocks
 @section Blocks
 
 @vindex org-hide-block-startup
@@ -1924,18 +1883,17 @@ or on a per-file basis by using
 #+STARTUP: nohideblocks
 @end example
 
-@node Footnotes, Orgstruct mode, Blocks, Document Structure
+@node Footnotes
 @section Footnotes
 @cindex footnotes
 
-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 larger document, not only for one-off documents like emails.
+Org mode supports the creation of footnotes.
 
 A footnote is started by a footnote marker in square brackets in column 0, no
 indentation allowed.  It ends at the next footnote definition, headline, or
 after two consecutive empty lines.  The footnote reference is simply the
-marker in square brackets, inside text.  For example:
+marker in square brackets, inside text.  Markers always start with
+@code{fn:}.  For example:
 
 @example
 The Org homepage[fn:1] now looks a lot better than it used to.
@@ -1944,23 +1902,16 @@ The Org homepage[fn:1] now looks a lot better than it used to.
 @end example
 
 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
-@LaTeX{}}).  Here are the valid references:
+optional inline definition.  Here are the valid references:
 
 @table @code
-@item [1]
-A plain numeric footnote marker.  Compatible with @file{footnote.el}, but not
-recommended because something 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]
+@item [fn::This is the inline definition of this footnote]
 A @LaTeX{}-like anonymous footnote where the definition is given directly at the
 reference point.
-@item [fn:name: a definition]
+@item [fn:name:a definition]
 An inline definition of a footnote, which also specifies a name for the note.
 Since Org allows multiple references to the same note, you can then use
 @code{[fn:name]} to create additional references.
@@ -2007,9 +1958,7 @@ r   @r{Renumber the simple @code{fn:N} footnotes.  Automatic renumbering}
 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}
-    @r{meant to be the final step before finishing a document (e.g., sending}
-    @r{off an email).}
+    @r{in sequence.  The references will then also be numbers.}
 d   @r{Delete the footnote at point, and all definitions of and references}
     @r{to it.}
 @end example
@@ -2029,9 +1978,17 @@ location with a prefix argument, offer the same menu as @kbd{C-c C-x f}.
 @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.
+
+@vindex org-edit-footnote-reference
+@kindex C-c '
+@item C-c '
+@item C-c '
+Edit the footnote definition corresponding to the reference at point in
+a seperate window.  The window can be closed by pressing @kbd{C-c '}.
+
 @end table
 
-@node Orgstruct mode, Org syntax, Footnotes, Document Structure
+@node Orgstruct mode
 @section The Orgstruct minor mode
 @cindex Orgstruct mode
 @cindex minor mode for structure editing
@@ -2066,7 +2023,7 @@ Lisp files, you will be able to fold and unfold headlines in Emacs Lisp
 commented lines.  Some commands like @code{org-demote} are disabled when the
 prefix is set, but folding/unfolding will work correctly.
 
-@node Org syntax,  , Orgstruct mode, Document Structure
+@node Org syntax
 @section Org syntax
 @cindex Org syntax
 
@@ -2088,7 +2045,11 @@ abstract structure.  The export engine relies on the information stored in
 this list.  Most interactive commands (e.g., for structure editing) also
 rely on the syntactic meaning of the surrounding context.
 
-@node Tables, Hyperlinks, Document Structure, Top
+@cindex syntax checker
+@cindex linter
+You can check syntax in your documents using @code{org-lint} command.
+
+@node Tables
 @chapter Tables
 @cindex tables
 @cindex editing tables
@@ -2106,7 +2067,7 @@ calculations are supported using the Emacs @file{calc} package
 * Org-Plot::                    Plotting from org tables
 @end menu
 
-@node Built-in table editor, Column width and alignment, Tables, Tables
+@node Built-in table editor
 @section The built-in table editor
 @cindex table editor, built-in
 
@@ -2155,12 +2116,13 @@ unpredictable for you, configure the options
 @table @kbd
 @tsubheading{Creation and conversion}
 @orgcmd{C-c |,org-table-create-or-convert-from-region}
-Convert the active region to table.  If every line contains at least one
+Convert the active region to a table.  If every line contains at least one
 TAB character, the function assumes that the material is tab separated.
 If every line contains a comma, comma-separated values (CSV) are assumed.
 If not, lines are split at whitespace into fields.  You can use a prefix
 argument to force a specific separator: @kbd{C-u} forces CSV, @kbd{C-u
-C-u} forces TAB, and a numeric argument N indicates that at least N
+C-u} forces TAB, @kbd{C-u C-u C-u} will prompt for a regular expression to
+match the separator, and a numeric argument N indicates that at least N
 consecutive spaces, or alternatively a TAB will be the separator.
 @*
 If there is no active region, this command creates an empty Org
@@ -2171,7 +2133,10 @@ table.  But it is easier just to start typing, like
 @orgcmd{C-c C-c,org-table-align}
 Re-align the table and don't move to another field.
 @c
-@orgcmd{<TAB>,org-table-next-field}
+@orgcmd{C-c SPC,org-table-blank-field}
+Blank the field at point.
+@c
+@orgcmd{TAB,org-table-next-field}
 Re-align the table, move to the next field.  Creates a new row if
 necessary.
 @c
@@ -2224,8 +2189,10 @@ point is before the first column, you will be prompted for the sorting
 column.  If there is an active region, the mark specifies the first line
 and the sorting column, while point should be in the last line to be
 included into the sorting.  The command prompts for the sorting type
-(alphabetically, numerically, or by time).  When called with a prefix
-argument, alphabetic sorting will be case-sensitive.
+(alphabetically, numerically, or by time).  You can sort in normal or
+reverse order.  You can also supply your own key extraction and comparison
+functions.  When called with a prefix argument, alphabetic sorting will be
+case-sensitive.
 
 @tsubheading{Regions}
 @orgcmd{C-c C-x M-w,org-table-copy-region}
@@ -2322,7 +2289,7 @@ 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 Column width and alignment, Column groups, Built-in table editor, Tables
+@node Column width and alignment
 @section Column width and alignment
 @cindex narrow columns in tables
 @cindex alignment in tables
@@ -2333,11 +2300,11 @@ of number-like versus non-number fields in the column.
 
 Sometimes a single field or a few fields need to carry more text, leading to
 inconveniently wide columns.  Or maybe you want to make a table with several
-columns having a fixed width, regardless of content.  To set@footnote{This
-feature does not work on XEmacs.} the width of a column, one field anywhere
-in the column may contain just the string @samp{<N>} where @samp{N} is an
-integer specifying the width of the column in characters.  The next re-align
-will then set the width of this column to this value.
+columns having a fixed width, regardless of content.  To set the width of
+a column, one field anywhere in the column may contain just the string
+@samp{<N>} where @samp{N} is an integer specifying the width of the column in
+characters.  The next re-align will then set the width of this column to this
+value.
 
 @example
 @group
@@ -2374,7 +2341,7 @@ on a per-file basis with:
 @end example
 
 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 can use @samp{<r>},
+to the right and of string-rich columns to the left, you can use @samp{<r>},
 @samp{<c>}@footnote{Centering does not work inside Emacs, but it does have an
 effect when exporting to HTML.} or @samp{<l>} in a similar fashion.  You may
 also combine alignment and field width like this: @samp{<r10>}.
@@ -2382,30 +2349,29 @@ also combine alignment and field width like this: @samp{<r10>}.
 Lines which only contain these formatting cookies will be removed
 automatically when exporting the document.
 
-@node Column groups, Orgtbl mode, Column width and alignment, Tables
+@node Column groups
 @section Column groups
 @cindex grouping columns in tables
 
-When Org exports tables, it does so by default without vertical
-lines because that is visually more satisfying in general.  Occasionally
-however, vertical lines can be useful to structure a table into groups
-of columns, much like horizontal lines can do for groups of rows.  In
-order to specify column groups, you can use a special row where the
-first field contains only @samp{/}.  The further fields can either
-contain @samp{<} to indicate that this column should start a group,
-@samp{>} to indicate the end of a column, or @samp{<>} (no space between @samp{<}
-and @samp{>}) to make a column
-a group of its own.  Boundaries between column groups will upon export be
-marked with vertical lines.  Here is an example:
-
-@example
-| N | N^2 | N^3 | N^4 | sqrt(n) | sqrt[4](N) |
-|---+-----+-----+-----+---------+------------|
-| / |   < |     |   > |       < |          > |
-| 1 |   1 |   1 |   1 |       1 |          1 |
-| 2 |   4 |   8 |  16 |  1.4142 |     1.1892 |
-| 3 |   9 |  27 |  81 |  1.7321 |     1.3161 |
-|---+-----+-----+-----+---------+------------|
+When Org exports tables, it does so by default without vertical lines because
+that is visually more satisfying in general.  Occasionally however, vertical
+lines can be useful to structure a table into groups of columns, much like
+horizontal lines can do for groups of rows.  In order to specify column
+groups, you can use a special row where the first field contains only
+@samp{/}.  The further fields can either contain @samp{<} to indicate that
+this column should start a group, @samp{>} to indicate the end of a group, or
+@samp{<>} (no space between @samp{<} and @samp{>}) to make a column a group
+of its own.  Boundaries between column groups will upon export be marked with
+vertical lines.  Here is an example:
+
+@example
+| N | N^2 | N^3 | N^4 | ~sqrt(n)~ | ~sqrt[4](N)~ |
+|---+-----+-----+-----+-----------+--------------|
+| / |   < |     |   > |         < |            > |
+| 1 |   1 |   1 |   1 |         1 |            1 |
+| 2 |   4 |   8 |  16 |    1.4142 |       1.1892 |
+| 3 |   9 |  27 |  81 |    1.7321 |       1.3161 |
+|---+-----+-----+-----+-----------+--------------|
 #+TBLFM: $2=$1^2::$3=$1^3::$4=$1^4::$5=sqrt($1)::$6=sqrt(sqrt(($1)))
 @end example
 
@@ -2418,7 +2384,7 @@ every vertical line you would like to have:
 | /  | <   |     |     | <       |            |
 @end example
 
-@node Orgtbl mode, The spreadsheet, Column groups, Tables
+@node Orgtbl mode
 @section The Orgtbl minor mode
 @cindex Orgtbl mode
 @cindex minor mode for tables
@@ -2439,7 +2405,7 @@ construct @LaTeX{} 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
 @section The spreadsheet
 @cindex calculations, in tables
 @cindex spreadsheet capabilities
@@ -2468,7 +2434,7 @@ formula, moving these references by arrow keys
 * Advanced features::           Field and column names, parameters and automatic recalc
 @end menu
 
-@node References, Formula syntax for Calc, The spreadsheet, The spreadsheet
+@node References
 @subsection References
 @cindex references
 
@@ -2554,7 +2520,7 @@ format at least for the first field (i.e the reference must start with
 @example
 $1..$3        @r{first three fields in the current row}
 $P..$Q        @r{range, using column names (see under Advanced)}
-$<<<..$>>     @r{start in third column, continue to the one but last}
+$<<<..$>>     @r{start in third column, continue to the last but one}
 @@2$1..@@4$3    @r{6 fields between these two fields (same as @code{A2..C4})}
 @@-1$-2..@@-1   @r{3 fields in the row above, starting from 2 columns on the left}
 @@I..II        @r{between first and second hline, short for @code{@@I..@@II}}
@@ -2572,21 +2538,28 @@ for Calc}.
 @cindex row, of field coordinates
 @cindex column, of field coordinates
 
-For Calc formulas and Lisp formulas @code{@@#} and @code{$#} can be used to
-get the row or column number of the field where the formula result goes.
-The traditional Lisp formula equivalents are @code{org-table-current-dline}
-and @code{org-table-current-column}.  Examples:
+One of the very first actions during evaluation of Calc formulas and Lisp
+formulas is to substitute @code{@@#} and @code{$#} in the formula with the
+row or column number of the field where the current result will go to.  The
+traditional Lisp formula equivalents are @code{org-table-current-dline} and
+@code{org-table-current-column}.  Examples:
 
-@example
-if(@@# % 2, $#, string(""))   @r{column number on odd lines only}
-$3 = remote(FOO, @@@@#$2)      @r{copy column 2 from table FOO into}
-                             @r{column 3 of the current table}
-@end example
+@table @code
+@item if(@@# % 2, $#, string(""))
+Insert column number on odd rows, set field to empty on even rows.
+@item $2 = '(identity remote(FOO, @@@@#$1))
+Copy text or values of each row of column 1 of the table named @code{FOO}
+into column 2 of the current table.
+@item @@3 = 2 * remote(FOO, @@1$$#)
+Insert the doubled value of each column of row 1 of the table named
+@code{FOO} into row 3 of the current table.
+@end table
 
-@noindent For the second example, table FOO must have at least as many rows
-as the current table.  Note that this is inefficient@footnote{The computation time scales as
-O(N^2) because table FOO is parsed for each field to be copied.} for large
-number of rows.
+@noindent For the second/third example, the table named @code{FOO} must have
+at least as many rows/columns as the current table.  Note that this is
+inefficient@footnote{The computation time scales as O(N^2) because the table
+named @code{FOO} is parsed for each field to be read.} for large number of
+rows/columns.
 
 @subsubheading Named references
 @cindex named references
@@ -2608,7 +2581,7 @@ line like
 @noindent
 @vindex constants-unit-system
 @pindex constants.el
-Also properties (@pxref{Properties and Columns}) can be used as
+Also properties (@pxref{Properties and columns}) can be used as
 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
@@ -2647,7 +2620,13 @@ table in that entry.  REF is an absolute field or range reference as
 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
+Indirection of NAME-OR-ID: When NAME-OR-ID has the format @code{@@ROW$COLUMN}
+it will be substituted with the name or ID found in this field of the current
+table.  For example @code{remote($1, @@>$2)} => @code{remote(year_2013,
+@@>$1)}.  The format @code{B3} is not supported because it can not be
+distinguished from a plain table name or ID.
+
+@node Formula syntax for Calc
 @subsection Formula syntax for Calc
 @cindex formula syntax, Calc
 @cindex syntax, of formulas
@@ -2762,7 +2741,7 @@ should be padded with 0 to the full size.
 You can add your own Calc functions defined in Emacs Lisp with @code{defmath}
 and use them in formula syntax for Calc.
 
-@node Formula syntax for Lisp, Durations and time values, Formula syntax for Calc, The spreadsheet
+@node Formula syntax for Lisp
 @subsection Emacs Lisp forms as formulas
 @cindex Lisp forms, as table formulas
 
@@ -2798,7 +2777,7 @@ Add columns 1 and 2, equivalent to Calc's @code{$1+$2}.
 Compute the sum of columns 1 to 4, like Calc's @code{vsum($1..$4)}.
 @end table
 
-@node Durations and time values, Field and range formulas, Formula syntax for Lisp, The spreadsheet
+@node Durations and time values
 @subsection Durations and time values
 @cindex Duration, computing
 @cindex Time, computing
@@ -2817,7 +2796,7 @@ formulas or Elisp formulas:
 @end group
 @end example
 
-Input duration values must be of the form @code{[HH:MM[:SS]}, where seconds
+Input duration values must be of the form @code{HH:MM[:SS]}, where seconds
 are optional.  With the @code{T} flag, computed durations will be displayed
 as @code{HH:MM:SS} (see the first formula above).  With the @code{t} flag,
 computed durations will be displayed according to the value of the option
@@ -2828,7 +2807,7 @@ example above).
 Negative duration values can be manipulated as well, and integers will be
 considered as seconds in addition and subtraction.
 
-@node Field and range formulas, Column formulas, Durations and time values, The spreadsheet
+@node Field and range formulas
 @subsection Field and range formulas
 @cindex field formula
 @cindex range formula
@@ -2845,13 +2824,13 @@ current field will be replaced with the result.
 Formulas are stored in a special line starting with @samp{#+TBLFM:} directly
 below the table.  If you type 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,
+inserting/deleting/swapping columns 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.  To avoid this from
-happening, in particular in range references, anchor ranges at the table
-borders (using @code{@@<}, @code{@@>}, @code{$<}, @code{$>}), or at hlines
-using the @code{@@I} notation.  Automatic adaptation of field references does
-of course not happen if you edit the table structure with normal editing
+modified in order to still reference the same field.  To avoid this, in
+particular in range references, anchor ranges at the table borders (using
+@code{@@<}, @code{@@>}, @code{$<}, @code{$>}), or at hlines using the
+@code{@@I} notation.  Automatic adaptation of field references does of course
+not happen if you edit the table structure with normal editing
 commands---then you must fix the equations yourself.
 
 Instead of typing an equation into the field, you may also use the following
@@ -2884,7 +2863,7 @@ can also be used to assign a formula to some but not all fields in a row.
 Named field, see @ref{Advanced features}.
 @end table
 
-@node Column formulas, Lookup functions, Field and range formulas, The spreadsheet
+@node Column formulas
 @subsection Column formulas
 @cindex column formula
 @cindex formula, for table column
@@ -2908,7 +2887,7 @@ and the current field replaced with the result.  If the field contains only
 @samp{=}, the previously stored formula for this column is used.  For each
 column, Org will only remember the most recently used formula.  In the
 @samp{#+TBLFM:} line, column formulas will look like @samp{$4=$1+$2}.  The
-left-hand side of a column formula can not be the name of column, it must be
+left-hand side of a column formula cannot be the name of column, it must be
 the numeric column reference or @code{$>}.
 
 Instead of typing an equation into the field, you may also use the
@@ -2923,7 +2902,7 @@ stores it.  With a numeric prefix argument(e.g., @kbd{C-5 C-c =}) the command
 will apply it to that many consecutive fields in the current column.
 @end table
 
-@node Lookup functions, Editing and debugging formulas, Column formulas, The spreadsheet
+@node Lookup functions
 @subsection Lookup functions
 @cindex lookup functions in tables
 @cindex table lookup functions
@@ -2967,7 +2946,7 @@ matching cells, rank results, group data etc.  For practical examples
 see @uref{http://orgmode.org/worg/org-tutorials/org-lookups.html, this
 tutorial on Worg}.
 
-@node Editing and debugging formulas, Updating the table, Lookup functions, The spreadsheet
+@node Editing and debugging formulas
 @subsection Editing and debugging formulas
 @cindex formula editing
 @cindex editing, of table formulas
@@ -3026,7 +3005,9 @@ 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.
 @orgcmd{M-@key{TAB},lisp-complete-symbol}
-Complete Lisp symbols, just like in Emacs Lisp mode.
+Complete Lisp symbols, just like in Emacs Lisp mode.@footnote{Many desktops
+intercept @kbd{M-@key{TAB}} to switch windows.  Use @kbd{C-M-i} or
+@kbd{@key{ESC} @key{TAB}} instead for completion (@pxref{Completion}).}
 @kindex S-@key{up}
 @kindex S-@key{down}
 @kindex S-@key{left}
@@ -3118,7 +3099,7 @@ turn on formula debugging in the @code{Tbl} menu and repeat the
 calculation, for example by pressing @kbd{C-u C-u C-c = @key{RET}} in a
 field.  Detailed information will be displayed.
 
-@node Updating the table, Advanced features, Editing and debugging formulas, The spreadsheet
+@node Updating the table
 @subsection Updating the table
 @cindex recomputing table fields
 @cindex updating, table
@@ -3155,7 +3136,7 @@ Iterate all tables in the current buffer, in order to converge table-to-table
 dependencies.
 @end table
 
-@node Advanced features,  , Updating the table, The spreadsheet
+@node Advanced features
 @subsection Advanced features
 
 If you want the recalculation of fields to happen automatically, or if you
@@ -3260,17 +3241,23 @@ functions.
 @end group
 @end example
 
-@node Org-Plot,  , The spreadsheet, Tables
+@node 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
-using @file{Gnuplot} @uref{http://www.gnuplot.info/} and @file{gnuplot-mode}
+Org-Plot can produce graphs of information stored in org tables, either
+graphically or in ASCII-art.
+
+@subheading Graphical plots using @file{Gnuplot}
+
+Org-Plot produces 2D and 3D graphs using @file{Gnuplot}
+@uref{http://www.gnuplot.info/} and @file{gnuplot-mode}
 @uref{http://xafs.org/BruceRavel/GnuplotMode}.  To see 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.
+call @kbd{C-c " g} or @kbd{M-x org-plot/gnuplot @key{RET}} on the following
+table.
 
 @example
 @group
@@ -3288,8 +3275,8 @@ call @code{org-plot/gnuplot} on the following table.
 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
-for a complete list of Org-plot options.  For more information and examples
-see the Org-plot tutorial at
+for a complete list of Org-plot options.  The @code{#+PLOT:} lines are
+optional.  For more information and examples see the Org-plot tutorial at
 @uref{http://orgmode.org/worg/org-tutorials/org-plot.html}.
 
 @subsubheading Plot Options
@@ -3345,7 +3332,48 @@ may still want to specify the plot type, as that can impact the content of
 the data file.
 @end table
 
-@node Hyperlinks, TODO Items, Tables, Top
+@subheading ASCII bar plots
+
+While the cursor is on a column, typing @kbd{C-c " a} or
+@kbd{M-x orgtbl-ascii-plot @key{RET}} create a new column containing an
+ASCII-art bars plot.  The plot is implemented through a regular column
+formula.  When the source column changes, the bar plot may be updated by
+refreshing the table, for example typing @kbd{C-u C-c *}.
+
+@example
+@group
+| Sede          | Max cites |              |
+|---------------+-----------+--------------|
+| Chile         |    257.72 | WWWWWWWWWWWW |
+| Leeds         |    165.77 | WWWWWWWh     |
+| Sao Paolo     |     71.00 | WWW;         |
+| Stockholm     |    134.19 | WWWWWW:      |
+| Morelia       |    257.56 | WWWWWWWWWWWH |
+| Rochefourchat |      0.00 |              |
+#+TBLFM: $3='(orgtbl-ascii-draw $2 0.0 257.72 12)
+@end group
+@end example
+
+The formula is an elisp call:
+@lisp
+(orgtbl-ascii-draw COLUMN MIN MAX WIDTH)
+@end lisp
+
+@table @code
+@item COLUMN
+  is a reference to the source column.
+
+@item MIN MAX
+  are the minimal and maximal values displayed.  Sources values
+  outside this range are displayed as @samp{too small}
+  or @samp{too large}.
+
+@item WIDTH
+  is the width in characters of the bar-plot.  It defaults to @samp{12}.
+
+@end table
+
+@node Hyperlinks
 @chapter Hyperlinks
 @cindex hyperlinks
 
@@ -3363,7 +3391,7 @@ other files, Usenet articles, emails, and much more.
 * Custom searches::             When the default search is not enough
 @end menu
 
-@node Link format, Internal links, Hyperlinks, Hyperlinks
+@node Link format
 @section Link format
 @cindex link format
 @cindex format, of links
@@ -3394,7 +3422,7 @@ missing bracket hides the link internals again.  To show the
 internal structure of all links, use the menu entry
 @code{Org->Hyperlinks->Literal links}.
 
-@node Internal links, External links, Link format, Hyperlinks
+@node Internal links
 @section Internal links
 @cindex internal links
 @cindex links, internal
@@ -3419,8 +3447,8 @@ a @i{dedicated target}: the same string in double angular brackets, like
 @cindex #+NAME
 If no dedicated target exists, the link will then try to match the exact name
 of an element within the buffer.  Naming is done with the @code{#+NAME}
-keyword, which has to be put the line before the element it refers to, as in
-the following example
+keyword, which has to be put in the line before the element it refers to, as
+in the following example
 
 @example
 #+NAME: My Target
@@ -3465,7 +3493,7 @@ earlier.
 * Radio targets::               Make targets trigger links in plain text
 @end menu
 
-@node Radio targets,  , Internal links, Internal links
+@node Radio targets
 @subsection Radio targets
 @cindex radio targets
 @cindex targets, radio
@@ -3481,7 +3509,7 @@ for radio targets only when the file is first loaded into Emacs.  To
 update the target list during editing, press @kbd{C-c C-c} with the
 cursor on or at a target.
 
-@node External links, Handling links, Internal links, Hyperlinks
+@node External links
 @section External links
 @cindex links, external
 @cindex external links
@@ -3504,42 +3532,44 @@ string followed by a colon.  There can be no space after the colon.  The
 following list shows examples for each link type.
 
 @example
-http://www.astro.uva.nl/~dominik          @r{on the web}
-doi:10.1000/182                           @r{DOI for an electronic resource}
-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:/myself@@some.where:papers/last.pdf   @r{file, path on remote machine}
-/myself@@some.where:papers/last.pdf        @r{same as above}
-file:sometextfile::NNN                    @r{file, jump to line number}
-file:projects.org                         @r{another Org file}
-file:projects.org::some words             @r{text search in Org file}@footnote{
+http://www.astro.uva.nl/~dominik             @r{on the web}
+doi:10.1000/182                              @r{DOI for an electronic resource}
+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:/ssh:myself@@some.where:papers/last.pdf  @r{file, path on remote machine}
+/ssh:myself@@some.where:papers/last.pdf       @r{same as above}
+file:sometextfile::NNN                       @r{file, jump to line number}
+file:projects.org                            @r{another Org file}
+file:projects.org::some words                @r{text search in Org file}@footnote{
 The actual behavior of the search will depend on the value of
 the option @code{org-link-search-must-match-exact-headline}.  If its value
-is @code{nil}, then a fuzzy text search will be done.  If it is t, then only the
-exact headline will be matched.  If the value is @code{'query-to-create},
-then an exact headline will be searched; if it is not found, then the user
-will be queried to create it.}
-file:projects.org::*task title            @r{heading search in Org file}
-file+sys:/path/to/file                    @r{open via OS, like double-click}
-file+emacs:/path/to/file                  @r{force opening by Emacs}
-docview:papers/last.pdf::NNN              @r{open in doc-view mode at page}
-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}
-mhe:folder                                @r{MH-E folder link}
-mhe:folder#id                             @r{MH-E message link}
-rmail:folder                              @r{RMAIL folder link}
-rmail:folder#id                           @r{RMAIL message link}
-gnus:group                                @r{Gnus group link}
-gnus:group#id                             @r{Gnus article link}
-bbdb:R.*Stallman                          @r{BBDB link (with regexp)}
-irc:/irc.com/#emacs/bob                   @r{IRC link}
-info:org#External links                   @r{Info node link}
-shell:ls *.org                            @r{A shell command}
-elisp:org-agenda                          @r{Interactive Elisp command}
-elisp:(find-file-other-frame "Elisp.org") @r{Elisp form to evaluate}
+is @code{nil}, then a fuzzy text search will be done.  If it is @code{t}, then only
+the exact headline will be matched, ignoring spaces and cookies.  If the
+value is @code{query-to-create}, then an exact headline will be searched; if
+it is not found, then the user will be queried to create it.}
+file:projects.org::*task title               @r{heading search in Org file}@footnote{
+Headline searches always match the exact headline, ignoring
+spaces and cookies.  If the headline is not found and the value of the option
+@code{org-link-search-must-match-exact-headline} is @code{query-to-create},
+then the user will be queried to create it.}
+docview:papers/last.pdf::NNN                 @r{open in doc-view mode at page}
+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}
+mhe:folder                                   @r{MH-E folder link}
+mhe:folder#id                                @r{MH-E message link}
+rmail:folder                                 @r{RMAIL folder link}
+rmail:folder#id                              @r{RMAIL message link}
+gnus:group                                   @r{Gnus group link}
+gnus:group#id                                @r{Gnus article link}
+bbdb:R.*Stallman                             @r{BBDB link (with regexp)}
+irc:/irc.com/#emacs/bob                      @r{IRC link}
+info:org#External links                      @r{Info node or index link}
+shell:ls *.org                               @r{A shell command}
+elisp:org-agenda                             @r{Interactive Elisp command}
+elisp:(find-file-other-frame "Elisp.org")    @r{Elisp form to evaluate}
 @end example
 
 @cindex VM links
@@ -3550,13 +3580,13 @@ to VM or Wanderlust messages are available when you load the corresponding
 libraries from the @code{contrib/} directory:
 
 @example
-vm:folder                                 @r{VM folder link}
-vm:folder#id                              @r{VM message link}
-vm://myself@@some.where.org/folder#id      @r{VM on remote machine}
-vm-imap:account:folder                    @r{VM IMAP folder link}
-vm-imap:account:folder#id                 @r{VM IMAP message link}
-wl:folder                                 @r{WANDERLUST folder link}
-wl:folder#id                              @r{WANDERLUST message link}
+vm:folder                                    @r{VM folder link}
+vm:folder#id                                 @r{VM message link}
+vm://myself@@some.where.org/folder#id         @r{VM on remote machine}
+vm-imap:account:folder                       @r{VM IMAP folder link}
+vm-imap:account:folder#id                    @r{VM IMAP message link}
+wl:folder                                    @r{WANDERLUST folder link}
+wl:folder#id                                 @r{WANDERLUST message link}
 @end example
 
 For customizing Org to add new link types @ref{Adding hyperlink types}.
@@ -3582,7 +3612,7 @@ 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 square brackets.
 
-@node Handling links, Using links outside Org, External links, Hyperlinks
+@node Handling links
 @section Handling links
 @cindex links, handling
 
@@ -3614,9 +3644,9 @@ will be stored.  In addition or alternatively (depending on the value of
 be created and/or used to construct a link@footnote{The library
 @file{org-id.el} must first be loaded, either through @code{org-customize} by
 enabling @code{org-id} in @code{org-modules}, or by adding @code{(require
-'org-id)} in your @file{.emacs}.}. So using this command in Org 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
+'org-id)} in your Emacs init file.}.  So using this command in Org 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}@*
@@ -3624,7 +3654,7 @@ 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}@*
+@b{Web browsers: Eww, W3 and W3M}@*
 Here the link will be the current URL, with the page title as description.
 
 @b{Contacts: BBDB}@*
@@ -3656,7 +3686,8 @@ entry referenced by the current line.
 @cindex completion, of links
 @cindex inserting links
 @vindex org-keep-stored-link-after-insertion
-Insert a link@footnote{ Note that you don't have to use this command to
+@vindex org-link-parameters
+Insert a link@footnote{Note that you don't have to use this 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 automatically
 enclosed in double brackets, and you will be asked for the optional
@@ -3679,11 +3710,12 @@ them with @key{up} and @key{down} (or @kbd{M-p/n}).
 valid link prefixes like @samp{http:} or @samp{ftp:}, including the prefixes
 defined through link abbreviations (@pxref{Link abbreviations}).  If you
 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.
+specific completion support for some link types@footnote{This works if
+a completion function is defined in the @samp{:complete} property of a link
+in @code{org-link-parameters}.}  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.
 @orgkey C-u C-c C-l
 @cindex file name completion
 @cindex completion, of file names
@@ -3729,8 +3761,8 @@ the link at point.
 @kindex mouse-1
 @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 and later, @kbd{mouse-1} will also follow a link.
+On links, @kbd{mouse-1} and @kbd{mouse-2} will open the link just as @kbd{C-c
+C-o} would.
 @c
 @kindex mouse-3
 @item mouse-3
@@ -3778,7 +3810,7 @@ to @kbd{C-n} and @kbd{C-p}
 @end lisp
 @end table
 
-@node Using links outside Org, Link abbreviations, Handling links, Hyperlinks
+@node Using links outside Org
 @section Using links outside Org
 
 You can insert and follow links that have Org syntax not only in
@@ -3791,7 +3823,7 @@ yourself):
 (global-set-key "\C-c o" 'org-open-at-point-global)
 @end lisp
 
-@node Link abbreviations, Search options, Using links outside Org, Hyperlinks
+@node Link abbreviations
 @section Link abbreviations
 @cindex link abbreviations
 @cindex abbreviation, links
@@ -3830,8 +3862,8 @@ url-encode the tag (see the example above, where we need to encode
 the URL parameter.)  Using @samp{%(my-function)} will pass the tag
 to a custom function, and replace it by the resulting string.
 
-If the replacement text don't contain any specifier, it will simply
-be appended to the string in order to create the link.
+If the replacement text doesn't contain any specifier, the tag will simply be
+appended in order to create the link.
 
 Instead of a string, you may also specify a function that will be
 called with the tag as the only argument to create the link.
@@ -3855,12 +3887,17 @@ can define them in the file with
 
 @noindent
 In-buffer completion (@pxref{Completion}) can be used after @samp{[} to
-complete link abbreviations.  You may also define a function
-@code{org-PREFIX-complete-link} that implements special (e.g., 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.
+complete link abbreviations.  You may also define a function that implements
+special (e.g., 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.  You can add a completion function to a link like this:
+
+@lisp
+(org-link-set-parameters ``type'' :complete #'some-function)
+@end lisp
+
 
-@node Search options, Custom searches, Link abbreviations, Hyperlinks
+@node Search options
 @section Search options in file links
 @cindex search option in file links
 @cindex file links, searching
@@ -3912,7 +3949,7 @@ to search the current file.  For example, @code{[[file:::find me]]} does
 a search for @samp{find me} in the current file, just as
 @samp{[[find me]]} would.
 
-@node Custom searches,  , Search options, Hyperlinks
+@node Custom searches
 @section Custom Searches
 @cindex custom search strings
 @cindex search strings, custom
@@ -3936,7 +3973,7 @@ variables for more information.  Org actually uses this mechanism
 for Bib@TeX{} database files, and you can use the corresponding code as
 an implementation example.  See the file @file{org-bibtex.el}.
 
-@node TODO Items, Tags, Hyperlinks, Top
+@node TODO items
 @chapter TODO items
 @cindex TODO items
 
@@ -3961,7 +3998,7 @@ methods to give you an overview of all the things that you have to do.
 * Checkboxes::                  Tick-off lists
 @end menu
 
-@node TODO basics, TODO extensions, TODO Items, TODO Items
+@node TODO basics
 @section Basic TODO functionality
 
 Any headline becomes a TODO item when it starts with the word
@@ -4022,7 +4059,7 @@ N, show the tree for the Nth keyword in the option @code{org-todo-keywords}.
 With two prefix arguments, find all TODO states, both un-done and done.
 @orgcmd{C-c a t,org-todo-list}
 Show the global TODO list.  Collects the TODO items (with not-DONE states)
-from all agenda files (@pxref{Agenda Views}) into a single buffer.  The new
+from all agenda files (@pxref{Agenda views}) into a single buffer.  The new
 buffer will be in @code{agenda-mode}, which provides commands to examine and
 manipulate the TODO entries from the new buffer (@pxref{Agenda commands}).
 @xref{Global TODO list}, for more information.
@@ -4035,7 +4072,7 @@ Insert a new TODO entry below the current one.
 Changing a TODO state can also trigger tag changes.  See the docstring of the
 option @code{org-todo-state-tags-triggers} for details.
 
-@node TODO extensions, Progress logging, TODO basics, TODO Items
+@node TODO extensions
 @section Extended use of TODO keywords
 @cindex extended TODO keywords
 
@@ -4059,7 +4096,7 @@ TODO items in particular (@pxref{Tags}).
 * TODO dependencies::           When one task needs to wait for others
 @end menu
 
-@node Workflow states, TODO types, TODO extensions, TODO extensions
+@node Workflow states
 @subsection TODO keywords as workflow states
 @cindex TODO workflow
 @cindex workflow states as TODO keywords
@@ -4090,7 +4127,7 @@ define many keywords, you can use in-buffer completion
 buffer.  Changing a TODO state can be logged with a timestamp, see
 @ref{Tracking TODO state changes}, for more information.
 
-@node TODO types, Multiple sets in one file, Workflow states, TODO extensions
+@node TODO types
 @subsection TODO keywords as types
 @cindex TODO types
 @cindex names as TODO keywords
@@ -4122,7 +4159,7 @@ Lucy has to do, you would use @kbd{C-3 C-c / t}.  To collect Lucy's items
 from all agenda files into a single buffer, you would use the numeric prefix
 argument as well when creating the global TODO list: @kbd{C-3 C-c a t}.
 
-@node Multiple sets in one file, Fast access to TODO states, TODO types, TODO extensions
+@node Multiple sets in one file
 @subsection Multiple keyword sets in one file
 @cindex TODO keyword sets
 
@@ -4164,14 +4201,14 @@ These keys jump from one TODO subset to the next.  In the above example,
 @kindex S-@key{left}
 @item S-@key{right}
 @itemx S-@key{left}
-@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
+@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
 @code{shift-selection-mode}.
 @end table
 
-@node Fast access to TODO states, Per-file keywords, Multiple sets in one file, TODO extensions
+@node Fast access to TODO states
 @subsection Fast access to TODO states
 
 If you would like to quickly change an entry to an arbitrary TODO state
@@ -4196,7 +4233,7 @@ state through the tags interface (@pxref{Setting tags}), in case you like to
 mingle the two concepts.  Note that this means you need to come up with
 unique keys across both sets of keywords.}
 
-@node Per-file keywords, Faces for TODO keywords, Fast access to TODO states, TODO extensions
+@node Per-file keywords
 @subsection Setting up keywords for individual files
 @cindex keyword options
 @cindex per-file keywords
@@ -4205,11 +4242,10 @@ unique keys across both sets of keywords.}
 @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
-to the file which set the keywords and interpretation for that file
-only.  For example, to set one of the two examples discussed above, you
-need one of the following lines, starting in column zero anywhere in the
-file:
+different files.  For file-local settings, you need to add special lines to
+the file which set the keywords and interpretation for that file only.  For
+example, to set one of the two examples discussed above, you need one of the
+following lines anywhere in the file:
 
 @example
 #+TODO: TODO FEEDBACK VERIFY | DONE CANCELED
@@ -4243,7 +4279,7 @@ Org mode is activated after visiting a file.  @kbd{C-c C-c} with the
 cursor in a line starting with @samp{#+} is simply restarting Org mode
 for the current buffer.}.
 
-@node Faces for TODO keywords, TODO dependencies, Per-file keywords, TODO extensions
+@node Faces for TODO keywords
 @subsection Faces for TODO keywords
 @cindex faces, for TODO keywords
 
@@ -4271,10 +4307,11 @@ special face and use that.  A string is interpreted as a color.  The option
 @code{org-faces-easy-properties} determines if that color is interpreted as a
 foreground or a background color.
 
-@node TODO dependencies,  , Faces for TODO keywords, TODO extensions
+@node TODO dependencies
 @subsection TODO dependencies
 @cindex TODO dependencies
 @cindex dependencies, of TODO states
+@cindex TODO dependencies, NOBLOCKING
 
 @vindex org-enforce-todo-dependencies
 @cindex property, ORDERED
@@ -4303,6 +4340,16 @@ example:
 ** TODO c, needs to wait for (a) and (b)
 @end example
 
+You can ensure an entry is never blocked by using the @code{NOBLOCKING}
+property:
+
+@example
+* This entry is never blocked
+  :PROPERTIES:
+  :NOBLOCKING: t
+  :END:
+@end example
+
 @table @kbd
 @orgcmd{C-c C-x o,org-toggle-ordered-property}
 @vindex org-track-ordered-property-with-tag
@@ -4319,7 +4366,7 @@ Change TODO state, circumventing any state blocking.
 @vindex org-agenda-dim-blocked-tasks
 If you set the option @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}).
+font or even made invisible in agenda views (@pxref{Agenda views}).
 
 @cindex checkboxes and TODO dependencies
 @vindex org-enforce-todo-dependencies
@@ -4333,7 +4380,7 @@ between entries in different trees or files, check out the contributed
 module @file{org-depend.el}.
 
 @page
-@node Progress logging, Priorities, TODO extensions, TODO Items
+@node Progress logging
 @section Progress logging
 @cindex progress logging
 @cindex logging, of progress
@@ -4351,7 +4398,7 @@ work time}.
 * Tracking your habits::        How consistent have you been?
 @end menu
 
-@node Closing items, Tracking TODO state changes, Progress logging, Progress logging
+@node Closing items
 @subsection Closing items
 
 The most basic logging is to keep track of @emph{when} a certain TODO
@@ -4387,7 +4434,7 @@ In the timeline (@pxref{Timeline}) and in the agenda
 display the TODO items with a @samp{CLOSED} timestamp on each day,
 giving you an overview of what has been done.
 
-@node Tracking TODO state changes, Tracking your habits, Closing items, Progress logging
+@node Tracking TODO state changes
 @subsection Tracking TODO state changes
 @cindex drawer, for state change recording
 
@@ -4470,7 +4517,7 @@ settings like @code{TODO(!)}.  For example
   :END:
 @end example
 
-@node Tracking your habits,  , Tracking TODO state changes, Progress logging
+@node Tracking your habits
 @subsection Tracking your habits
 @cindex habits
 
@@ -4506,6 +4553,10 @@ actual habit with some history:
 @example
 ** TODO Shave
    SCHEDULED: <2009-10-17 Sat .+2d/4d>
+   :PROPERTIES:
+   :STYLE:    habit
+   :LAST_REPEAT: [2009-10-19 Mon 00:36]
+   :END:
    - State "DONE"       from "TODO"       [2009-10-15 Thu]
    - State "DONE"       from "TODO"       [2009-10-12 Mon]
    - State "DONE"       from "TODO"       [2009-10-10 Sat]
@@ -4516,10 +4567,6 @@ actual habit with some history:
    - State "DONE"       from "TODO"       [2009-09-19 Sat]
    - State "DONE"       from "TODO"       [2009-09-16 Wed]
    - State "DONE"       from "TODO"       [2009-09-12 Sat]
-   :PROPERTIES:
-   :STYLE:    habit
-   :LAST_REPEAT: [2009-10-19 Mon 00:36]
-   :END:
 @end example
 
 What this habit says is: I want to shave at most every 2 days (given by the
@@ -4570,7 +4617,7 @@ temporarily be disabled and they won't appear at all.  Press @kbd{K} again to
 bring them back.  They are also subject to tag filtering, if you have habits
 which should only be done in certain contexts, for example.
 
-@node Priorities, Breaking down tasks, Progress logging, TODO Items
+@node Priorities
 @section Priorities
 @cindex priorities
 
@@ -4628,7 +4675,7 @@ priority):
 #+PRIORITIES: A C B
 @end example
 
-@node Breaking down tasks, Checkboxes, Priorities, TODO Items
+@node Breaking down tasks
 @section Breaking tasks down into subtasks
 @cindex tasks, breaking down
 @cindex statistics, for TODO items
@@ -4689,7 +4736,7 @@ Another possibility is the use of checkboxes to identify (a hierarchy of) a
 large number of subtasks (@pxref{Checkboxes}).
 
 
-@node Checkboxes,  , Breaking down tasks, TODO Items
+@node Checkboxes
 @section Checkboxes
 @cindex checkboxes
 
@@ -4698,7 +4745,7 @@ Every item in a plain list@footnote{With the exception of description
 lists.  But you can allow it by modifying @code{org-list-automatic-rules}
 accordingly.} (@pxref{Plain lists}) can be made into a checkbox by starting
 it with the string @samp{[ ]}.  This feature is similar to TODO items
-(@pxref{TODO Items}), but is more lightweight.  Checkboxes are not included
+(@pxref{TODO items}), but is more lightweight.  Checkboxes are not included
 in the global TODO list, so they are often great to split a task into a
 number of simple steps.  Or you can use them in a shopping list.  To toggle a
 checkbox, use @kbd{C-c C-c}, or use the mouse (thanks to Piotr Zielinski's
@@ -4755,11 +4802,12 @@ off a box while there are unchecked boxes above it.
 
 @table @kbd
 @orgcmd{C-c C-c,org-toggle-checkbox}
-Toggle checkbox status or (with prefix arg) checkbox presence at point.
-With a single prefix argument, add an empty checkbox or remove the current
-one@footnote{@kbd{C-u C-c C-c} on the @emph{first} item of a list with no checkbox
-will add checkboxes to the rest of the list.}.  With a double prefix argument, set it to @samp{[-]}, which is
-considered to be an intermediate state.
+Toggle checkbox status or (with prefix arg) checkbox presence at point.  With
+a single prefix argument, add an empty checkbox or remove the current
+one@footnote{@kbd{C-u C-c C-c} before the @emph{first} bullet in a list with
+no checkbox will add checkboxes to the rest of the list.}.  With a double
+prefix argument, set it to @samp{[-]}, which is considered to be an
+intermediate state.
 @orgcmd{C-c C-x C-b,org-toggle-checkbox}
 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
@@ -4770,8 +4818,10 @@ If there is an active region, toggle the first checkbox in the region
 and set all remaining boxes to the same status as the first.  With a prefix
 arg, add or remove the checkbox for all items in the region.
 @item
-If the cursor is in a headline, toggle checkboxes in the region between
-this headline and the next (so @emph{not} the entire subtree).
+If the cursor is in a headline, toggle the state of the first checkbox in the
+region between this headline and the next---so @emph{not} the entire
+subtree---and propagate this new state to all other checkboxes in the same
+area.
 @item
 If there is no active region, just toggle the checkbox at point.
 @end itemize
@@ -4795,7 +4845,7 @@ changing TODO states.  If you delete boxes/entries or add/change them by
 hand, use this command to get things back into sync.
 @end table
 
-@node Tags, Properties and Columns, TODO Items, Top
+@node Tags
 @chapter Tags
 @cindex tags
 @cindex headline tagging
@@ -4819,11 +4869,11 @@ You may specify special faces for specific tags using the option
 @menu
 * Tag inheritance::             Tags use the tree structure of the outline
 * Setting tags::                How to assign tags to a headline
-* Tag groups::                  Use one tag to search for several tags
+* Tag hierarchy::               Create a hierarchy of tags
 * Tag searches::                Searching for combinations of tags
 @end menu
 
-@node Tag inheritance, Setting tags, Tags, Tags
+@node Tag inheritance
 @section Tag inheritance
 @cindex tag inheritance
 @cindex inheritance, of tags
@@ -4842,11 +4892,11 @@ well.  For example, in the list
 @noindent
 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 just as if these tags were defined in a hypothetical
-level zero that surrounds the entire file.  Use a line like this@footnote{As
-with all these in-buffer settings, pressing @kbd{C-c C-c} activates any
-changes in the line.}:
+explicitly marked with all those tags.  You can also set tags that all
+entries in a file should inherit just as if these tags were defined in
+a hypothetical level zero that surrounds the entire file.  Use a line like
+this@footnote{As with all these in-buffer settings, pressing @kbd{C-c C-c}
+activates any changes in the line.}:
 
 @cindex #+FILETAGS
 @example
@@ -4877,7 +4927,7 @@ with inherited tags.  Set @code{org-agenda-use-tag-inheritance} to control
 this: the default value includes all agenda types, but setting this to @code{nil}
 can really speed up agenda generation.
 
-@node Setting tags, Tag groups, Tag inheritance, Tags
+@node Setting tags
 @section Setting tags
 @cindex setting tags
 @cindex tags, setting
@@ -4939,10 +4989,10 @@ 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
 deselect tags with just a single key press.  For this to work well you should
-assign unique letters to most of your commonly used tags.  You can do this
-globally by configuring the variable @code{org-tag-alist} in your
-@file{.emacs} file.  For example, you may find the need to tag many items in
-different files with @samp{:@@home:}.  In this case you can set something
+assign unique, case-sensitive, letters to most of your commonly used tags.
+You can do this globally by configuring the variable @code{org-tag-alist} in
+your Emacs init file.  For example, you may find the need to tag many items
+in different files with @samp{:@@home:}.  In this case you can set something
 like:
 
 @lisp
@@ -5004,14 +5054,15 @@ If at least one tag has a selection key then pressing @kbd{C-c C-c} will
 automatically present you with a special interface, listing inherited tags,
 the tags of the current headline, and a list of all valid tags with
 corresponding keys@footnote{Keys will automatically be assigned to tags which
-have no configured keys.}.  In this interface, you can use the following
-keys:
+have no configured keys.}.
+
+Pressing keys assigned to tags will add or remove them from the list of tags
+in the current line.  Selecting a tag in a group of mutually exclusive tags
+will turn off any other tags from that group.
+
+In this interface, you can also use the following special keys:
 
 @table @kbd
-@item a-z...
-Pressing keys assigned to tags will add or remove them from the list of
-tags in the current line.  Selecting a tag in a group of mutually
-exclusive tags will turn off any other tags from that group.
 @kindex @key{TAB}
 @item @key{TAB}
 Enter a tag in the minibuffer, even if the tag is not in the predefined
@@ -5021,16 +5072,21 @@ You can also add several tags: just separate them with a comma.
 @kindex @key{SPC}
 @item @key{SPC}
 Clear all tags for this line.
+
 @kindex @key{RET}
 @item @key{RET}
 Accept the modified set.
+
 @item C-g
 Abort without installing changes.
+
 @item q
 If @kbd{q} is not assigned to a tag, it aborts like @kbd{C-g}.
+
 @item !
 Turn off groups of mutually exclusive tags.  Use this to (as an
 exception) assign several tags from such a group.
+
 @item C-c
 Toggle auto-exit after the next change (see below).
 If you are using expert mode, the first @kbd{C-c} will display the
@@ -5058,41 +5114,104 @@ instead of @kbd{C-c C-c}).  If you set the variable to the value
 @code{expert}, the special window is not even shown for single-key tag
 selection, it comes up only when you press an extra @kbd{C-c}.
 
-@node Tag groups, Tag searches, Setting tags, Tags
-@section Tag groups
+@node Tag hierarchy
+@section Tag hierarchy
 
 @cindex group tags
 @cindex tags, groups
-In a set of mutually exclusive tags, the first tag can be defined as a
-@emph{group tag}.  When you search for a group tag, it will return matches
-for all members in the group.  In an agenda view, filtering by a group tag
-will display headlines tagged with at least one of the members of the
-group.  This makes tag searches and filters even more flexible.
+@cindex tag hierarchy
+Tags can be defined in hierarchies.  A tag can be defined as a @emph{group
+tag} for a set of other tags.  The group tag can be seen as the ``broader
+term'' for its set of tags.  Defining multiple @emph{group tags} and nesting
+them creates a tag hierarchy.
+
+One use-case is to create a taxonomy of terms (tags) that can be used to
+classify nodes in a document or set of documents.
+
+When you search for a group tag, it will return matches for all members in
+the group and its subgroups.  In an agenda view, filtering by a group tag
+will display or hide headlines tagged with at least one of the members of the
+group or any of its subgroups.  This makes tag searches and filters even more
+flexible.
+
+You can set group tags by using brackets and inserting a colon between the
+group tag and its related tags---beware that all whitespaces are mandatory so
+that Org can parse this line correctly:
+
+@example
+#+TAGS: [ GTD : Control Persp ]
+@end example
 
-You can set group tags by inserting a colon between the group tag and other
-tags---beware that all whitespaces are mandatory so that Org can parse this
-line correctly:
+In this example, @samp{GTD} is the @emph{group tag} and it is related to two
+other tags: @samp{Control}, @samp{Persp}.  Defining @samp{Control} and
+@samp{Persp} as group tags creates an hierarchy of tags:
 
 @example
-#+TAGS: @{ @@read : @@read_book @@read_ebook @}
+#+TAGS: [ Control : Context Task ]
+#+TAGS: [ Persp : Vision Goal AOF Project ]
 @end example
 
-In this example, @samp{@@read} is a @emph{group tag} for a set of three
-tags: @samp{@@read}, @samp{@@read_book} and @samp{@@read_ebook}.
+That can conceptually be seen as a hierarchy of tags:
+
+@example
+- GTD
+  - Persp
+    - Vision
+    - Goal
+    - AOF
+    - Project
+  - Control
+    - Context
+    - Task
+@end example
 
-You can also use the @code{:grouptags} keyword directly when setting
-@code{org-tag-alist}:
+You can use the @code{:startgrouptag}, @code{:grouptags} and
+@code{:endgrouptag} keyword directly when setting @code{org-tag-alist}
+directly:
 
 @lisp
-(setq org-tag-alist '((:startgroup . nil)
-                      ("@@read" . nil)
-                      (:grouptags . nil)
-                      ("@@read_book" . nil)
-                      ("@@read_ebook" . nil)
-                      (:endgroup . nil)))
+(setq org-tag-alist '((:startgrouptag)
+                      ("GTD")
+                      (:grouptags)
+                      ("Control")
+                      ("Persp")
+                      (:endgrouptag)
+                      (:startgrouptag)
+                      ("Control")
+                      (:grouptags)
+                      ("Context")
+                      ("Task")
+                      (:endgrouptag)))
 @end lisp
 
-You cannot nest group tags or use a group tag as a tag in another group.
+The tags in a group can be mutually exclusive if using the same group syntax
+as is used for grouping mutually exclusive tags together; using curly
+brackets.
+
+@example
+#+TAGS: @{ Context : @@Home @@Work @@Call @}
+@end example
+
+When setting @code{org-tag-alist} you can use @code{:startgroup} &
+@code{:endgroup} instead of @code{:startgrouptag} & @code{:endgrouptag} to
+make the tags mutually exclusive.
+
+Furthermore, the members of a @emph{group tag} can also be regular
+expressions, creating the possibility of a more dynamic and rule-based
+tag structure.  The regular expressions in the group must be specified
+within @{ @}.  Here is an expanded example:
+
+@example
+#+TAGS: [ Vision : @{V@@@.+@} ]
+#+TAGS: [ Goal : @{G@@@.+@} ]
+#+TAGS: [ AOF : @{AOF@@@.+@} ]
+#+TAGS: [ Project : @{P@@@.+@} ]
+@end example
+
+Searching for the tag @samp{Project} will now list all tags also including
+regular expression matches for @samp{P@@@.+}, and similarly for tag searches on
+@samp{Vision}, @samp{Goal} and @samp{AOF}.  For example, this would work well
+for a project tagged with a common project-identifier, e.g. @samp{P@@2014_OrgTags}.
 
 @kindex C-c C-x q
 @vindex org-group-tags
@@ -5100,7 +5219,7 @@ If you want to ignore group tags temporarily, toggle group tags support
 with @command{org-toggle-tags-groups}, bound to @kbd{C-c C-x q}.  If you
 want to disable tag groups completely, set @code{org-group-tags} to @code{nil}.
 
-@node Tag searches,  , Tag groups, Tags
+@node Tag searches
 @section Tag searches
 @cindex tag searches
 @cindex searching for tags
@@ -5126,13 +5245,13 @@ only TODO items and force checking subitems (see the option
 These commands all prompt for a match string which allows basic Boolean logic
 like @samp{+boss+urgent-project1}, to find entries with tags @samp{boss} and
 @samp{urgent}, but not @samp{project1}, or @samp{Kathy|Sally} to find entries
-which are tagged, like @samp{Kathy} or @samp{Sally}.  The full syntax of the search
-string is rich and allows also matching against TODO keywords, entry levels
-and properties.  For a complete description with many examples, see
-@ref{Matching tags and properties}.
+tagged as @samp{Kathy} or @samp{Sally}.  The full syntax of the search string
+is rich and allows also matching against TODO keywords, entry levels and
+properties.  For a complete description with many examples, see @ref{Matching
+tags and properties}.
 
 
-@node Properties and Columns, Dates and Times, Tags, Top
+@node Properties and columns
 @chapter Properties and columns
 @cindex properties
 
@@ -5162,16 +5281,18 @@ Properties can be conveniently edited and viewed in column view
 * Property API::                Properties for Lisp programmers
 @end menu
 
-@node Property syntax, Special properties, Properties and Columns, Properties and Columns
+@node Property syntax
 @section Property syntax
 @cindex property syntax
 @cindex drawer, for properties
 
 Properties are key-value pairs.  When they are associated with a single entry
-or with a tree they need to be inserted into a special
-drawer (@pxref{Drawers}) with the name @code{PROPERTIES}.  Each property
-is specified on a single line, with the key (surrounded by colons)
-first, and the value after it.  Here is an example:
+or with a tree they need to be inserted into a special drawer
+(@pxref{Drawers}) with the name @code{PROPERTIES}, which has to be located
+right below a headline, and its planning line (@pxref{Deadlines and
+scheduling}) when applicable.  Each property is specified on a single line,
+with the key (surrounded by colons) first, and the value after it.  Keys are
+case-insensitives.  Here is an example:
 
 @example
 * CD collection
@@ -5187,7 +5308,7 @@ first, and the value after it.  Here is an example:
 @end example
 
 Depending on the value of @code{org-use-property-inheritance}, a property set
-this way will either be associated with a single entry, or the sub-tree
+this way will either be associated with a single entry, or the subtree
 defined by the entry, see @ref{Property inheritance}.
 
 You may define the allowed values for a particular property @samp{:Xyz:}
@@ -5215,7 +5336,7 @@ file, use a line like
 @end example
 
 Contrary to properties set from a special drawer, you have to refresh the
-buffer with @kbd{C-c C-c} to activate this changes.
+buffer with @kbd{C-c C-c} to activate this change.
 
 If you want to add to the value of an existing property, append a @code{+} to
 the property name.  The following results in the property @code{var} having
@@ -5284,58 +5405,52 @@ Compute the property at point, using the operator and scope from the
 nearest column format definition.
 @end table
 
-@node Special properties, Property searches, Property syntax, Properties and Columns
+@node Special properties
 @section Special properties
 @cindex properties, special
 
 Special properties provide an alternative access method to Org mode features,
 like the TODO state or the priority of an entry, discussed in the previous
-chapters.  This interface exists so that you can include these states in a
-column view (@pxref{Column view}), or to use them in queries.  The following
-property names are special and (except for @code{:CATEGORY:}) should not be
-used as keys in the properties drawer:
+chapters.  This interface exists so that you can include 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, ID
-@cindex property, special, TODO
-@cindex property, special, TAGS
 @cindex property, special, ALLTAGS
-@cindex property, special, CATEGORY
-@cindex property, special, PRIORITY
+@cindex property, special, BLOCKED
+@cindex property, special, CLOCKSUM
+@cindex property, special, CLOCKSUM_T
+@cindex property, special, CLOSED
 @cindex property, special, DEADLINE
+@cindex property, special, FILE
+@cindex property, special, ITEM
+@cindex property, special, PRIORITY
 @cindex property, special, SCHEDULED
-@cindex property, special, CLOSED
+@cindex property, special, TAGS
 @cindex property, special, TIMESTAMP
 @cindex property, special, TIMESTAMP_IA
-@cindex property, special, CLOCKSUM
-@cindex property, special, CLOCKSUM_T
-@cindex property, special, BLOCKED
-@c guessing that ITEM is needed in this area; also, should this list be sorted?
-@cindex property, special, ITEM
-@cindex property, special, FILE
+@cindex property, special, TODO
 @example
-ID           @r{A globally unique ID used for synchronization during}
-             @r{iCalendar or MobileOrg export.}
-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 timestamp, without the angular brackets.}
-CLOSED       @r{When was this entry closed?}
-TIMESTAMP    @r{The first keyword-less timestamp in the entry.}
-TIMESTAMP_IA @r{The first inactive timestamp in the entry.}
+BLOCKED      @r{"t" if task is currently blocked by children or siblings.}
 CLOCKSUM     @r{The sum of CLOCK intervals in the subtree.  @code{org-clock-sum}}
              @r{must be run first to compute the values in the current buffer.}
 CLOCKSUM_T   @r{The sum of CLOCK intervals in the subtree for today.}
              @r{@code{org-clock-sum-today} must be run first to compute the}
              @r{values in the current buffer.}
-BLOCKED      @r{"t" if task is currently blocked by children or siblings}
-ITEM         @r{The headline of the entry.}
+CLOSED       @r{When was this entry closed?}
+DEADLINE     @r{The deadline time string, without the angular brackets.}
 FILE         @r{The filename the entry is located in.}
+ITEM         @r{The headline of the entry.}
+PRIORITY     @r{The priority of the entry, a string with a single letter.}
+SCHEDULED    @r{The scheduling timestamp, without the angular brackets.}
+TAGS         @r{The tags defined directly in the headline.}
+TIMESTAMP    @r{The first keyword-less timestamp in the entry.}
+TIMESTAMP_IA @r{The first inactive timestamp in the entry.}
+TODO         @r{The TODO keyword of the entry.}
 @end example
 
-@node Property searches, Property inheritance, Special properties, Properties and Columns
+@node Property searches
 @section Property searches
 @cindex properties, searching
 @cindex searching, of properties
@@ -5372,7 +5487,7 @@ value.  If you enclose the value in curly braces, it is interpreted as
 a regular expression and matched against the property values.
 @end table
 
-@node Property inheritance, Column view, Property searches, Properties and Columns
+@node Property inheritance
 @section Property Inheritance
 @cindex properties, inheritance
 @cindex inheritance, of properties
@@ -5416,7 +5531,7 @@ The LOGGING property may define logging settings for an entry or a
 subtree (@pxref{Tracking TODO state changes}).
 @end table
 
-@node Column view, Property API, Property inheritance, Properties and Columns
+@node Column view
 @section Column view
 
 A great way to view and edit properties in an outline tree is
@@ -5430,7 +5545,7 @@ view (@kbd{S-@key{TAB} S-@key{TAB}}, or simply @kbd{c} while column view
 is active), but you can still open, read, and edit the entry below each
 headline.  Or, you can switch to column view after executing a sparse
 tree command and in this way get a table only for the selected items.
-Column view also works in agenda buffers (@pxref{Agenda Views}) where
+Column view also works in agenda buffers (@pxref{Agenda views}) where
 queries have collected selected items, possibly from a number of files.
 
 @menu
@@ -5439,7 +5554,7 @@ queries have collected selected items, possibly from a number of files.
 * Capturing column view::       A dynamic block for column view
 @end menu
 
-@node Defining columns, Using column view, Column view, Column view
+@node Defining columns
 @subsection Defining columns
 @cindex column view, for properties
 @cindex properties, column view
@@ -5452,7 +5567,7 @@ done by defining a column format line.
 * Column attributes::           Appearance and content of a column
 @end menu
 
-@node Scope of column definitions, Column attributes, Defining columns, Defining columns
+@node Scope of column definitions
 @subsubsection Scope of column definitions
 
 To define a column format for an entire file, use a line like
@@ -5479,7 +5594,7 @@ you can define columns on level 1 that are general enough for all
 sublevels, and more specific columns further down, when you edit a
 deeper part of the tree.
 
-@node Column attributes,  , Scope of column definitions, Defining columns
+@node Column attributes
 @subsubsection Column attributes
 A column definition sets the attributes of a column.  The general
 definition looks like this:
@@ -5501,38 +5616,45 @@ optional.  The individual parts have the following meaning:
 @var{title}           @r{The header text for the column.  If omitted, the property}
                 @r{name is used.}
 @{@var{summary-type}@}  @r{The summary type.  If specified, the column values for}
-                @r{parent nodes are computed from the children.}
+                @r{parent nodes are computed from the children@footnote{If
+                more than one summary type apply to the property, the parent
+                values are computed according to the first of them.}.}
                 @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, plain numbers are hours.}
-                @{X@}       @r{Checkbox status, @samp{[X]} if all children are @samp{[X]}.}
-                @{X/@}      @r{Checkbox status, @samp{[n/m]}.}
-                @{X%@}      @r{Checkbox status, @samp{[n%]}.}
                 @{min@}     @r{Smallest number in column.}
                 @{max@}     @r{Largest number.}
                 @{mean@}    @r{Arithmetic mean of numbers.}
+                @{X@}       @r{Checkbox status, @samp{[X]} if all children are @samp{[X]}.}
+                @{X/@}      @r{Checkbox status, @samp{[n/m]}.}
+                @{X%@}      @r{Checkbox status, @samp{[n%]}.}
+                @{:@}       @r{Sum times, HH:MM, plain numbers are
+                hours@footnote{A time can also be a duration, using effort
+                modifiers defined in @code{org-effort-durations}, e.g.,
+                @samp{3d 1h}.  If any value in the column is as such, the
+                summary will also be an effort duration.}.}
                 @{:min@}    @r{Smallest time value in column.}
                 @{:max@}    @r{Largest time value.}
                 @{:mean@}   @r{Arithmetic mean of time values.}
-                @{@@min@}    @r{Minimum age (in days/hours/mins/seconds).}
+                @{@@min@}    @r{Minimum age@footnote{An age is defined as
+                a duration since a given time-stamp (@pxref{Timestamps}).  It
+                can  also be expressed as days, hours, minutes and seconds,
+                identified by @samp{d}, @samp{h}, @samp{m} and @samp{s}
+                suffixes, all mandatory, e.g., @samp{0d 13h 0m 10s}.} (in
+                days/hours/mins/seconds).}
                 @{@@max@}    @r{Maximum age (in days/hours/mins/seconds).}
                 @{@@mean@}   @r{Arithmetic mean of ages (in days/hours/mins/seconds).}
-                @{est+@}    @r{Add low-high estimates.}
+                @{est+@}    @r{Add @samp{low-high} estimates.}
 @end example
 
-@noindent
-Be aware that you can only have one summary type for any property you
-include.  Subsequent columns referencing the same property will all display the
-same summary information.
-
 The @code{est+} summary type requires further explanation.  It is used for
-combining estimates, expressed as low-high ranges.  For example, instead
-of estimating a particular task will take 5 days, you might estimate it as
-5--6 days if you're fairly confident you know how much work is required, or
-1--10 days if you don't really know what needs to be done.  Both ranges
-average at 5.5 days, but the first represents a more predictable delivery.
+combining estimates, expressed as @samp{low-high} ranges or plain numbers.
+For example, instead of estimating a particular task will take 5 days, you
+might estimate it as 5--6 days if you're fairly confident you know how much
+work is required, or 1--10 days if you don't really know what needs to be
+done.  Both ranges average at 5.5 days, but the first represents a more
+predictable delivery.
 
 When combining a set of such estimates, simply adding the lows and highs
 produces an unrealistically wide result.  Instead, @code{est+} adds the
@@ -5546,6 +5668,10 @@ full job more realistically, at 10--15 days.
 Numbers are right-aligned when a format specifier with an explicit width like
 @code{%5d} or @code{%5.1f} is used.
 
+@vindex org-columns-summary-types
+You can also define custom summary types by setting
+@code{org-columns-summary-types}, which see.
+
 Here is an example for a complete columns definition, along with allowed
 values.
 
@@ -5574,7 +5700,7 @@ an @samp{[X]} status if all children have been checked.  The
 sums of CLOCK intervals in the subtree, either for all clocks or just for
 today.
 
-@node Using column view, Capturing column view, Defining columns, Column view
+@node Using column view
 @subsection Using column view
 
 @table @kbd
@@ -5582,14 +5708,15 @@ today.
 @orgcmd{C-c C-x C-c,org-columns}
 @vindex org-columns-default-format
 Turn on column view.  If the cursor is before the first headline in the file,
-column view is turned on for the entire file, using the @code{#+COLUMNS}
-definition.  If the cursor is somewhere inside the outline, this command
-searches the hierarchy, up from point, for a @code{:COLUMNS:} property that
-defines a format.  When one is found, the column view table is established
-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.
+or the function called with the universal prefix argument, column view is
+turned on for the entire file, using the @code{#+COLUMNS} definition.  If the
+cursor is somewhere inside the outline, this command searches the hierarchy,
+up from point, for a @code{:COLUMNS:} property that defines a format.  When
+one is found, the column view table is established 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.
 @orgcmd{r,org-columns-redo}
 Recreate the column view, to include recent changes made in the buffer.
 @orgcmd{g,org-columns-redo}
@@ -5620,7 +5747,7 @@ View the full value of this property.  This is useful if the width of
 the column is smaller than that of the value.
 @orgcmd{a,org-columns-edit-allowed}
 Edit the list of allowed values for this property.  If the list is found
-in the hierarchy, the modified values is stored there.  If no list is
+in the hierarchy, the modified value is stored there.  If no list is
 found, the new value is stored in the first entry that is part of the
 current column view.
 @tsubheading{Modifying the table structure}
@@ -5632,7 +5759,7 @@ Insert a new column, to the left of the current column.
 Delete the current column.
 @end table
 
-@node Capturing column view,  , Using column view, Column view
+@node Capturing column view
 @subsection Capturing column view
 
 Since column view is just an overlay over a buffer, it cannot be
@@ -5677,6 +5804,8 @@ When set to a number, don't capture entries below this level.
 @item :skip-empty-rows
 When set to @code{t}, skip rows where the only non-empty specifier of the
 column view is @code{ITEM}.
+@item :indent
+When non-@code{nil}, indent each @code{ITEM} field according to its level.
 
 @end table
 
@@ -5709,7 +5838,7 @@ distributed with the main distribution of Org (visit
 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
+@node Property API
 @section The Property API
 @cindex properties, API
 @cindex API, for properties
@@ -5719,7 +5848,7 @@ be used by Emacs Lisp programs to work with properties and to implement
 features based on them.  For more information see @ref{Using the
 property API}.
 
-@node Dates and Times, Capture - Refile - Archive, Properties and Columns, Top
+@node Dates and times
 @chapter Dates and times
 @cindex dates
 @cindex times
@@ -5729,7 +5858,7 @@ property API}.
 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
 information is called a @emph{timestamp} in Org mode.  This may be a
-little confusing because timestamp is often used as indicating when
+little confusing because timestamp is often used to indicate when
 something was created or last changed.  However, in Org mode this term
 is used in a much wider sense.
 
@@ -5739,12 +5868,11 @@ is used in a much wider sense.
 * Deadlines and scheduling::    Planning your work
 * Clocking work time::          Tracking how long you spend on a task
 * Effort estimates::            Planning work effort in advance
-* Relative timer::              Notes with a running timer
-* Countdown timer::             Starting a countdown timer for a task
+* Timers::                      Notes with a running timer
 @end menu
 
 
-@node Timestamps, Creating timestamps, Dates and Times, Dates and Times
+@node Timestamps
 @section Timestamps, deadlines, and scheduling
 @cindex timestamps
 @cindex ranges, time
@@ -5795,10 +5923,10 @@ following will show up in the agenda every Wednesday:
 For more complex date specifications, Org mode supports using the special
 sexp diary entries implemented in the Emacs calendar/diary
 package@footnote{When working with the standard diary sexp functions, you
-need to be very careful with the order of the arguments.  That order depend
+need to be very careful with the order of the arguments.  That order depends
 evilly on the variable @code{calendar-date-style} (or, for older Emacs
 versions, @code{european-calendar-style}).  For example, to specify a date
-December 12, 2005, the call might look like @code{(diary-date 12 1 2005)} or
+December 1, 2005, the call might look like @code{(diary-date 12 1 2005)} or
 @code{(diary-date 1 12 2005)} or @code{(diary-date 2005 12 1)}, depending on
 the settings.  This has been the source of much confusion.  Org mode users
 can resort to special versions of these functions like @code{org-date} or
@@ -5838,7 +5966,7 @@ angular ones.  These timestamps are inactive in the sense that they do
 
 @end table
 
-@node Creating timestamps, Deadlines and scheduling, Timestamps, Dates and Times
+@node Creating timestamps
 @section Creating timestamps
 @cindex creating timestamps
 @cindex timestamps, creating
@@ -5909,7 +6037,7 @@ the following column).
 * Custom time format::          Making dates look different
 @end menu
 
-@node The date/time prompt, Custom time format, Creating timestamps, Creating timestamps
+@node The date/time prompt
 @subsection The date/time prompt
 @cindex date, reading in minibuffer
 @cindex time, reading in minibuffer
@@ -5948,7 +6076,7 @@ feb 15        @result{} @b{2007}-02-15
 sep 12 9      @result{} 2009-09-12
 12:45         @result{} @b{2006}-@b{06}-@b{13} 12:45
 22 sept 0:34  @result{} @b{2006}-09-22 00:34
-w4            @result{} ISO week for of the current year @b{2006}
+w4            @result{} ISO week four of the current year @b{2006}
 2012 w4 fri   @result{} Friday of ISO week 4 in 2012
 2012-w04-5    @result{} Same as above
 @end example
@@ -6017,14 +6145,18 @@ from the minibuffer:
 @kindex M-S-@key{right}
 @kindex M-S-@key{left}
 @kindex @key{RET}
+@kindex M-S-@key{down}
+@kindex M-S-@key{up}
+
 @example
-@key{RET}           @r{Choose date at cursor in calendar.}
-mouse-1        @r{Select date by clicking on it.}
-S-@key{right}/@key{left}     @r{One day forward/backward.}
-S-@key{down}/@key{up}     @r{One week forward/backward.}
-M-S-@key{right}/@key{left}   @r{One month forward/backward.}
-> / <          @r{Scroll calendar forward/backward by one month.}
-M-v / C-v      @r{Scroll calendar forward/backward by 3 months.}
+@key{RET}              @r{Choose date at cursor in calendar.}
+mouse-1            @r{Select date by clicking on it.}
+S-@key{right}/@key{left}   @r{One day forward/backward.}
+S-@key{down}/@key{up}      @r{One week forward/backward.}
+M-S-@key{right}/@key{left} @r{One month forward/backward.}
+> / <              @r{Scroll calendar forward/backward by one month.}
+M-v / C-v          @r{Scroll calendar forward/backward by 3 months.}
+M-S-@key{down}/@key{up}    @r{Scroll calendar forward/backward by one year.}
 @end example
 
 @vindex org-read-date-display-live
@@ -6035,7 +6167,7 @@ on, the current interpretation of your input will be displayed live in the
 minibuffer@footnote{If you find this distracting, turn the display off with
 @code{org-read-date-display-live}.}.
 
-@node Custom time format,  , The date/time prompt, Creating timestamps
+@node Custom time format
 @subsection Custom time format
 @cindex custom date/time format
 @cindex time format, custom
@@ -6083,10 +6215,12 @@ format is shorter, things do work as expected.
 @end itemize
 
 
-@node Deadlines and scheduling, Clocking work time, Creating timestamps, Dates and Times
+@node Deadlines and scheduling
 @section Deadlines and scheduling
 
-A timestamp may be preceded by special keywords to facilitate planning:
+A timestamp may be preceded by special keywords to facilitate planning.  Both
+the timestamp and the keyword have to be positioned immediatly after the task
+they refer to.
 
 @table @var
 @item DEADLINE
@@ -6110,9 +6244,9 @@ until the entry is marked DONE@.  An example:
 @end example
 
 You can specify a different lead time for warnings for a specific
-deadlines using the following syntax.  Here is an example with a warning
+deadline using the following syntax.  Here is an example with a warning
 period of 5 days @code{DEADLINE: <2004-02-29 Sun -5d>}.  This warning is
-deactivated if the task get scheduled and you set
+deactivated if the task gets scheduled and you set
 @code{org-agenda-skip-deadline-prewarning-if-scheduled} to @code{t}.
 
 @item SCHEDULED
@@ -6172,28 +6306,25 @@ sexp entry matches.
 * Repeated tasks::              Items that show up again and again
 @end menu
 
-@node Inserting deadline/schedule, Repeated tasks, Deadlines and scheduling, Deadlines and scheduling
+@node Inserting deadline/schedule
 @subsection Inserting deadlines or schedules
 
-The following commands allow you to quickly insert@footnote{The @samp{SCHEDULED} and
-@samp{DEADLINE} dates are inserted on the line right below the headline.  Don't put
-any text between this line and the headline.} a deadline or to schedule
+The following commands allow you to quickly insert a deadline or to schedule
 an item:
 
 @table @kbd
 @c
 @orgcmd{C-c C-d,org-deadline}
-Insert @samp{DEADLINE} keyword along with a stamp.  The insertion will happen
-in the line directly following the headline.  Any CLOSED timestamp will be
-removed.  When called with a prefix arg, an existing deadline will be removed
-from the entry.  Depending on the variable @code{org-log-redeadline}@footnote{with corresponding
-@code{#+STARTUP} keywords @code{logredeadline}, @code{lognoteredeadline},
-and @code{nologredeadline}}, a note will be taken when changing an existing
+Insert @samp{DEADLINE} keyword along with a stamp.  Any CLOSED timestamp will
+be removed.  When called with a prefix arg, an existing deadline will be
+removed from the entry.  Depending on the variable
+@code{org-log-redeadline}@footnote{with corresponding @code{#+STARTUP}
+keywords @code{logredeadline}, @code{lognoteredeadline}, and
+@code{nologredeadline}}, a note will be taken when changing an existing
 deadline.
 
 @orgcmd{C-c C-s,org-schedule}
-Insert @samp{SCHEDULED} keyword along with a stamp.  The insertion will
-happen in the line directly following the headline.  Any CLOSED timestamp
+Insert @samp{SCHEDULED} keyword along with a stamp.  Any CLOSED timestamp
 will be removed.  When called with a prefix argument, remove the scheduling
 date from the entry.  Depending on the variable
 @code{org-log-reschedule}@footnote{with corresponding @code{#+STARTUP}
@@ -6201,14 +6332,6 @@ keywords @code{logreschedule}, @code{lognotereschedule}, and
 @code{nologreschedule}}, a note will be taken when changing an existing
 scheduling time.
 @c
-@orgcmd{C-c C-x C-k,org-mark-entry-for-agenda-action}
-@kindex k a
-@kindex k s
-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
 @orgcmd{C-c / d,org-check-deadlines}
 @cindex sparse tree, for deadlines
 @vindex org-deadline-warning-days
@@ -6230,7 +6353,7 @@ setting the date by indicating a relative time: e.g., +1d will set
 the date to the next day after today, and --1w will set the date
 to the previous week before any current timestamp.
 
-@node Repeated tasks,  , Inserting deadline/schedule, Deadlines and scheduling
+@node Repeated tasks
 @subsection Repeated tasks
 @cindex tasks, repeated
 @cindex repeated tasks
@@ -6271,6 +6394,9 @@ switch the date like this:
    DEADLINE: <2005-11-01 Tue +1m>
 @end example
 
+To mark a task with a repeater as @code{DONE}, use @kbd{C-- 1 C-c C-t}
+(i.e., @code{org-todo} with a numeric prefix argument of -1.)
+
 @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},
@@ -6299,6 +6425,13 @@ special repeaters  @samp{++} and @samp{.+}.  For example:
    but also by as many weeks as it takes to get this date into
    the future.  However, it stays on a Sunday, even if you called
    and marked it done on Saturday.
+** TODO Empty kitchen trash
+   DEADLINE: <2008-02-08 Fri 20:00 ++1d>
+   Marking this DONE will shift the date by at least one day, and
+   also by as many days as it takes to get the timestamp into the
+   future.  Since there is a time in the timestamp, the next
+   deadline in the future will be on today's date if you
+   complete the task before 20:00.
 ** TODO Check the batteries in the smoke detectors
    DEADLINE: <2005-11-01 Tue .+1m>
    Marking this DONE will shift the date to one month after
@@ -6310,7 +6443,9 @@ You may have both scheduling and deadline information for a specific task.
 If the repeater is set for the scheduling information only, you probably want
 the repeater to be ignored after the deadline.  If so, set the variable
 @code{org-agenda-skip-scheduled-if-deadline-is-shown} to
-@code{repeated-after-deadline}.  If you want both scheduling and deadline
+@code{repeated-after-deadline}.  However, any scheduling information without
+a repeater is no longer relevant once the task is done, and thus, removed
+upon repeating the task.  If you want both scheduling and deadline
 information to repeat after the same interval, set the same repeater for both
 timestamps.
 
@@ -6319,7 +6454,7 @@ 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
+@node Clocking work time
 @section Clocking work time
 @cindex clocking time
 @cindex time clocking
@@ -6330,10 +6465,9 @@ 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@footnote{Clocking only works if all
 headings are indented with less than 30 stars.  This is a hardcoded
-limitation of @code{lmax} in @code{org-clock-sum}.} of a project.  And it
-remembers a
-history or tasks recently clocked, to that you can jump quickly between a
-number of tasks absorbing your time.
+limitation of @code{lmax} in @code{org-clock-sum}.} of a project.
+And it remembers a history or tasks recently clocked, so that you can jump
+quickly between a number of tasks absorbing your time.
 
 To save the clock history across Emacs sessions, use
 @lisp
@@ -6352,7 +6486,7 @@ what to do with it.
 * Resolving idle time::         Resolving time when you've been idle
 @end menu
 
-@node Clocking commands, The clock table, Clocking work time, Clocking work time
+@node Clocking commands
 @subsection Clocking commands
 
 @table @kbd
@@ -6387,7 +6521,7 @@ 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
+show all time clocked on this task 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
@@ -6397,7 +6531,7 @@ mode line entry will pop up a menu with clocking options.
 @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{=>
+the resulting time and 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
 timestamp@footnote{The corresponding in-buffer setting is:
@@ -6449,10 +6583,10 @@ the agenda (@pxref{Weekly/daily agenda}) to show which tasks have been
 worked on or closed during a day.
 
 @strong{Important:} note that both @code{org-clock-out} and
-@code{org-clock-in-last} can have a global keybinding and will not
+@code{org-clock-in-last} can have a global key binding and will not
 modify the window disposition.
 
-@node The clock table, Resolving idle time, Clocking commands, Clocking work time
+@node The clock table
 @subsection The clock table
 @cindex clocktable, dynamic block
 @cindex report, of clocked time
@@ -6492,7 +6626,7 @@ buffer with the @kbd{C-c C-x C-r} command:
 @end example
 @noindent
 @vindex org-clocktable-defaults
-The @samp{BEGIN} line and specify a number of options to define the scope,
+The @samp{BEGIN} line specifies a number of options to define the scope,
 structure, and formatting of the report.  Defaults for all these options can
 be configured in the variable @code{org-clocktable-defaults}.
 
@@ -6512,7 +6646,7 @@ be selected:
              file-with-archives    @r{current file and its archives}
              agenda-with-archives  @r{all agenda files, including archives}
 :block       @r{The time block to consider.  This block is specified either}
-             @r{absolute, or relative to the current time and may be any of}
+             @r{absolutely, or relative to the current time and may be any of}
              @r{these formats:}
              2007-12-31    @r{New year eve 2007}
              2007-12       @r{December 2007}
@@ -6523,6 +6657,7 @@ be selected:
              thisweek, lastweek, thisweek-@var{N}     @r{a relative week}
              thismonth, lastmonth, thismonth-@var{N}  @r{a relative month}
              thisyear, lastyear, thisyear-@var{N}     @r{a relative year}
+             untilnow
              @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.}
              @r{Relative times like @code{"<-2w>"} can also be used.  See}
@@ -6541,7 +6676,7 @@ be selected:
              @r{@ref{Matching tags and properties} for the match syntax.}
 @end example
 
-Then there are options which determine the formatting of the table.  There
+Then there are options which determine the formatting of the table.  These
 options are interpreted by the function @code{org-clocktable-write-default},
 but you can specify your own function using the @code{:formatter} parameter.
 @example
@@ -6555,6 +6690,8 @@ but you can specify your own function using the @code{:formatter} parameter.
 :tcolumns    @r{Number of columns to be used for times.  If this is smaller}
              @r{than @code{:maxlevel}, lower levels will be lumped into one column.}
 :level       @r{Should a level number column be included?}
+:sort        @r{A cons cell like containing the column to sort and a sorting type.}
+             @r{E.g., @code{:sort (1 . ?a)} sorts the first column alphabetically.}
 :compact     @r{Abbreviation for @code{:level nil :indent t :narrow 40! :tcolumns 1}}
              @r{All are overwritten except if there is an explicit @code{:narrow}}
 :timestamp   @r{A timestamp for the entry, when available.  Look for SCHEDULED,}
@@ -6600,7 +6737,7 @@ would be
 #+END: clocktable
 @end example
 
-@node Resolving idle time,  , The clock table, Clocking work time
+@node Resolving idle time
 @subsection Resolving idle time and continuous clocking
 
 @subsubheading Resolving idle time
@@ -6616,7 +6753,7 @@ applying it to another one.
 @vindex org-clock-idle-time
 By customizing the variable @code{org-clock-idle-time} to some integer, such
 as 10 or 15, Emacs can alert you when you get back to your computer after
-being idle for that many minutes@footnote{On computers using macOS,
+being idle for that many minutes@footnote{On computers using Mac OS X,
 idleness is based on actual user idleness, not just Emacs' idle time.  For
 X11, you can install a utility program @file{x11idle.c}, available in the
 @code{contrib/scripts} directory of the Org git distribution, or install the
@@ -6685,20 +6822,18 @@ last clocked entry for this session, and start the new clock from there.
 If you only want this from time to time, use three universal prefix arguments
 with @code{org-clock-in} and two @kbd{C-u C-u} with @code{org-clock-in-last}.
 
-@node Effort estimates, Relative timer, Clocking work time, Dates and Times
+@node Effort estimates
 @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
-may later want to compare the planned effort with the actual working time, a
-great way to improve planning estimates.  Effort estimates are stored in a
-special property @samp{Effort}@footnote{You may change the property being
-used with the variable @code{org-effort-property}.}.  You can set the effort
-for an entry with the following commands:
+may later want to compare the planned effort with the actual working time,
+a great way to improve planning estimates.  Effort estimates are stored in
+a special property @code{EFFORT}.  You can set the effort for an entry with
+the following commands:
 
 @table @kbd
 @orgcmd{C-c C-x e,org-set-effort}
@@ -6748,61 +6883,57 @@ with the @kbd{/} key in the agenda (@pxref{Agenda commands}).  If you have
 these estimates defined consistently, two or three key presses will narrow
 down the list to stuff that fits into an available time slot.
 
-@node Relative timer, Countdown timer, Effort estimates, Dates and Times
-@section Taking notes with a relative timer
+@node Timers
+@section Taking notes with a timer
 @cindex relative timer
+@cindex countdown timer
+@kindex ;
+
+Org provides two types of timers.  There is a relative timer that counts up,
+which can be useful when taking notes during, for example, a meeting or
+a video viewing.  There is also a countdown timer.
 
-When taking notes during, for example, a meeting or a video viewing, it can
-be useful to have access to times relative to a starting time.  Org provides
-such a relative timer and make it easy to create timed notes.
+The relative and countdown are started with separate commands.
+
+@table @kbd
+@orgcmd{C-c C-x 0,org-timer-start}
+Start or reset the relative timer.  By default, the timer is set to 0.  When
+called with a @kbd{C-u} prefix, prompt the user for a starting offset.  If
+there is a timer string at point, this is taken as the default, providing a
+convenient way to restart taking notes after a break in the process.  When
+called with a double prefix argument @kbd{C-u C-u}, change all timer strings
+in the active region by a certain amount.  This can be used to fix timer
+strings if the timer was not started at exactly the right moment.
+@orgcmd{C-c C-x ;,org-timer-set-timer}
+Start a countdown timer.  The user is prompted for a duration.
+@code{org-timer-default-timer} sets the default countdown value.  Giving
+a numeric prefix argument overrides this default value.  This command is
+available as @kbd{;} in agenda buffers.
+@end table
+
+Once started, relative and countdown timers are controlled with the same
+commands.
 
 @table @kbd
 @orgcmd{C-c C-x .,org-timer}
-Insert a relative time into the buffer.  The first time you use this, the
-timer will be started.  When called with a prefix argument, the timer is
-restarted.
+Insert the value of the current relative or countdown timer into the buffer.
+If no timer is running, the relative timer will be started.  When called with
+a prefix argument, the relative timer is restarted.
 @orgcmd{C-c C-x -,org-timer-item}
-Insert a description list item with the current relative time.  With a prefix
-argument, first reset the timer to 0.
+Insert a description list item with the value of the current relative or
+countdown timer.  With a prefix argument, first reset the relative timer to
+0.
 @orgcmd{M-@key{RET},org-insert-heading}
 Once the timer list is started, you can also use @kbd{M-@key{RET}} to insert
 new timer items.
-@c for key sequences with a comma, command name macros fail :(
-@kindex C-c C-x ,
-@item C-c C-x ,
-Pause the timer, or continue it if it is already paused
-(@command{org-timer-pause-or-continue}).
-@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 ,
+@orgcmd{C-c C-x @comma{},org-timer-pause-or-continue}
+Pause the timer, or continue it if it is already paused.
+@orgcmd{C-c C-x _,org-timer-stop}
 Stop the timer.  After this, you can only start a new timer, not continue the
 old one.  This command also removes the timer from the mode line.
-@orgcmd{C-c C-x 0,org-timer-start}
-Reset the timer without inserting anything into the buffer.  By default, the
-timer is reset to 0.  When called with a @kbd{C-u} prefix, reset the timer to
-specific starting offset.  The user is prompted for the offset, with a
-default taken from a timer string at point, if any, So this can be used to
-restart taking notes after a break in the process.  When called with a double
-prefix argument @kbd{C-u C-u}, change all timer strings in the active region
-by a certain amount.  This can be used to fix timer strings if the timer was
-not started at exactly the right moment.
 @end table
 
-@node Countdown timer,  , Relative timer, Dates and Times
-@section Countdown timer
-@cindex Countdown timer
-@kindex C-c C-x ;
-@kindex ;
-
-Calling @code{org-timer-set-timer} from an Org mode buffer runs a countdown
-timer.  Use @kbd{;} from agenda buffers, @key{C-c C-x ;} everywhere else.
-
-@code{org-timer-set-timer} prompts the user for a duration and displays a
-countdown timer in the modeline.  @code{org-timer-default-timer} sets the
-default countdown value.  Giving a prefix numeric argument overrides this
-default value.
-
-@node Capture - Refile - Archive, Agenda Views, Dates and Times, Top
+@node Capture - Refile - Archive
 @chapter Capture - Refile - Archive
 @cindex capture
 
@@ -6816,13 +6947,13 @@ trees to an archive file keeps the system compact and fast.
 @menu
 * Capture::                     Capturing new stuff
 * Attachments::                 Add files to tasks
-* RSS Feeds::                   Getting input from RSS feeds
+* RSS feeds::                   Getting input from RSS feeds
 * Protocols::                   External (e.g., Browser) access to Emacs and Org
 * Refile and copy::             Moving/copying a tree from one place to another
 * Archiving::                   What to do with finished projects
 @end menu
 
-@node Capture, Attachments, Capture - Refile - Archive, Capture - Refile - Archive
+@node Capture
 @section Capture
 @cindex capture
 
@@ -6849,7 +6980,7 @@ customization.
 * Capture templates::           Define the outline of different note types
 @end menu
 
-@node Setting up capture, Using capture, Capture, Capture
+@node Setting up capture
 @subsection Setting up capture
 
 The following customization sets a default target file for notes, and defines
@@ -6864,12 +6995,12 @@ suggestion.}  for capturing new material.
 @end group
 @end smalllisp
 
-@node Using capture, Capture templates, Setting up capture, Capture
+@node Using capture
 @subsection Using capture
 
 @table @kbd
 @orgcmd{C-c c,org-capture}
-Call the command @code{org-capture}.  Note that this keybinding is global and
+Call the command @code{org-capture}.  Note that this key binding is global and
 not active by default: you need to install it.  If you have templates
 @cindex date tree
 defined @pxref{Capture templates}, it will offer these templates for
@@ -6921,7 +7052,7 @@ automatically be created unless you set @code{org-capture-bookmark} to
 To insert the capture at point in an Org buffer, call @code{org-capture} with
 a @code{C-0} prefix argument.
 
-@node Capture templates,  , Using capture, Capture
+@node Capture templates
 @subsection Capture templates
 @cindex templates, for Capture
 
@@ -6980,7 +7111,7 @@ like this:
 * Templates in contexts::       Only show a template in a specific context
 @end menu
 
-@node Template elements, Template expansion, Capture templates, Capture templates
+@node Template elements
 @subsubsection Template elements
 
 Now lets look at the elements of a template definition.  Each entry in
@@ -7032,7 +7163,9 @@ files, targets usually define a node.  Entries will become children of this
 node.  Other types will be added to the table or list in the body of this
 node.  Most target specifications contain a file name.  If that file name is
 the empty string, it defaults to @code{org-default-notes-file}.  A file can
-also be given as a variable, function, or Emacs Lisp form.
+also be given as a variable or as a function called with no argument.  When
+an absolute path is not specified for a target, it is taken as relative to
+@code{org-directory}.
 
 Valid values are:
 
@@ -7061,6 +7194,13 @@ one matched.}.
 @item (file+datetree+prompt "path/to/file")
 Will create a heading in a date tree, but will prompt for the date.
 
+@item (file+weektree "path/to/file")
+Will create a heading in a week tree for today's date.  Week trees are sorted
+by week and not by month unlike datetrees.
+
+@item (file+weektree+prompt "path/to/file")
+Will create a heading in a week tree, but will prompt for the date.
+
 @item (file+function "path/to/file" function-finding-location)
 A function to find the right location in the file.
 
@@ -7068,8 +7208,8 @@ A function to find the right location in the file.
 File to the entry that is currently being clocked.
 
 @item (function function-finding-location)
-Most general way, write your own function to find both
-file and location.
+Most general way: write your own function which both visits
+the file and moves point to the right location.
 @end table
 
 @item template
@@ -7117,9 +7257,10 @@ narrow it so that you only see the new material.
 
 @item :table-line-pos
 Specification of the location in the table where the new line should be
-inserted.  It should be a string like @code{"II-3"} meaning that the new
-line should become the third line before the second horizontal separator
-line.
+inserted. It can be a string, a variable holding a string or a function
+returning a string. The string should look like @code{"II-3"} meaning that
+the new line should become the third line before the second horizontal
+separator line.
 
 @item :kill-buffer
 If the target file was not yet visited when capture was invoked, kill the
@@ -7127,7 +7268,7 @@ buffer again after capture is completed.
 @end table
 @end table
 
-@node Template expansion, Templates in contexts, Template elements, Capture templates
+@node Template expansion
 @subsubsection Template expansion
 
 In the template itself, special @kbd{%}-escapes@footnote{If you need one of
@@ -7169,7 +7310,7 @@ dynamic insertion of content.  The templates are expanded in the order given her
             @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.}
-%\n         @r{Insert the text entered at the nth %^@{@var{prompt}@}, where @code{n} is}
+%\1 @dots{} %\N @r{Insert the text entered at the Nth %^@{@var{prompt}@}, where @code{N} is}
             @r{a number, starting from 1.}
 %?          @r{After completing the template, position cursor here.}
 @end smallexample
@@ -7187,15 +7328,15 @@ Link type                        |  Available keywords
 ---------------------------------+----------------------------------------------
 bbdb                             |  %:name %:company
 irc                              |  %:server %:port %:nick
-vm, vm-imap, wl, mh, mew, rmail  |  %:type %:subject %:message-id
-                                 |  %:from %:fromname %:fromaddress
+vm, vm-imap, wl, mh, mew, rmail, |  %:type %:subject %:message-id
+gnus, notmuch                    |  %:from %:fromname %:fromaddress
                                  |  %:to   %:toname   %:toaddress
                                  |  %:date @r{(message date header field)}
                                  |  %:date-timestamp @r{(date as active timestamp)}
                                  |  %:date-timestamp-inactive @r{(date as inactive timestamp)}
                                  |  %:fromto @r{(either "to NAME" or "from NAME")@footnote{This will always be the other, not the user.  See the variable @code{org-from-is-user-regexp}.}}
 gnus                             |  %:group, @r{for messages also all email fields}
-w3, w3m                          |  %:url
+eww, w3, w3m                     |  %:url
 info                             |  %:file %:node
 calendar                         |  %:date
 @end smallexample
@@ -7207,7 +7348,7 @@ To place the cursor after template expansion use:
 %?          @r{After completing the template, position cursor here.}
 @end smallexample
 
-@node Templates in contexts,  , Template expansion, Capture templates
+@node Templates in contexts
 @subsubsection Templates in contexts
 
 @vindex org-capture-templates-contexts
@@ -7231,7 +7372,7 @@ template.  In that case, add this command key like this:
 
 See the docstring of the variable for more information.
 
-@node Attachments, RSS Feeds, Capture, Capture - Refile - Archive
+@node Attachments
 @section Attachments
 @cindex attachments
 
@@ -7319,7 +7460,7 @@ same directory for attachments as the parent does.
 @end table
 @end table
 
-@node RSS Feeds, Protocols, Attachments, Capture - Refile - Archive
+@node RSS feeds
 @section RSS feeds
 @cindex RSS feeds
 @cindex Atom feeds
@@ -7357,17 +7498,12 @@ Prompt for a feed name and go to the inbox configured for this feed.
 
 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
+adding the same item several times.
 
 For more information, including how to read atom feeds, see
 @file{org-feed.el} and the docstring of @code{org-feed-alist}.
 
-@node Protocols, Refile and copy, RSS Feeds, Capture - Refile - Archive
+@node Protocols
 @section Protocols for external access
 @cindex protocols, for external access
 @cindex emacsserver
@@ -7381,7 +7517,7 @@ 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 Refile and copy, Archiving, Protocols, Capture - Refile - Archive
+@node Refile and copy
 @section Refile and copy
 @cindex refiling notes
 @cindex copying notes
@@ -7438,7 +7574,7 @@ setting @code{org-refile-use-cache}.  To make the command see new possible
 targets, you have to clear the cache with this command.
 @end table
 
-@node Archiving,  , Refile and copy, Capture - Refile - Archive
+@node Archiving
 @section Archiving
 @cindex archiving
 
@@ -7459,7 +7595,7 @@ Archive the current entry using the command specified in the variable
 * Internal archiving::          Switch off a tree but keep it in the file
 @end menu
 
-@node Moving subtrees, Internal archiving, Archiving, Archiving
+@node Moving subtrees
 @subsection Moving a tree to the archive file
 @cindex external archiving
 
@@ -7477,6 +7613,10 @@ the archive.  To do this, each subtree is checked for open TODO entries.
 If none are found, the command offers to move it to the archive
 location.  If the cursor is @emph{not} on a headline when this command
 is invoked, the level 1 trees will be checked.
+@orgkey{C-u C-u C-c C-x C-s}
+As above, but check subtree for timestamps instead of TODO entries.  The
+command will offer to archive the subtree if it @emph{does} contain a
+timestamp, and that timestamp is in the past.
 @end table
 
 @cindex archive locations
@@ -7488,14 +7628,7 @@ For information and examples on how to specify the file and the heading,
 see the documentation string of the variable
 @code{org-archive-location}.
 
-There is also an in-buffer option for setting this variable, for
-example@footnote{For backward compatibility, the following also works:
-If there are several such lines in a file, each specifies the archive
-location for the text below it.  The first such line also applies to any
-text before its definition.  However, 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.}:
+There is also an in-buffer option for setting this variable, for example:
 
 @cindex #+ARCHIVE
 @example
@@ -7506,7 +7639,7 @@ archive locations in a buffer is using properties.}:
 @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}).
+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
@@ -7516,14 +7649,15 @@ outline path the archiving time etc.  Configure the variable
 added.
 
 
-@node Internal archiving,  , Moving subtrees, Archiving
+@node Internal archiving
 @subsection Internal archiving
 
-If you want to just switch off (for agenda views) certain subtrees without
-moving them to a different file, you can use the @code{ARCHIVE tag}.
+@cindex archive tag
+If you want to just switch off---for agenda views---certain subtrees without
+moving them to a different file, you can use the archive tag.
 
-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:
+A headline that is marked with the @samp{: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
@@ -7539,7 +7673,7 @@ 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
+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 @kbd{v a} to get archives
@@ -7579,7 +7713,7 @@ outline.
 @end table
 
 
-@node Agenda Views, Markup, Capture - Refile - Archive, Top
+@node Agenda views
 @chapter Agenda views
 @cindex agenda views
 
@@ -7622,6 +7756,15 @@ 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-skip-comment-trees
+@vindex org-agenda-skip-archived-trees
+@cindex commented entries, in agenda views
+@cindex archived entries, in agenda views
+By default, the report ignores commented (@pxref{Comment lines}) and archived
+(@pxref{Internal archiving}) entries.  You can override this by setting
+@code{org-agenda-skip-comment-trees} and
+@code{org-agenda-skip-archived-trees} to @code{nil}.
+
 @vindex org-agenda-window-setup
 @vindex org-agenda-restore-windows-after-quit
 Two variables control how the agenda buffer is displayed and whether the
@@ -7636,11 +7779,11 @@ 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::      Writing a view to a file
+* Exporting agenda views::      Writing a view to a file
 * Agenda column view::          Using column view for collected entries
 @end menu
 
-@node Agenda files, Agenda dispatcher, Agenda Views, Agenda Views
+@node Agenda files
 @section Agenda files
 @cindex agenda files
 @cindex files for agenda
@@ -7717,7 +7860,7 @@ effect immediately.
 Lift the restriction.
 @end table
 
-@node Agenda dispatcher, Built-in agenda views, Agenda files, Agenda Views
+@node Agenda dispatcher
 @section The agenda dispatcher
 @cindex agenda dispatcher
 @cindex dispatching agenda commands
@@ -7763,15 +7906,17 @@ current region/subtree.}.  After pressing @kbd{< <}, you still need to press the
 character selecting the command.
 
 @item *
+@cindex agenda, sticky
 @vindex org-agenda-sticky
 Toggle sticky agenda views.  By default, Org maintains only a single agenda
 buffer and rebuilds it each time you change the view, to make sure everything
-is always up to date.  If you switch between views often and the build time
-bothers you, you can turn on sticky agenda buffers (make this the default by
-customizing the variable @code{org-agenda-sticky}).  With sticky agendas, the
-dispatcher only switches to the selected view, you need to update it by hand
-with @kbd{r} or @kbd{g}.  You can toggle sticky agenda view any time with
-@code{org-toggle-sticky-agenda}.
+is always up to date.  If you often switch between agenda views and the build
+time bothers you, you can turn on sticky agenda buffers or make this the
+default by customizing the variable @code{org-agenda-sticky}.  With sticky
+agendas, the agenda dispatcher will not recreate agenda views from scratch,
+it will only switch to the selected one, and you need to update the agenda by
+hand with @kbd{r} or @kbd{g} when needed.  You can toggle sticky agenda view
+any time with @code{org-toggle-sticky-agenda}.
 @end table
 
 You can also define custom commands that will be accessible through the
@@ -7780,7 +7925,7 @@ possibility to create extended agenda buffers that contain several
 blocks together, for example the weekly agenda, the global TODO list and
 a number of special tags matches.  @xref{Custom agenda views}.
 
-@node Built-in agenda views, Presentation and sorting, Agenda dispatcher, Agenda Views
+@node Built-in agenda views
 @section The built-in agenda views
 
 In this section we describe the built-in views.
@@ -7794,7 +7939,7 @@ In this section we describe the built-in views.
 * Stuck projects::              Find projects you need to review
 @end menu
 
-@node Weekly/daily agenda, Global TODO list, Built-in agenda views, Built-in agenda views
+@node Weekly/daily agenda
 @subsection The weekly/daily agenda
 @cindex agenda
 @cindex weekly agenda
@@ -7872,10 +8017,16 @@ the following segment of an Org file will be processed and entries
 will be made in the agenda:
 
 @example
-* Birthdays and similar stuff
-#+CATEGORY: Holiday
+* Holidays
+  :PROPERTIES:
+  :CATEGORY: Holiday
+  :END:
 %%(org-calendar-holiday)   ; special function for holiday names
-#+CATEGORY: Ann
+
+* Birthdays
+  :PROPERTIES:
+  :CATEGORY: Ann
+  :END:
 %%(org-anniversary 1956  5 14)@footnote{@code{org-anniversary} is just like @code{diary-anniversary}, but the argument order is always according to ISO and therefore independent of the value of @code{calendar-date-style}.} Arthur Dent is %d years old
 %%(org-anniversary 1869 10  2) Mahatma Gandhi would be %d years old
 @end example
@@ -7919,6 +8070,20 @@ 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.
 
+If you would like to see upcoming anniversaries with a bit of forewarning,
+you can use the following instead:
+
+@example
+* Anniversaries
+  :PROPERTIES:
+  :CATEGORY: Anniv
+  :END:
+%%(org-bbdb-anniversaries-future 3)
+@end example
+
+That will give you three days' warning: on the anniversary date itself and the
+two days prior. The argument is optional: if omitted, it defaults to 7.
+
 @subsubheading Appointment reminders
 @cindex @file{appt.el}
 @cindex appointment reminders
@@ -7933,7 +8098,7 @@ It also reads a @code{APPT_WARNTIME} property which will then override the
 value of @code{appt-message-warning-time} for this appointment.  See the
 docstring for details.
 
-@node Global TODO list, Matching tags and properties, Weekly/daily agenda, Built-in agenda views
+@node Global TODO list
 @subsection The global TODO list
 @cindex global TODO list
 @cindex TODO list, global
@@ -7944,7 +8109,7 @@ collected into a single place.
 @table @kbd
 @orgcmd{C-c a t,org-todo-list}
 Show the global TODO list.  This collects the TODO items from all agenda
-files (@pxref{Agenda Views}) into a single buffer.  By default, this lists
+files (@pxref{Agenda views}) into a single buffer.  By default, this lists
 items with a state the is not a DONE state.  The buffer is in
 @code{agenda-mode}, so there are commands to examine and manipulate the TODO
 entries directly from that buffer (@pxref{Agenda commands}).
@@ -7994,7 +8159,7 @@ and omit the sublevels from the global list.  Configure the variable
 @code{org-agenda-todo-list-sublevels} to get this behavior.
 @end itemize
 
-@node Matching tags and properties, Timeline, Global TODO list, Built-in agenda views
+@node Matching tags and properties
 @subsection Matching tags and properties
 @cindex matching, of tags
 @cindex matching, of properties
@@ -8002,7 +8167,7 @@ and omit the sublevels from the global list.  Configure the variable
 @cindex match view
 
 If headlines in the agenda files are marked with @emph{tags} (@pxref{Tags}),
-or have properties (@pxref{Properties and Columns}), you can select headlines
+or have properties (@pxref{Properties and columns}), you can select headlines
 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}.
@@ -8063,31 +8228,29 @@ braces.  For example,
 @samp{:work:} and any tag @i{starting} with @samp{boss}.
 
 @cindex group tags, as regular expressions
-Group tags (@pxref{Tag groups}) are expanded as regular expressions.  E.g.,
+Group tags (@pxref{Tag hierarchy}) are expanded as regular expressions.  E.g.,
 if @samp{:work:} is a group tag for the group @samp{:work:lab:conf:}, then
 searching for @samp{work} will search for @samp{@{\(?:work\|lab\|conf\)@}}
 and searching for @samp{-work} will search for all headlines but those with
-one of the tag in the group (i.e., @samp{-@{\(?:work\|lab\|conf\)@}}).
+one of the tags in the group (i.e., @samp{-@{\(?:work\|lab\|conf\)@}}).
 
 @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
+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 and the ``property'' @code{PRIORITY} represents the PRIORITY keyword of
-the entry.  The ITEM special property cannot currently be used in tags/property
-searches@footnote{But @pxref{x-agenda-skip-entry-regexp,
-,skipping entries based on regexp}.}.
+the entry.
 
-Except the @pxref{Special properties}, one other ``property'' can also be
-used. @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.
+In addition to the properties mentioned above, @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:
 
@@ -8141,11 +8304,6 @@ 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.
@@ -8174,7 +8332,7 @@ Select @samp{:work:}-tagged TODO lines that are either @samp{WAITING} or
 @samp{NEXT}.
 @end table
 
-@node Timeline, Search view, Matching tags and properties, Built-in agenda views
+@node Timeline
 @subsection Timeline for a single file
 @cindex timeline, single file
 @cindex time-sorted view
@@ -8194,7 +8352,7 @@ When called with a @kbd{C-u} prefix, all unfinished TODO entries
 The commands available in the timeline buffer are listed in
 @ref{Agenda commands}.
 
-@node Search view, Stuck projects, Timeline, Built-in agenda views
+@node Search view
 @subsection Search view
 @cindex search view
 @cindex text search
@@ -8224,7 +8382,7 @@ the docstring of the command @code{org-search-view}.
 Note that in addition to the agenda files, this command will also search
 the files listed in @code{org-agenda-text-search-extra-files}.
 
-@node Stuck projects,  , Search view, Built-in agenda views
+@node Stuck projects
 @subsection Stuck projects
 @pindex GTD, Getting Things Done
 
@@ -8272,7 +8430,7 @@ correct customization for this is
 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
+@node Presentation and sorting
 @section Presentation and sorting
 @cindex presentation, of agenda items
 
@@ -8294,21 +8452,14 @@ associated with the item.
 * Filtering/limiting agenda items::  Dynamically narrow the agenda
 @end menu
 
-@node Categories, Time-of-day specifications, Presentation and sorting, Presentation and sorting
+@node Categories
 @subsection Categories
 
 @cindex category
 @cindex #+CATEGORY
-The category is a broad label assigned to each agenda item.  By default,
-the category is simply derived from the file name, but you can also
-specify it with a special line in the buffer, like this@footnote{For
-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
-incompatible with the outline structure of the document.  The correct
-method for setting multiple categories in a buffer is using a
-property.}:
+The category is a broad label assigned to each agenda item.  By default, the
+category is simply derived from the file name, but you can also specify it
+with a special line in the buffer, like this:
 
 @example
 #+CATEGORY: Thesis
@@ -8328,7 +8479,7 @@ longer than 10 characters.
 You can set up icons for category by customizing the
 @code{org-agenda-category-icon-alist} variable.
 
-@node Time-of-day specifications, Sorting agenda items, Categories, Presentation and sorting
+@node Time-of-day specifications
 @subsection Time-of-day specifications
 @cindex time-of-day specification
 
@@ -8379,7 +8530,7 @@ The time grid can be turned on and off with the variable
 @code{org-agenda-use-time-grid}, and can be configured with
 @code{org-agenda-time-grid}.
 
-@node Sorting agenda items, Filtering/limiting agenda items, Time-of-day specifications, Presentation and sorting
+@node Sorting agenda items
 @subsection Sorting agenda items
 @cindex sorting, of agenda items
 @cindex priorities, of agenda items
@@ -8413,14 +8564,14 @@ 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}).
 
-@node Filtering/limiting agenda items,  , Sorting agenda items, Presentation and sorting
+@node Filtering/limiting agenda items
 @subsection Filtering/limiting agenda items
 
 Agenda built-in or customized commands are statically defined.  Agenda
 filters and limits provide two ways of dynamically narrowing down the list of
-agenda entries: @emph{fitlers} and @emph{limits}.  Filters only act on the
+agenda entries: @emph{filters} and @emph{limits}.  Filters only act on the
 display of the items, while limits take effect before the list of agenda
-entries is built.  Filter are more often used interactively, while limits are
+entries is built.  Filters are more often used interactively, while limits are
 mostly useful when defined as local variables within custom agenda commands.
 
 @subsubheading Filtering in the agenda
@@ -8444,34 +8595,14 @@ refreshes and more secondary filtering.  The filter is a global property of
 the entire agenda view---in a block agenda, you should only set this in the
 global options section, not in the section of an individual block.}
 
-You will be prompted for a tag selection letter; @key{SPC} will mean any tag at
-all.  Pressing @key{TAB} at that prompt will offer use completion to select a
-tag (including any tags that do not have a selection character).  The command
-then hides all entries that do not contain or inherit this tag.  When called
-with prefix arg, remove the entries that @emph{do} have the tag.  A second
-@kbd{/} at the prompt will turn off the filter and unhide any hidden entries.
-If the first key you press is either @kbd{+} or @kbd{-}, the previous filter
-will be narrowed by 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{<}, @kbd{>}, and @kbd{=}, and then the one-digit index of an effort
-estimate in your array of allowed values, where @kbd{0} means the 10th value.
-The filter will then restrict to entries with effort smaller-or-equal, equal,
-or larger-or-equal than the selected value.  If the digits 0--9 are not used
-as fast access keys to tags, you can also simply press the index digit
-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.
+You will be prompted for a tag selection letter; @key{SPC} will mean any tag
+at all.  Pressing @key{TAB} at that prompt will offer use completion to
+select a tag (including any tags that do not have a selection character).
+The command then hides all entries that do not contain or inherit this tag.
+When called with prefix arg, remove the entries that @emph{do} have the tag.
+A second @kbd{/} at the prompt will turn off the filter and unhide any hidden
+entries.  Pressing @kbd{+} or @kbd{-} switches between filtering and
+excluding the next tag.
 
 Org also supports automatic, context-aware tag filtering.  If the variable
 @code{org-agenda-auto-exclude-function} is set to a user-defined function,
@@ -8499,12 +8630,6 @@ Internet, and outside of business hours, with something like this:
 @end group
 @end smalllisp
 
-@orgcmd{\\,org-agenda-filter-by-tag-refine}
-Narrow the current agenda filter by an additional condition.  When called with
-prefix arg, remove the entries that @emph{do} have the tag, or that do match
-the effort criterion.  You can achieve the same effect by pressing @kbd{+} or
-@kbd{-} as the first key after the @kbd{/} command.
-
 @c
 @kindex [
 @kindex ]
@@ -8525,9 +8650,12 @@ selected.
 @vindex org-agenda-category-filter-preset
 
 Filter the current agenda view with respect to the category of the item at
-point.  Pressing @code{<} another time will remove this filter.  You can add
-a filter preset through the option @code{org-agenda-category-filter-preset}
-(see below.)
+point.  Pressing @code{<} another time will remove this filter.  When called
+with a prefix argument exclude the category of the item at point from the
+agenda.
+
+You can add a filter preset in custom agenda commands through the option
+@code{org-agenda-category-filter-preset}.  @xref{Setting options}.
 
 @orgcmd{^,org-agenda-filter-by-top-headline}
 Filter the current agenda view and only display the siblings and the parent
@@ -8540,8 +8668,34 @@ Filter the agenda view by a regular expression: only show agenda entries
 matching the regular expression the user entered.  When called with a prefix
 argument, it will filter @emph{out} entries matching the regexp.  With two
 universal prefix arguments, it will remove all the regexp filters, which can
-be accumulated.  You can add a filter preset through the option
-@code{org-agenda-category-filter-preset} (see below.)
+be accumulated.
+
+You can add a filter preset in custom agenda commands through the option
+@code{org-agenda-regexp-filter-preset}.  @xref{Setting options}.
+
+@orgcmd{_,org-agenda-filter-by-effort}
+@vindex org-agenda-effort-filter-preset
+@vindex org-sort-agenda-noeffort-is-high
+Filter the agenda view with respect to effort estimates.
+You first need to 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{<}, @kbd{>}, and @kbd{=}, and then the one-digit index of an effort
+estimate in your array of allowed values, where @kbd{0} means the 10th value.
+The filter will then restrict to entries with effort smaller-or-equal, equal,
+or larger-or-equal than the selected value.  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}.
+
+When called with a prefix argument, it will remove entries matching the
+condition.  With two universal prefix arguments, it will clear effort
+filters, which can be accumulated.
+
+You can add a filter preset in custom agenda commands through the option
+@code{org-agenda-effort-filter-preset}.  @xref{Setting options}.
 
 @orgcmd{|,org-agenda-filter-remove-all}
 Remove all filters in the current agenda view.
@@ -8555,9 +8709,9 @@ Remove all filters in the current agenda view.
 @vindex org-agenda-max-tags
 
 Here is a list of options that you can set, either globally, or locally in
-your custom agenda views@pxref{Custom agenda views}.
+your custom agenda views (@pxref{Custom agenda views}).
 
-@table @var
+@table @code
 @item org-agenda-max-entries
 Limit the number of entries.
 @item org-agenda-max-effort
@@ -8570,7 +8724,7 @@ Limit the number of tagged entries.
 
 When set to a positive integer, each option will exclude entries from other
 categories: for example, @code{(setq org-agenda-max-effort 100)} will limit
-the agenda to 100 minutes of effort and exclude any entry that as no effort
+the agenda to 100 minutes of effort and exclude any entry that has no effort
 property.  If you want to include entries with no effort property, use a
 negative value for @code{org-agenda-max-effort}.
 
@@ -8588,15 +8742,15 @@ Once you mark one of these five entry as @code{DONE}, rebuilding the agenda
 will again the next five entries again, including the first entry that was
 excluded so far.
 
-You can also dynamically set temporary limits@footnote{Those temporary limits
-are lost when rebuilding the agenda.}:
+You can also dynamically set temporary limits, which will be lost when
+rebuilding the agenda:
 
 @table @kbd
 @orgcmd{~,org-agenda-limit-interactively}
 This prompts for the type of limit to apply and its value.
 @end table
 
-@node Agenda commands, Custom agenda views, Presentation and sorting, Agenda Views
+@node Agenda commands
 @section Commands in the agenda buffer
 @cindex commands, in agenda buffer
 
@@ -8617,11 +8771,14 @@ the other commands, the cursor needs to be in the desired line.
 Next line (same as @key{down} and @kbd{C-n}).
 @orgcmd{p,org-agenda-previous-line}
 Previous line (same as @key{up} and @kbd{C-p}).
+@orgcmd{N,org-agenda-next-item}
+Next item: same as next line, but only consider items.
+@orgcmd{P,org-agenda-previous-item}
+Previous item: same as previous line, but only consider items.
 @tsubheading{View/Go to Org file}
 @orgcmdkkc{@key{SPC},mouse-3,org-agenda-show-and-scroll-up}
-Display the original location of the item in another window.
-With prefix arg, make sure that the entire entry is made visible in the
-outline, not only the heading.
+Display the original location of the item in another window.  With prefix
+arg, make sure that drawers stay folded.
 @c
 @orgcmd{L,org-agenda-recenter}
 Display original location and recenter that window.
@@ -8719,6 +8876,7 @@ agenda and timeline views.
 @c
 @orgcmd{v a,org-agenda-archives-mode}
 @xorgcmd{v A,org-agenda-archives-mode 'files}
+@cindex Archives mode
 Toggle Archives mode.  In Archives mode, trees that are marked
 @code{ARCHIVED} are also scanned when producing the agenda.  When you use the
 capital @kbd{A}, even all archive files are included.  To exit archives mode,
@@ -8789,35 +8947,25 @@ file or subtree (@pxref{Agenda files}).
 
 @tsubheading{Secondary filtering and query editing}
 
-For a detailed description of these commands, see @pxref{Filtering/limiting
+For a detailed description of these commands, @pxref{Filtering/limiting
 agenda items}.
 
 @orgcmd{/,org-agenda-filter-by-tag}
-@vindex org-agenda-tag-filter-preset
 Filter the agenda view with respect to a tag and/or effort estimates.
 
-@orgcmd{\\,org-agenda-filter-by-tag-refine}
-Narrow the current agenda filter by an additional condition.
-
 @orgcmd{<,org-agenda-filter-by-category}
-@vindex org-agenda-category-filter-preset
-
 Filter the current agenda view with respect to the category of the item at
-point.  Pressing @code{<} another time will remove this filter.
+point.
 
 @orgcmd{^,org-agenda-filter-by-top-headline}
 Filter the current agenda view and only display the siblings and the parent
 headline of the one at point.
 
 @orgcmd{=,org-agenda-filter-by-regexp}
-@vindex org-agenda-regexp-filter-preset
+Filter the agenda view by a regular expression.
 
-Filter the agenda view by a regular expression: only show agenda entries
-matching the regular expression the user entered.  When called with a prefix
-argument, it will filter @emph{out} entries matching the regexp.  With two
-universal prefix arguments, it will remove all the regexp filters, which can
-be accumulated.  You can add a filter preset through the option
-@code{org-agenda-category-filter-preset} (see below.)
+@orgcmd{_,org-agenda-filter-by-effort}
+Filter the agenda view with respect to effort estimates.
 
 @orgcmd{|,org-agenda-filter-remove-all}
 Remove all filters in the current agenda view.
@@ -8996,8 +9144,8 @@ Bulk action: act on all marked entries in the agenda.  This will prompt for
 another key to select the action to be applied.  The prefix arg to @kbd{B}
 will be passed through to the @kbd{s} and @kbd{d} commands, to bulk-remove
 these special timestamps.  By default, marks are removed after the bulk.  If
-you want them to persist, set @code{org-agenda-bulk-persistent-marks} to
-@code{t} or hit @kbd{p} at the prompt.
+you want them to persist, set @code{org-agenda-persistent-marks} to @code{t}
+or hit @kbd{p} at the prompt.
 
 @table @kbd
 @item *
@@ -9124,7 +9272,7 @@ visit Org files will not be removed.
 @end table
 
 
-@node Custom agenda views, Exporting Agenda Views, Agenda commands, Agenda Views
+@node Custom agenda views
 @section Custom agenda views
 @cindex custom agenda views
 @cindex agenda views, custom
@@ -9137,10 +9285,10 @@ dispatcher (@pxref{Agenda dispatcher}), just like the default commands.
 @menu
 * Storing searches::            Type once, use often
 * Block agenda::                All the stuff you need in a single buffer
-* Setting Options::             Changing the rules
+* Setting options::             Changing the rules
 @end menu
 
-@node Storing searches, Block agenda, Custom agenda views, Custom agenda views
+@node Storing searches
 @subsection Storing searches
 
 The first application of custom searches is the definition of keyboard
@@ -9162,7 +9310,7 @@ buffer).
 Custom commands are configured in the variable
 @code{org-agenda-custom-commands}.  You can customize this variable, for
 example by pressing @kbd{C-c a C}.  You can also directly set it with Emacs
-Lisp in @file{.emacs}.  The following example contains all valid agenda
+Lisp in the Emacs init file.  The following example contains all valid agenda
 views:
 
 @lisp
@@ -9232,7 +9380,7 @@ Peter, or Kim) as additional tag to match.
 Note that the @code{*-tree} agenda views need to be called from an
 Org buffer as they operate on the current buffer only.
 
-@node Block agenda, Setting Options, Storing searches, Custom agenda views
+@node Block agenda
 @subsection Block agenda
 @cindex block agenda
 @cindex agenda, with block views
@@ -9266,7 +9414,7 @@ your agenda for the current week, all TODO items that carry the tag
 @samp{home}, and also all lines tagged with @samp{garden}.  Finally the
 command @kbd{C-c a o} provides a similar view for office tasks.
 
-@node Setting Options,  , Block agenda, Custom agenda views
+@node Setting options
 @subsection Setting options for custom commands
 @cindex options, for custom agenda views
 
@@ -9285,8 +9433,7 @@ right spot in @code{org-agenda-custom-commands}.  For example:
          ((org-agenda-sorting-strategy '(priority-down))
           (org-agenda-prefix-format "  Mixed: ")))
         ("U" tags-tree "+boss-urgent"
-         ((org-show-following-heading nil)
-          (org-show-hierarchy-above nil)))
+         ((org-show-context-detail 'minimal)))
         ("N" search ""
          ((org-agenda-files '("~org/notes.org"))
           (org-agenda-text-search-extra-files nil)))))
@@ -9340,7 +9487,7 @@ yourself.
 @vindex org-agenda-custom-commands-contexts
 To control whether an agenda command should be accessible from a specific
 context, you can customize @code{org-agenda-custom-commands-contexts}.  Let's
-say for example that you have an agenda commands @code{"o"} displaying a view
+say for example that you have an agenda command @code{"o"} displaying a view
 that you only need when reading emails.  Then you would configure this option
 like this:
 
@@ -9359,8 +9506,8 @@ command key @code{"r"}.  In that case, add this command key like this:
 
 See the docstring of the variable for more information.
 
-@node Exporting Agenda Views, Agenda column view, Custom agenda views, Agenda Views
-@section Exporting Agenda Views
+@node 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
@@ -9498,7 +9645,7 @@ processing by other programs.  See @ref{Extracting agenda information}, for
 more information.
 
 
-@node Agenda column view,  , Exporting Agenda Views, Agenda Views
+@node Agenda column view
 @section Using column view in the agenda
 @cindex column view, in agenda
 @cindex agenda, column view
@@ -9524,11 +9671,12 @@ This causes the following issues:
 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-agenda-overriding-columns-format} is
-currently set, and if so, takes the format from there.  Otherwise it takes
+Org first checks if the variable @code{org-agenda-overriding-columns-format}
+is 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 its 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}),
@@ -9537,11 +9685,12 @@ make sure that the computations of this property are up to date.  This is
 also true for the special @code{CLOCKSUM} property.  Org will then sum the
 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 its @emph{child}).  In these
+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 its @emph{child}.  In these
 cases, the summation in the agenda will lead to incorrect results because
 some values will count double.
+
 @item
 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,
@@ -9555,149 +9704,46 @@ the agenda).
 @item
 @cindex property, special, CLOCKSUM_T
 When the column view in the agenda shows the @code{CLOCKSUM_T}, that is
-always today's clocked time for this item.  So even in the weekly agenda,
-the clocksum listed in column view only originates from today.  This lets
-you compare the time you spent on a task for today, with the time already
-spent (via @code{CLOCKSUM}) and with the planned total effort for it.
+always today's clocked time for this item.  So even in the weekly agenda, the
+clocksum listed in column view only originates from today.  This lets you
+compare the time you spent on a task for today, with the time already
+spent ---via @code{CLOCKSUM}---and with the planned total effort for it.
 @end enumerate
 
 
-@node Markup, Exporting, Agenda Views, Top
+@node Markup
 @chapter Markup for rich export
 
 When exporting Org mode documents, the exporter tries to reflect the
 structure of the document as accurately as possible in the back-end.  Since
-export targets like HTML, @LaTeX{} allow much richer formatting, Org mode has
+export targets like HTML and @LaTeX{} allow much richer formatting, Org mode has
 rules on how to prepare text for rich export.  This section summarizes the
 markup rules used in an Org mode buffer.
 
 @menu
-* Structural markup elements::  The basic structure as seen by the exporter
+* Paragraphs::                  The basic unit of text
+* Emphasis and monospace::      Bold, italic, etc.
+* Horizontal rules::            Make a line
 * Images and tables::           Images, tables and caption mechanism
 * Literal examples::            Source code examples with special formatting
-* Include files::               Include additional files into a document
-* Index entries::               Making an index
-* Macro replacement::           Use macros to create templates
+* Special symbols::             Greek letters and other symbols
+* Subscripts and superscripts::  Simple syntax for raising/lowering text
 * Embedded @LaTeX{}::           LaTeX can be freely used inside Org documents
-* Special blocks::              Containers targeted at export back-ends
-@end menu
-
-@node Structural markup elements, Images and tables, Markup, Markup
-@section Structural markup elements
-
-@menu
-* Document title::              Where the title is taken from
-* Headings and sections::       The document structure as seen by the exporter
-* Table of contents::           The if and where of the table of contents
-* Lists::                       Lists
-* Paragraphs::                  Paragraphs
-* Footnote markup::             Footnotes
-* Emphasis and monospace::      Bold, italic, etc.
-* Horizontal rules::            Make a line
-* Comment lines::               What will *not* be exported
 @end menu
 
-@node Document title, Headings and sections, Structural markup elements, Structural markup elements
-@subheading Document title
-@cindex document title, markup rules
-
-@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
-
-@noindent
-If this line does not exist, the title will be the name of the file
-associated to buffer, without extension, or the buffer name.
-
-@cindex property, EXPORT_TITLE
-If you are exporting only a subtree, its heading will become the title of the
-document.  If the subtree has a property @code{EXPORT_TITLE}, that will take
-precedence.
-
-@node Headings and sections, Table of contents, Document title, Structural markup elements
-@subheading Headings and sections
-@cindex headings and sections, markup rules
-
-@vindex org-export-headline-levels
-The outline structure of the document as described in @ref{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-export-headline-levels}, or on a
-per-file basis with a line
-
-@cindex #+OPTIONS
-@example
-#+OPTIONS: H:4
-@end example
-
-@node Table of contents, Lists, Headings and sections, Structural markup elements
-@subheading Table of contents
-@cindex table of contents, markup rules
-
-@cindex #+TOC
-@vindex org-export-with-toc
-The table of contents is normally inserted directly before the first headline
-of the file.  The depth of the table is by default the same as the number of
-headline levels, but you can choose a smaller number, or turn off 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
-#+OPTIONS: toc:2          (only to two levels in TOC)
-#+OPTIONS: toc:nil        (no default TOC at all)
-@end example
-
-If you would like to move the table of contents to a different location, you
-should turn off the default table using @code{org-export-with-toc} or
-@code{#+OPTIONS} and insert @code{#+TOC: headlines N} at the desired
-location(s).
-
-@example
-#+OPTIONS: toc:nil        (no default TOC)
-...
-#+TOC: headlines 2        (insert TOC here, with two headline levels)
-@end example
-
-Multiple @code{#+TOC: headline} lines are allowed.  The same @code{TOC}
-keyword can also generate a list of all tables (resp.@: all listings) with a
-caption in the buffer.
-
-@example
-#+TOC: listings           (build a list of listings)
-#+TOC: tables             (build a list of tables)
-@end example
-
-@cindex property, ALT_TITLE
-The headline's title usually determines its corresponding entry in a table of
-contents.  However, it is possible to specify an alternative title by
-setting @code{ALT_TITLE} property accordingly.  It will then be used when
-building the table.
-
-@node Lists, Paragraphs, Table of contents, Structural markup elements
-@subheading Lists
-@cindex lists, markup rules
-
-Plain lists as described in @ref{Plain lists}, are translated to the back-end's
-syntax for such lists.  Most back-ends support unordered, ordered, and
-description lists.
-
-@node Paragraphs, Footnote markup, Lists, Structural markup elements
-@subheading Paragraphs, line breaks, and quoting
+@node Paragraphs
+@section Paragraphs, line breaks, and quoting
 @cindex paragraphs, markup rules
 
 Paragraphs are separated by at least one empty line.  If you need to enforce
 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.
+To preserve the line breaks, indentation and blank lines in a region, but
+otherwise use normal formatting, you can use this construct, which can also
+be used to format poetry.
 
 @cindex #+BEGIN_VERSE
+@cindex verse blocks
 @example
 #+BEGIN_VERSE
  Great clouds overhead
@@ -9713,6 +9759,7 @@ as a paragraph that is indented on both the left and the right margin.  You
 can include quotations in Org mode documents like this:
 
 @cindex #+BEGIN_QUOTE
+@cindex quote blocks
 @example
 #+BEGIN_QUOTE
 Everything should be made as simple as possible,
@@ -9722,6 +9769,7 @@ but not any simpler -- Albert Einstein
 
 If you would like to center some text, do it like this:
 @cindex #+BEGIN_CENTER
+@cindex center blocks
 @example
 #+BEGIN_CENTER
 Everything should be made as simple as possible, \\
@@ -9729,18 +9777,8 @@ but not any simpler
 #+END_CENTER
 @end example
 
-
-@node Footnote markup, Emphasis and monospace, Paragraphs, Structural markup elements
-@subheading Footnote markup
-@cindex footnotes, markup rules
-@cindex @file{footnote.el}
-
-Footnotes defined in the way described in @ref{Footnotes}, will be exported
-by all back-ends.  Org allows multiple references to the same note, and
-multiple footnotes side by side.
-
-@node Emphasis and monospace, Horizontal rules, Footnote markup, Structural markup elements
-@subheading Emphasis and monospace
+@node Emphasis and monospace
+@section Emphasis and monospace
 
 @cindex underlined text, markup rules
 @cindex bold text, markup rules
@@ -9764,32 +9802,13 @@ can tweak @code{org-emphasis-regexp-components}.  Beware that changing one of
 the above variables will no take effect until you reload Org, for which you
 may need to restart Emacs.
 
-@node Horizontal rules, Comment lines, Emphasis and monospace, Structural markup elements
-@subheading  Horizontal rules
+@node Horizontal rules
+@section Horizontal rules
 @cindex horizontal rules, markup rules
 A line consisting of only dashes, and at least 5 of them, will be exported as
 a horizontal line.
 
-@node Comment lines,  , Horizontal rules, Structural markup elements
-@subheading Comment lines
-@cindex comment lines
-@cindex exporting, not
-@cindex #+BEGIN_COMMENT
-
-Lines starting with zero or more whitespace characters followed by one
-@samp{#} and a whitespace are treated as comments and will never be exported.
-Also entire subtrees starting with the word @samp{COMMENT} will never be
-exported.  Finally, regions surrounded by @samp{#+BEGIN_COMMENT}
-... @samp{#+END_COMMENT} will not be exported.
-
-@table @kbd
-@kindex C-c ;
-@item C-c ;
-Toggle the COMMENT keyword at the beginning of an entry.
-@end table
-
-
-@node Images and tables, Literal examples, Structural markup elements, Markup
+@node Images and tables
 @section Images and Tables
 
 @cindex tables, markup rules
@@ -9837,7 +9856,7 @@ the same caption mechanism can apply to many others (e.g., @LaTeX{}
 equations, source code blocks).  Depending on the export back-end, those may
 or may not be handled.
 
-@node Literal examples, Include files, Images and tables, Markup
+@node Literal examples
 @section Literal examples
 @cindex literal examples, markup rules
 @cindex code line references, markup rules
@@ -9865,20 +9884,25 @@ Here is an example
 @end example
 
 @cindex formatting source code, markup rules
+@vindex org-latex-listings
 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{This works automatically for
 the HTML back-end (it requires version 1.34 of the @file{htmlize.el} package,
 which is distributed with Org).  Fontified code chunks in @LaTeX{} can be
-achieved using either the listings or the
-@url{http://code.google.com/p/minted, minted,} package.  Refer to
-@code{org-latex-listings} documentation for details.}.  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@footnote{Code in
-@samp{src} blocks may also be evaluated either interactively or on export.
-See @pxref{Working With Source Code} for more information on evaluating code
-blocks.}, see @ref{Easy Templates} for shortcuts to easily insert code
-blocks.
+achieved using either the
+@url{https://www.ctan.org/tex-archive/macros/latex/contrib/listings/?lang=en, listings,}
+or the
+@url{https://github.com/gpoore/minted, minted,} package.
+If you use minted or listing, you must load the packages manually, for
+example by adding the desired package to
+@code{org-latex-packages-alist}.  Refer to @code{org-latex-listings}
+for details.}.  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@footnote{Code in @samp{src} blocks may also be evaluated either
+interactively or on export.  @xref{Working with source code}, for more
+information on evaluating code blocks.}, see @ref{Easy templates} for
+shortcuts to easily insert code blocks.
 @cindex #+BEGIN_SRC
 
 @example
@@ -9891,13 +9915,29 @@ blocks.
 
 Both in @code{example} and in @code{src} snippets, you can add a @code{-n}
 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 name
-enclosed in single parenthesis).  In HTML, hovering the mouse over such a
-link will remote-highlight the corresponding code line, which is kind of
-cool.
+numbered.  The @code{-n} takes an optional numeric argument specifying the
+starting line number of the block.  If you use a @code{+n} switch, the
+numbering from the previous numbered snippet will be continued in the current
+one.  The @code{+n} can also take a numeric argument.  The value of the
+argument will be added to the last line of the previous block to determine
+the starting line number.
+
+@example
+#+BEGIN_SRC emacs-lisp -n 20
+ ;; this will export with line number 20
+ (message "This is line 21")
+#+END_SRC
+#+BEGIN_SRC emacs-lisp +n 10
+ ;; This will be listed as line 31
+ (message "This is line 32")
+#+END_SRC
+@end example
+
+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 name enclosed in single parenthesis).  In HTML, hovering
+the mouse over such a link will remote-highlight the corresponding code line,
+which is kind of cool.
 
 You can also add a @code{-r} switch which @i{removes} the labels from the
 source code@footnote{Adding @code{-k} to @code{-n -r} will @i{keep} the
@@ -9916,6 +9956,10 @@ In line [[(sc)]] we remember the current position.  [[(jump)][Line (jump)]]
 jumps to point-min.
 @end example
 
+@cindex indentation, in source blocks
+Finally, you can use @code{-i} to preserve the indentation of a specific code
+block (@pxref{Editing source code}).
+
 @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
@@ -9925,8 +9969,8 @@ HTML export also allows examples to be published as text areas (@pxref{Text
 areas in HTML export}).
 
 Because the @code{#+BEGIN_...} and @code{#+END_...} patterns need to be added
-so often, shortcuts are provided using the Easy Templates facility
-(@pxref{Easy Templates}).
+so often, shortcuts are provided using the Easy templates facility
+(@pxref{Easy templates}).
 
 @table @kbd
 @kindex C-c '
@@ -9952,157 +9996,44 @@ formatting like @samp{(ref:label)} at the end of the current line.  Then the
 label is stored as a link @samp{(label)}, for retrieval with @kbd{C-c C-l}.
 @end table
 
-
-@node Include files, Index entries, Literal examples, Markup
-@section Include files
-@cindex include files, markup rules
-
-During export, you can include the content of another file.  For example, to
-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 (i.e., @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 given, the text will be
-assumed to be in Org mode format and will be processed normally.
-
-Contents of the included file will belong to the same structure (headline,
-item) containing the @code{INCLUDE} keyword.  In particular, headlines within
-the file will become children of the current section.  That behavior can be
-changed by providing an additional keyword parameter, @code{:minlevel}.  In
-that case, all headlines in the included file will be shifted so the one with
-the lowest level reaches that specified level.  For example, to make a file
-become a sibling of the current top-level headline, use
-
-@example
-#+INCLUDE: "~/my-book/chapter2.org" :minlevel 1
-@end example
-
-You can also include a portion of a file by specifying a lines range using
-the @code{:lines} parameter.  The line at the upper end of the range will not
-be included.  The start and/or the end of the range may be omitted to use the
-obvious defaults.
-
-@example
-#+INCLUDE: "~/.emacs" :lines "5-10"   @r{Include lines 5 to 10, 10 excluded}
-#+INCLUDE: "~/.emacs" :lines "-10"    @r{Include lines 1 to 10, 10 excluded}
-#+INCLUDE: "~/.emacs" :lines "10-"    @r{Include lines from 10 to EOF}
-@end example
-
-@table @kbd
-@kindex C-c '
-@item C-c '
-Visit the include file at point.
-@end table
-
-@node Index entries, Macro replacement, Include files, Markup
-@section Index entries
-@cindex index entries, for publishing
-
-You can specify entries that will be used for generating an index during
-publishing.  This is done by lines starting with @code{#+INDEX}.  An entry
-the contains an exclamation mark will create a sub item.  See @ref{Generating
-an index} for more information.
-
-@example
-* Curriculum Vitae
-#+INDEX: CV
-#+INDEX: Application!CV
-@end example
-
-
-
-
-@node Macro replacement, Embedded @LaTeX{}, Index entries, Markup
-@section 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 in
-paragraphs, verse blocks, table cells and some keywords with
-@code{@{@{@{name(arg1,arg2)@}@}@}}@footnote{Since commas separate arguments,
-commas within arguments have to be escaped with a backslash character.
-Conversely, backslash characters before a comma, and only them, need to be
-escaped with another backslash character.}.  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{@{@{@{time(@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}.
-
-Macro expansion takes place during export.
-
-
-@node Embedded @LaTeX{}, Special blocks, Macro replacement, Markup
-@section Embedded @LaTeX{}
-@cindex @TeX{} interpretation
-@cindex @LaTeX{} interpretation
-
-Plain ASCII is normally sufficient for almost all note taking.  Exceptions
-include scientific notes, which often require mathematical symbols and the
-occasional formula.  @LaTeX{}@footnote{@LaTeX{} is a macro system based on
-Donald E. Knuth's @TeX{} system.  Many of the features described here as
-``@LaTeX{}'' are really from @TeX{}, but for simplicity I am blurring this
-distinction.}  is widely used to typeset scientific documents.  Org mode
-supports embedding @LaTeX{} code into its files, because many academics are
-used to writing and reading @LaTeX{} source code, and because it can be
-readily processed to produce pretty output for a number of export back-ends.
-
-@menu
-* Special symbols::             Greek letters and other symbols
-* Subscripts and superscripts::  Simple syntax for raising/lowering text
-* @LaTeX{} fragments::          Complex formulas made easy
-* Previewing @LaTeX{} fragments::  What will this snippet look like?
-* CDLaTeX mode::                Speed up entering of formulas
-@end menu
-
-@node Special symbols, Subscripts and superscripts, Embedded @LaTeX{}, Embedded @LaTeX{}
-@subsection Special symbols
+@node Special symbols
+@section Special symbols
+@cindex Org entities
 @cindex math symbols
 @cindex special symbols
-@cindex @TeX{} macros
-@cindex @LaTeX{} fragments, markup rules
 @cindex HTML entities
 @cindex @LaTeX{} entities
 
-You can use @LaTeX{}-like syntax to insert special symbols like @samp{\alpha}
-to indicate the Greek letter, or @samp{\to} to indicate an arrow.  Completion
-for these symbols is available, just type @samp{\} and maybe a few letters,
-and press @kbd{M-@key{TAB}} to see possible completions.  Unlike @LaTeX{}
-code, Org mode allows these symbols to be present without surrounding math
-delimiters, for example:
+You can use @LaTeX{}-like syntax to insert special symbols---named
+entities---like @samp{\alpha} to indicate the Greek letter, or @samp{\to} to
+indicate an arrow.  Completion for these symbols is available, just type
+@samp{\} and maybe a few letters, and press @kbd{M-@key{TAB}} to see possible
+completions.  If you need such a symbol inside a word, terminate it with
+a pair of curly brackets.  For example
 
 @example
-Angles are written as Greek letters \alpha, \beta and \gamma.
+Protip: Given a circle \Gamma of diameter d, the length of its circumference
+is \pi@{@}d.
 @end example
 
-@vindex org-entities
-During export, these symbols will be transformed into the native format of
-the exporter back-end.  Strings like @code{\alpha} will be exported as
-@code{&alpha;} in the HTML output, and as @code{$\alpha$} in the @LaTeX{}
-output.  Similarly, @code{\nbsp} will become @code{&nbsp;} in HTML and
-@code{~} in @LaTeX{}.  If you need such a symbol inside a word, terminate it
-like this: @samp{\Aacute@{@}stor}.
-
+@findex org-entities-help
+@vindex org-entities-user
 A large number of entities is provided, with names taken from both HTML and
-@LaTeX{}; see the variable @code{org-entities} for the complete list.
-@samp{\-} is treated as a shy hyphen, and @samp{--}, @samp{---}, and
-@samp{...} are all converted into special commands creating hyphens of
-different lengths or a compact set of dots.
+@LaTeX{}; you can comfortably browse the complete list from a dedicated
+buffer using the command @code{org-entities-help}.  It is also possible to
+provide your own special symbols in the variable @code{org-entities-user}.
+
+During export, these symbols are transformed into the native format of the
+exporter back-end.  Strings like @code{\alpha} are exported as @code{&alpha;}
+in the HTML output, and as @code{\(\alpha\)} in the @LaTeX{} output.
+Similarly, @code{\nbsp} becomes @code{&nbsp;} in HTML and @code{~} in
+@LaTeX{}.
+
+@cindex escaping characters
+Entities may also be used as a may to escape markup in an Org document, e.g.,
+@samp{\under@{@}not underlined\under} exports as @samp{_not underlined_}.
 
+@cindex special symbols, in-buffer display
 If you would like to see entities displayed as UTF-8 characters, use the
 following command@footnote{You can turn this on by default by setting the
 variable @code{org-pretty-entities}, or on a per-file base with the
@@ -10117,20 +10048,28 @@ buffer content which remains plain ASCII, but it overlays the UTF-8 character
 for display purposes only.
 @end table
 
-@node Subscripts and superscripts, @LaTeX{} fragments, Special symbols, Embedded @LaTeX{}
-@subsection Subscripts and superscripts
+@cindex shy hyphen, special symbol
+@cindex dash, special symbol
+@cindex ellipsis, special symbol
+In addition to regular entities defined above, Org exports in a special
+way@footnote{This behaviour can be disabled with @code{-} export setting
+(@pxref{Export settings}).} the following commonly used character
+combinations: @samp{\-} is treated as a shy hyphen, @samp{--} and @samp{---}
+are converted into dashes, and @samp{...} becomes a compact set of dots.
+
+@node Subscripts and superscripts
+@section Subscripts and superscripts
 @cindex subscript
 @cindex superscript
 
-Just like in @LaTeX{}, @samp{^} and @samp{_} are used to indicate super- and
-subscripts.  Again, these can be used without embedding them in math-mode
-delimiters.  To increase the readability of ASCII text, it is not necessary
-(but OK) to surround multi-character sub- and superscripts with curly braces.
-For example
+@samp{^} and @samp{_} are used to indicate super- and subscripts.  To
+increase the readability of ASCII text, it is not necessary---but OK---to
+surround multi-character sub- and superscripts with curly braces.  Those are,
+however, mandatory, when more than one word is involved.  For example
 
 @example
-The mass of the sun is M_sun = 1.989 x 10^30 kg.  The radius of
-the sun is R_@{sun@} = 6.96 x 10^8 m.
+The radius of the sun is R_sun = 6.96 x 10^8 m.  On the other hand, the
+radius of Alpha Centauri is R_@{Alpha Centauri@} = 1.28 x R_@{sun@}.
 @end example
 
 @vindex org-use-sub-superscripts
@@ -10147,46 +10086,58 @@ In addition to showing entities as UTF-8 characters, this command will also
 format sub- and superscripts in a WYSIWYM way.
 @end table
 
-@node @LaTeX{} fragments, Previewing @LaTeX{} fragments, Subscripts and superscripts, Embedded @LaTeX{}
+@node Embedded @LaTeX{}
+@section Embedded @LaTeX{}
+@cindex @TeX{} interpretation
+@cindex @LaTeX{} interpretation
+
+Plain ASCII is normally sufficient for almost all note taking.  Exceptions
+include scientific notes, which often require mathematical symbols and the
+occasional formula.  @LaTeX{}@footnote{@LaTeX{} is a macro system based on
+Donald E. Knuth's @TeX{} system.  Many of the features described here as
+``@LaTeX{}'' are really from @TeX{}, but for simplicity I am blurring this
+distinction.}  is widely used to typeset scientific documents.  Org mode
+supports embedding @LaTeX{} code into its files, because many academics are
+used to writing and reading @LaTeX{} source code, and because it can be
+readily processed to produce pretty output for a number of export back-ends.
+
+@menu
+* @LaTeX{} fragments::          Complex formulas made easy
+* Previewing @LaTeX{} fragments::  What will this snippet look like?
+* CDLaTeX mode::                Speed up entering of formulas
+@end menu
+
+@node @LaTeX{} fragments
 @subsection @LaTeX{} fragments
 @cindex @LaTeX{} fragments
 
 @vindex org-format-latex-header
-Going beyond symbols and sub- and superscripts, a full formula language is
-needed.  Org mode can contain @LaTeX{} math fragments, and it supports ways
-to process these for several export back-ends.  When exporting to @LaTeX{},
-the code is obviously left as it is.  When exporting to HTML, Org invokes the
-@uref{http://www.mathjax.org, MathJax library} (@pxref{Math formatting in
-HTML export}) to process and display the math@footnote{If you plan to use
-this regularly or on pages with significant page views, you should install
-@file{MathJax} on your own server in order to limit the load of our server.}.
-Finally, it can also process the mathematical expressions into
-images@footnote{For this to work you need to be on a system with a working
-@LaTeX{} installation.  You also need the @file{dvipng} program or the
-@file{convert}, respectively available at
-@url{http://sourceforge.net/projects/dvipng/} and from the @file{imagemagick}
-suite.  The @LaTeX{} header that will be used when processing a fragment can
-be configured with the variable @code{org-format-latex-header}.} that can be
-displayed in a browser.
+Org mode can contain @LaTeX{} math fragments, and it supports ways to process
+these for several export back-ends.  When exporting to @LaTeX{}, the code is
+left as it is.  When exporting to HTML, Org can use either
+@uref{http://www.mathjax.org, MathJax} (@pxref{Math formatting in HTML
+export}) or transcode the math into images (see @pxref{Previewing @LaTeX{}
+fragments}).
 
 @LaTeX{} fragments don't need any special marking at all.  The following
 snippets will be identified as @LaTeX{} source code:
 @itemize @bullet
 @item
-Environments of any kind@footnote{When @file{MathJax} is used, only the
-environments recognized by @file{MathJax} will be processed.  When
-@file{dvipng} program or @file{imagemagick} suite is used to create images,
-any @LaTeX{} environment will be handled.}.  The only requirement is that the
-@code{\begin} and @code{\end} statements appear on a new line, at the
+Environments of any kind@footnote{When MathJax is used, only the
+environments recognized by MathJax will be processed.  When
+@file{dvipng} program, @file{dvisvgm} program or @file{imagemagick} suite is
+used to create images, any @LaTeX{} environment will be handled.}.  The only
+requirement is that the @code{\begin} statement appears on a new line, at the
 beginning of the line or after whitespaces only.
 @item
 Text within the usual @LaTeX{} math delimiters.  To avoid conflicts with
 currency specifications, single @samp{$} characters are only recognized as
 math delimiters if the enclosed text contains at most two line breaks, is
 directly attached to the @samp{$} characters with no whitespace in between,
-and if the closing @samp{$} is followed by whitespace, punctuation or a dash.
-For the other delimiters, there is no such restriction, so when in doubt, use
-@samp{\(...\)} as inline math delimiters.
+and if the closing @samp{$} is followed by whitespace or punctuation
+(parentheses and quotes are considered to be punctuation in this
+context).  For the other delimiters, there is no such restriction, so when in
+doubt, use @samp{\(...\)} as inline math delimiters.
 @end itemize
 
 @noindent For example:
@@ -10210,7 +10161,7 @@ either $$ a=+\sqrt@{2@} $$ or \[ a=-\sqrt@{2@} \].
 @vindex org-export-with-latex
 @LaTeX{} processing can be configured with the variable
 @code{org-export-with-latex}.  The default setting is @code{t} which means
-@file{MathJax} for HTML, and no processing for ASCII and @LaTeX{} back-ends.
+MathJax for HTML, and no processing for ASCII and @LaTeX{} back-ends.
 You can also set this variable on a per-file basis using one of these
 lines:
 
@@ -10220,16 +10171,26 @@ lines:
 #+OPTIONS: tex:verbatim   @r{Verbatim export, for jsMath or so}
 @end example
 
-@node Previewing @LaTeX{} fragments, CDLaTeX mode, @LaTeX{} fragments, Embedded @LaTeX{}
+@node Previewing @LaTeX{} fragments
 @subsection Previewing @LaTeX{} fragments
 @cindex @LaTeX{} fragments, preview
 
-@vindex org-latex-create-formula-image-program
-If you have @file{dvipng} or @file{imagemagick} installed@footnote{Choose the
-converter by setting the variable
-@code{org-latex-create-formula-image-program} accordingly.}, @LaTeX{}
-fragments can be processed to produce preview images of the typeset
-expressions:
+@vindex org-preview-latex-default-process
+If you have a working @LaTeX{} installation and @file{dvipng}, @file{dvisvgm}
+or @file{convert} installed@footnote{These are respectively available at
+@url{http://sourceforge.net/projects/dvipng/}, @url{http://dvisvgm.bplaced.net/}
+and from the @file{imagemagick} suite.  Choose the converter by setting the
+variable @code{org-preview-latex-default-process} accordingly.}, @LaTeX{}
+fragments can be processed to produce images of the typeset expressions to be
+used for inclusion while exporting to HTML (see @pxref{@LaTeX{} fragments}),
+or for inline previewing within Org mode.
+
+@vindex org-format-latex-options
+@vindex org-format-latex-header
+You can customize the variables @code{org-format-latex-options} and
+@code{org-format-latex-header} to influence some aspects of the preview.  In
+particular, the @code{:scale} (and for HTML export, @code{:html-scale})
+property of the former can be used to adjust the size of the preview images.
 
 @table @kbd
 @kindex C-c C-x C-l
@@ -10245,12 +10206,6 @@ process the entire buffer.
 Remove the overlay preview images.
 @end table
 
-@vindex org-format-latex-options
-You can customize the variable @code{org-format-latex-options} to influence
-some aspects of the preview.  In particular, the @code{:scale} (and for HTML
-export, @code{:html-scale}) property can be used to adjust the size of the
-preview images.
-
 @vindex org-startup-with-latex-preview
 You can turn on the previewing of all @LaTeX{} fragments in a file with
 
@@ -10264,7 +10219,7 @@ To disable it, simply use
 #+STARTUP: nolatexpreview
 @end example
 
-@node CDLaTeX mode,  , Previewing @LaTeX{} fragments, Embedded @LaTeX{}
+@node CDLaTeX mode
 @subsection Using CD@LaTeX{} to enter math
 @cindex CD@LaTeX{}
 
@@ -10325,252 +10280,233 @@ modification will work only inside @LaTeX{} fragments; outside the quote
 is normal.
 @end itemize
 
-@node Special blocks,  , Embedded @LaTeX{}, Markup
-@section Special blocks
-@cindex Special blocks
+@node Exporting
+@chapter Exporting
+@cindex exporting
 
-Org syntax includes pre-defined blocks (@pxref{Paragraphs} and @ref{Literal
-examples}).  It is also possible to create blocks containing raw code
-targeted at a specific back-ends (e.g., @samp{#+BEGIN_LATEX}).
+Sometimes, you may want to pretty print your notes, publish them on the web
+or even share them with people not using Org.  In these cases, the Org export
+facilities can be used to convert your documents to a variety of other
+formats, while retaining as much structure (@pxref{Document structure}) and
+markup (@pxref{Markup}) as possible.
 
-Any other block is a @emph{special block}.
+@cindex export back-end
+Libraries responsible for such translation are called back-ends.  Org ships
+with the following ones
 
-For example, @samp{#+BEGIN_ABSTRACT} and @samp{#+BEGIN_VIDEO} are special
-blocks.  The first one is useful when exporting to @LaTeX{}, the second one
-when exporting to HTML5.
+@itemize
+@item ascii (ASCII format)
+@item beamer (@LaTeX{} Beamer format)
+@item html (HTML format)
+@item icalendar (iCalendar format)
+@item latex (@LaTeX{} format)
+@item md (Markdown format)
+@item odt (OpenDocument Text format)
+@item org (Org format)
+@item texinfo (Texinfo format)
+@item man (Man page format)
+@end itemize
 
-Each export back-end decides if they should be exported, and how.  When the
-block is ignored, its contents are still exported, as if the opening and
-closing block lines were not there.  For example, when exporting a
-@samp{#+BEGIN_TEST} block, HTML back-end wraps its contents within a
-@samp{<div name="test">} tag.
+@noindent Org also uses additional libraries located in @code{contrib/}
+directory (@pxref{Installation}).  Users can install additional export
+libraries for additional formats from the Emacs packaging system.  For easy
+discovery, these packages have a common naming scheme: @file{ox-NAME}, where
+NAME is one of the formats.  For example, @file{ox-koma-letter} for
+@code{koma-letter} back-end.
 
-Refer to back-end specific documentation for more information.
+@vindex org-export-backends
+Org loads back-ends for the following formats by default: @code{ascii},
+@code{html}, @code{icalendar}, @code{latex} and @code{odt}.
 
-@node Exporting, Publishing, Markup, Top
-@chapter Exporting
-@cindex exporting
+Org can load additional back-ends either of two ways: through the
+@code{org-export-backends} variable configuration; or, by requiring the
+library in the Emacs init file like this:
 
-The Org mode export facilities can be used to export Org documents or parts
-of Org documents to a variety of other formats.  In addition, these
-facilities can be used with @code{orgtbl-mode} and/or @code{orgstruct-mode}
-in foreign buffers so you can author tables and lists in Org syntax and
-convert them in place to the target language.
-
-ASCII export produces a readable and simple version of an Org file for
-printing and sharing notes.  HTML export allows you to easily publish notes
-on the web, or to build full-fledged websites.  @LaTeX{} export lets you use
-Org mode and its structured editing functions to create arbitrarily complex
-@LaTeX{} files for any kind of document.  OpenDocument Text (ODT) export
-allows seamless collaboration across organizational boundaries.  Markdown
-export lets you seamlessly collaborate with other developers.  Finally, iCal
-export can extract entries with deadlines or appointments to produce a file
-in the iCalendar format.
+@lisp
+(require 'ox-md)
+@end lisp
 
 @menu
-* The Export Dispatcher::       The main exporter interface
-* Export back-ends::            Built-in export formats
-* Export settings::             Generic export settings
+* The export dispatcher::       The main interface
+* Export settings::             Common export settings
+* Table of contents::           The if and where of the table of contents
+* Include files::               Include additional files into a document
+* Macro replacement::           Use macros to create templates
+* Comment lines::               What will not be exported
 * ASCII/Latin-1/UTF-8 export::  Exporting to flat files with encoding
 * Beamer export::               Exporting as a Beamer presentation
 * HTML export::                 Exporting to HTML
-* @LaTeX{} and PDF export::     Exporting to @LaTeX{}, and processing to PDF
+* @LaTeX{} export::             Exporting to @LaTeX{}, and processing to PDF
 * Markdown export::             Exporting to Markdown
 * OpenDocument Text export::    Exporting to OpenDocument Text
 * Org export::                  Exporting to Org
 * Texinfo export::              Exporting to Texinfo
 * iCalendar export::            Exporting to iCalendar
 * Other built-in back-ends::    Exporting to a man page
-* Export in foreign buffers::   Author tables and lists in Org syntax
 * Advanced configuration::      Fine-tuning the export output
+* Export in foreign buffers::   Author tables and lists in Org syntax
 @end menu
 
-@node The Export Dispatcher, Export back-ends, Exporting, Exporting
-@section The Export Dispatcher
+@node The export dispatcher
+@section The export dispatcher
 @vindex org-export-dispatch-use-expert-ui
 @cindex Export, dispatcher
 
-The main entry point for export related tasks is the dispatcher, a
-hierarchical menu from which it is possible to select an export format and
-toggle export options@footnote{It is also possible to use a less intrusive
-interface by setting @code{org-export-dispatch-use-expert-ui} to a
-non-@code{nil} value.  In that case, only a prompt is visible from the
-minibuffer.  From there one can still switch back to regular menu by pressing
-@key{?}.} from which it is possible to select an export format and to toggle
-export options.
+The export dispatcher is the main interface for Org's exports.  A
+hierarchical menu presents the currently configured export formats.  Options
+are shown as easy toggle switches on the same screen.
+
+Org also has a minimal prompt interface for the export dispatcher.  When the
+variable @code{org-export-dispatch-use-expert-ui} is set to a non-@code{nil}
+value, Org prompts in the minibuffer.  To switch back to the hierarchical
+menu, press @key{?}.
 
-@c @quotation
 @table @asis
 @orgcmd{C-c C-e,org-export-dispatch}
 
-Dispatch for export and publishing commands.  When called with a @kbd{C-u}
-prefix argument, repeat the last export command on the current buffer while
-preserving toggled options.  If the current buffer hasn't changed and subtree
-export was activated, the command will affect that same subtree.
+Invokes the export dispatcher interface.  The options show default settings.
+The @kbd{C-u} prefix argument preserves options from the previous export,
+including any sub-tree selections.
+
 @end table
-@c @end quotation
 
-Normally the entire buffer is exported, but if there is an active region
-only that part of the buffer will be exported.
+Org exports the entire buffer by default.  If the Org buffer has an active
+region, then Org exports just that region.
 
-Several export options (@pxref{Export settings}) can be toggled from the
-export dispatcher with the following key combinations:
+These are the export options, the key combinations that toggle them
+(@pxref{Export settings}):
 
 @table @kbd
 @item C-a
 @vindex org-export-async-init-file
-Toggle asynchronous export.  Asynchronous export uses an external Emacs
-process that is configured with a specified initialization file.
+Toggles asynchronous export.  Asynchronous export uses an external Emacs
+process with a specially configured initialization file to complete the
+exporting process in the background thereby releasing the current interface.
+This is particularly useful when exporting long documents.
 
-While exporting asynchronously, the output is not displayed, but stored in
-a place called ``the export stack''.  This stack can be displayed by calling
-the dispatcher with a double @kbd{C-u} prefix argument, or with @kbd{&} key
-from the dispatcher menu.
+Output from an asynchronous export is saved on the ``the export stack''.  To
+view this stack, call the export dispatcher with a double @kbd{C-u} prefix
+argument.  If already in the export dispatcher menu, @kbd{&} displays the
+stack.
 
 @vindex org-export-in-background
-To make this behavior the default, customize the variable
+To make the background export process the default, customize the variable,
 @code{org-export-in-background}.
 
 @item C-b
-Toggle body-only export.  Its effect depends on the back-end used.
-Typically, if the back-end has a header section (like @code{<head>...</head>}
-in the HTML back-end), a body-only export will not include this header.
+Toggle body-only export.  Useful for excluding headers and footers in the
+export.  Affects only those back-end formats that have such sections---like
+@code{<head>...</head>} in HTML.
 
 @item C-s
 @vindex org-export-initial-scope
-Toggle subtree export.  The top heading becomes the document title.
+Toggle sub-tree export.  When turned on, Org exports only the sub-tree starting
+from the cursor position at the time the export dispatcher was invoked.  Org
+uses the top heading of this sub-tree as the document's title.  If the cursor
+is not on a heading, Org uses the nearest enclosing header.  If the cursor is
+in the document preamble, Org signals an error and aborts export.
 
-You can change the default state of this option by setting
+To make the sub-tree export the default, customize the variable,
 @code{org-export-initial-scope}.
 
 @item C-v
-Toggle visible-only export.  Only export the text that is currently
-visible, i.e., not hidden by outline visibility in the buffer.
-
+Toggle visible-only export.  Useful for exporting only visible parts of an
+Org document by adjusting outline visibility settings.
 @end table
 
-@vindex org-export-copy-to-kill-ring
-With the exception of asynchronous export, a successful export process writes
-its output to the kill-ring. You can configure this behavior by altering the
-option @code{org-export-copy-to-kill-ring}.
-
-@node Export back-ends, Export settings, The Export Dispatcher, Exporting
-@section Export back-ends
-@cindex Export, back-ends
-
-An export back-end is a library that translates Org syntax into a foreign
-format.  An export format is not available until the proper back-end has been
-loaded.
-
-@vindex org-export-backends
-By default, the following four back-ends are loaded: @code{ascii},
-@code{html}, @code{icalendar} and @code{latex}.  It is possible to add more
-(or remove some) by customizing @code{org-export-backends}.
-
-Built-in back-ends include:
-
-@itemize
-@item ascii (ASCII format)
-@item beamer (@LaTeX{} Beamer format)
-@item html (HTML format)
-@item icalendar (iCalendar format)
-@item latex (@LaTeX{} format)
-@item man (Man page format)
-@item md (Markdown format)
-@item odt (OpenDocument Text format)
-@item org (Org format)
-@item texinfo (Texinfo format)
-@end itemize
-
-Other back-ends might be found in the @code{contrib/} directory
-(@pxref{Installation}).
-
-@node Export settings, ASCII/Latin-1/UTF-8 export, Export back-ends, Exporting
+@node Export settings
 @section Export settings
 @cindex Export, settings
 
+@cindex #+OPTIONS
 Export options can be set: globally with variables; for an individual file by
 making variables buffer-local with in-buffer settings (@pxref{In-buffer
 settings}), by setting individual keywords, or by specifying them in a
 compact form with the @code{#+OPTIONS} keyword; or for a tree by setting
-properties (@pxref{Properties and Columns}).  Options set at a specific level
+properties (@pxref{Properties and columns}).  Options set at a specific level
 override options set at a more general level.
 
 @cindex #+SETUPFILE
 In-buffer settings may appear anywhere in the file, either directly or
 indirectly through a file included using @samp{#+SETUPFILE: filename} syntax.
 Option keyword sets tailored to a particular back-end can be inserted from
-the export dispatcher (@pxref{The Export Dispatcher}) using the @code{Insert
+the export dispatcher (@pxref{The export dispatcher}) using the @code{Insert
 template} command by pressing @key{#}.  To insert keywords individually,
 a good way to make sure the keyword is correct is to type @code{#+} and then
-to use @kbd{M-<TAB>} for completion.
+to use @kbd{M-@key{TAB}}@footnote{Many desktops intercept @kbd{M-TAB} to
+switch windows.  Use @kbd{C-M-i} or @kbd{@key{ESC} @key{TAB}} instead.} for
+completion.
 
 The export keywords available for every back-end, and their equivalent global
 variables, include:
 
 @table @samp
 @item AUTHOR
+@cindex #+AUTHOR
 @vindex user-full-name
 The document author (@code{user-full-name}).
 
 @item CREATOR
+@cindex #+CREATOR
 @vindex org-export-creator-string
 Entity responsible for output generation (@code{org-export-creator-string}).
 
 @item DATE
+@cindex #+DATE
 @vindex org-export-date-timestamp-format
 A date or a time-stamp@footnote{The variable
 @code{org-export-date-timestamp-format} defines how this time-stamp will be
 exported.}.
 
-@item DESCRIPTION
-The document description.  Back-ends handle it as they see fit (e.g., for the
-XHTML meta tag), if at all.  You can use several such keywords for long
-descriptions.
-
 @item EMAIL
+@cindex #+EMAIL
 @vindex user-mail-address
 The email address (@code{user-mail-address}).
 
-@item KEYWORDS
-The keywords defining the contents of the document.  Back-ends handle it as
-they see fit (e.g., for the XHTML meta tag), if at all.  You can use several
-such keywords if the list is long.
-
 @item LANGUAGE
+@cindex #+LANGUAGE
 @vindex org-export-default-language
-The language used for translating some strings
-(@code{org-export-default-language}).  E.g., @samp{#+LANGUAGE: fr} will tell
-Org to translate @emph{File} (english) into @emph{Fichier} (french) in the
-clocktable.
+Language to use for translating certain strings
+(@code{org-export-default-language}).  With @samp{#+LANGUAGE: fr}, for
+example, Org translates @emph{Table of contents} to the French @emph{Table
+des matières}.
 
 @item SELECT_TAGS
+@cindex #+SELECT_TAGS
 @vindex org-export-select-tags
-The tags that select a tree for export (@code{org-export-select-tags}).  The
-default value is @code{:export:}.  Within a subtree tagged with
-@code{:export:}, you can still exclude entries with @code{:noexport:} (see
-below).  When headlines are selectively exported with @code{:export:}
-anywhere in a file, text before the first headline is ignored.
+The default value is @code{:export:}.  When a tree is tagged with
+@code{:export:} (@code{org-export-select-tags}), Org selects that tree and
+its sub-trees for export.  Org excludes trees with @code{:noexport:} tags,
+see below.  When selectively exporting files with @code{:export:} tags set,
+Org does not export any text that appears before the first headline.
 
 @item EXCLUDE_TAGS
-The tags that exclude a tree from export (@code{org-export-exclude-tags}).
-The default value is @code{:noexport:}.  Entries with the @code{:noexport:}
-tag will be unconditionally excluded from the export, even if they have an
-@code{:export:} tag.
+@cindex #+EXCLUDE_TAGS
+@vindex org-export-exclude-tags
+The default value is @code{:noexport:}.  When a tree is tagged with
+@code{:noexport:} (@code{org-export-exclude-tags}), Org excludes that tree
+and its sub-trees from export.  Entries tagged with @code{:noexport:} will be
+unconditionally excluded from the export, even if they have an
+@code{:export:} tag.  Even if a sub-tree is not exported, Org will execute any
+code blocks contained in them.
 
 @item TITLE
-The title to be shown (otherwise derived from buffer's name).  You can use
-several such keywords for long titles.
+@cindex #+TITLE
+@cindex document title
+Org displays this title.  For long titles, use multiple @code{#+TITLE} lines.
 @end table
 
-The @code{#+OPTIONS} keyword is a compact@footnote{If you want to configure
-many options this way, you can use several @code{#+OPTIONS} lines.} form that
-recognizes the following arguments:
+The @code{#+OPTIONS} keyword is a compact form.  To configure multiple
+options, use several @code{#+OPTIONS} lines.  @code{#+OPTIONS} recognizes the
+following arguments.
 
 @table @code
 @item ':
 @vindex org-export-with-smart-quotes
-Toggle smart quotes (@code{org-export-with-smart-quotes}).
+Toggle smart quotes (@code{org-export-with-smart-quotes}).  Depending on the
+language used, when activated, Org treats pairs of double quotes as primary
+quotes, pairs of single quotes as secondary quotes, and single quote marks as
+apostrophes.
 
 @item *:
 Toggle emphasized text (@code{org-export-with-emphasize}).
@@ -10587,12 +10523,12 @@ Toggle fixed-width sections
 
 @item <:
 @vindex org-export-with-timestamps
-Toggle inclusion of any time/date active/inactive stamps
+Toggle inclusion of time/date active/inactive stamps
 (@code{org-export-with-timestamps}).
 
-@item :
+@item \n:
 @vindex org-export-preserve-breaks
-Toggle line-break-preservation (@code{org-export-preserve-breaks}).
+Toggles whether to preserve line breaks (@code{org-export-preserve-breaks}).
 
 @item ^:
 @vindex org-export-with-sub-superscripts
@@ -10602,8 +10538,8 @@ it is (@code{org-export-with-sub-superscripts}).
 
 @item arch:
 @vindex org-export-with-archived-trees
-Configure export of archived trees.  Can be set to @code{headline} to only
-process the headline, skipping its contents
+Configure how archived trees are exported.  When set to @code{headline}, the
+export process skips the contents and processes only the headlines
 (@code{org-export-with-archived-trees}).
 
 @item author:
@@ -10611,19 +10547,29 @@ process the headline, skipping its contents
 Toggle inclusion of author name into exported file
 (@code{org-export-with-author}).
 
+@item broken-links:
+@vindex org-export-with-broken-links
+Toggles if Org should continue exporting upon finding a broken internal link.
+When set to @code{mark}, Org clearly marks the problem link in the output
+(@code{org-export-with-broken-links}).
+
 @item c:
 @vindex org-export-with-clocks
 Toggle inclusion of CLOCK keywords (@code{org-export-with-clocks}).
 
 @item creator:
 @vindex org-export-with-creator
-Configure inclusion of creator info into exported file.  It may be set to
-@code{comment} (@code{org-export-with-creator}).
+Toggle inclusion of creator information in the exported file
+(@code{org-export-with-creator}).
 
 @item d:
 @vindex org-export-with-drawers
-Toggle inclusion of drawers, or list drawers to include
-(@code{org-export-with-drawers}).
+Toggles inclusion of drawers, or list of drawers to include, or list of
+drawers to exclude (@code{org-export-with-drawers}).
+
+@item date:
+@vindex org-export-with-date
+Toggle inclusion of a date into exported file (@code{org-export-with-date}).
 
 @item e:
 @vindex org-export-with-entities
@@ -10650,20 +10596,28 @@ Toggle inclusion of inlinetasks (@code{org-export-with-inlinetasks}).
 
 @item num:
 @vindex org-export-with-section-numbers
-Toggle section-numbers (@code{org-export-with-section-numbers}).  It can also
-be set to a number @samp{n}, so only headlines at that level or above will be
-numbered.
+@cindex property, UNNUMBERED
+Toggle section-numbers (@code{org-export-with-section-numbers}).  When set to
+number @samp{n}, Org numbers only those headlines at level @samp{n} or above.
+Set @code{UNNUMBERED} property to non-@code{nil} to disable numbering of
+heading and subheadings entirely.
 
 @item p:
 @vindex org-export-with-planning
 Toggle export of planning information (@code{org-export-with-planning}).
-``Planning information'' is the line containing the @code{SCHEDULED:}, the
-@code{DEADLINE:} or the @code{CLOSED:} cookies or a combination of them.
+``Planning information'' comes from lines located right after the headline
+and contain any combination of these cookies: @code{SCHEDULED:},
+@code{DEADLINE:}, or @code{CLOSED:}.
 
 @item pri:
 @vindex org-export-with-priority
 Toggle inclusion of priority cookies (@code{org-export-with-priority}).
 
+@item prop:
+@vindex org-export-with-properties
+Toggle inclusion of property drawers, or list the properties to include
+(@code{org-export-with-properties}).
+
 @item stat:
 @vindex org-export-with-statistics-cookies
 Toggle inclusion of statistics cookies
@@ -10676,20 +10630,24 @@ Toggle inclusion of tags, may also be @code{not-in-toc}
 
 @item tasks:
 @vindex org-export-with-tasks
-Toggle inclusion of tasks (TODO items), can be @code{nil} to remove all
-tasks, @code{todo} to remove DONE tasks, or a list of keywords to keep
+Toggle inclusion of tasks (TODO items); or @code{nil} to remove all tasks; or
+@code{todo} to remove DONE tasks; or list the keywords to keep
 (@code{org-export-with-tasks}).
 
 @item tex:
 @vindex org-export-with-latex
-Configure export of @LaTeX{} fragments and environments.  It may be set to
-@code{verbatim} (@code{org-export-with-latex}).
+@code{nil} does not export; @code{t} exports; @code{verbatim} keeps
+everything in verbatim (@code{org-export-with-latex}).
 
 @item timestamp:
 @vindex org-export-time-stamp-file
-Toggle inclusion of the creation time into exported file
+Toggle inclusion of the creation time in the exported file
 (@code{org-export-time-stamp-file}).
 
+@item title:
+@vindex org-export-with-title
+Toggle inclusion of title (@code{org-export-with-title}).
+
 @item toc:
 @vindex org-export-with-toc
 Toggle inclusion of the table of contents, or set the level limit
@@ -10703,255 +10661,589 @@ Toggle inclusion of TODO keywords into exported text
 @item |:
 @vindex org-export-with-tables
 Toggle inclusion of tables (@code{org-export-with-tables}).
+
 @end table
 
-When exporting only a subtree, each of the previous keywords@footnote{With
-the exception of @samp{SETUPFILE}.} can be overridden locally by special node
-properties.  These begin with @samp{EXPORT_}, followed by the name of the
-keyword they supplant.  For example, @samp{DATE} and @samp{OPTIONS} keywords
-become, respectively, @samp{EXPORT_DATE} and @samp{EXPORT_OPTIONS}
-properties.
+When exporting sub-trees, special node properties in them can override the
+above keywords.  They are special because they have an @samp{EXPORT_} prefix.
+For example, @samp{DATE} and @samp{OPTIONS} keywords become, respectively,
+@samp{EXPORT_DATE} and @samp{EXPORT_OPTIONS}.  Except for @samp{SETUPFILE},
+all other keywords listed above have an @samp{EXPORT_} equivalent.
 
 @cindex #+BIND
 @vindex org-export-allow-bind-keywords
 If @code{org-export-allow-bind-keywords} is non-@code{nil}, Emacs variables
 can become buffer-local during export by using the BIND keyword.  Its syntax
 is @samp{#+BIND: variable value}.  This is particularly useful for in-buffer
-settings that cannot be changed using specific keywords.
+settings that cannot be changed using keywords.
 
 @cindex property, EXPORT_FILE_NAME
-The name of the output file to be generated is taken from the file associated
-to the buffer, when possible, or asked to you otherwise.  For subtree export,
-you can also set @samp{EXPORT_FILE_NAME} property.  In all cases, only the
-base name of the file is retained, and a back-end specific extension is
-added.
+Normally Org generates the file name based on the buffer name and the
+extension based on the back-end format.  For sub-trees, Org can export to a
+file name as specified in the @code{EXPORT_FILE_NAME} property.
+
+@node Table of contents
+@section Table of contents
+@cindex table of contents
+@cindex list of tables
+@cindex list of listings
+
+@cindex #+TOC
+@vindex org-export-with-toc
+Org normally inserts the table of contents directly before the first headline
+of the file.  Org sets the TOC depth the same as the headline levels in the
+file.  Use a lower number for lower TOC depth.  To turn off TOC entirely, use
+@code{nil}.  This is configured in the @code{org-export-with-toc} variable or
+as keywords in an Org file as:
+
+@example
+#+OPTIONS: toc:2          @r{only include two levels in TOC}
+#+OPTIONS: toc:nil        @r{no default TOC at all}
+@end example
+
+To move the table of contents to a different location, first turn off the
+default with @code{org-export-with-toc} variable or with @code{#+OPTIONS:
+toc:nil}.  Then insert @code{#+TOC: headlines N} at the desired location(s).
+
+@example
+#+OPTIONS: toc:nil        @r{no default TOC}
+...
+#+TOC: headlines 2        @r{insert TOC here, with two headline levels}
+@end example
+
+To adjust the TOC depth for a specific section of the Org document, append an
+additional @samp{local} parameter.  This parameter becomes a relative depth
+for the current level.
 
-@node ASCII/Latin-1/UTF-8 export, Beamer export, Export settings, Exporting
+Note that for this feature to work properly in @LaTeX{} export, the Org file
+requires the inclusion of the @code{titletoc} package.  Because of
+compatibility issues, @code{titletoc} has to be loaded @emph{before}
+@code{hyperref}.  Customize the @code{org-latex-default-packages-alist}
+variable.
+
+@example
+* Section #+TOC: headlines 1 local @r{insert local TOC, with direct children
+only}
+@end example
+
+Use the @code{TOC} keyword to generate list of tables (resp.@: all listings)
+with captions.
+
+@example
+#+TOC: listings           @r{build a list of listings}
+#+TOC: tables             @r{build a list of tables}
+@end example
+
+@cindex property, ALT_TITLE
+Normally Org uses the headline for its entry in the table of contents.  But
+with @code{ALT_TITLE} property, a different entry can be specified for the
+table of contents.
+
+@node Include files
+@section Include files
+@cindex include files, during export
+Include other files during export.  For example, to include your @file{.emacs}
+file, you could use:
+@cindex #+INCLUDE
+
+@example
+#+INCLUDE: "~/.emacs" src emacs-lisp
+@end example
+
+@noindent
+The first parameter is the file name to include.  The optional second
+parameter specifies the block type: @samp{example}, @samp{export} or
+@samp{src}.  The optional third parameter specifies the source code language
+to use for formatting the contents.  This is relevant to both @samp{export}
+and @samp{src} block types.
+
+If an include file is specified as having a markup language, Org neither
+checks for valid syntax nor changes the contents in any way.  For
+@samp{example} and @samp{src} blocks, Org code-escapes the contents before
+inclusion.
+
+If an include file is not specified as having any markup language, Org
+assumes it be in Org format and proceeds as usual with a few exceptions.  Org
+makes the footnote labels (@pxref{Footnotes}) in the included file local to
+that file.  The contents of the included file will belong to the same
+structure---headline, item---containing the @code{INCLUDE} keyword.  In
+particular, headlines within the file will become children of the current
+section.  That behavior can be changed by providing an additional keyword
+parameter, @code{:minlevel}.  It shifts the headlines in the included file to
+become the lowest level.  For example, this syntax makes the included file
+a sibling of the current top-level headline:
+
+@example
+#+INCLUDE: "~/my-book/chapter2.org" :minlevel 1
+@end example
+
+Inclusion of only portions of files are specified using ranges parameter with
+@code{:lines} keyword.  The line at the upper end of the range will not be
+included.  The start and/or the end of the range may be omitted to use the
+obvious defaults.
+
+@example
+#+INCLUDE: "~/.emacs" :lines "5-10"   @r{Include lines 5 to 10, 10 excluded}
+#+INCLUDE: "~/.emacs" :lines "-10"    @r{Include lines 1 to 10, 10 excluded}
+#+INCLUDE: "~/.emacs" :lines "10-"    @r{Include lines from 10 to EOF}
+@end example
+
+Inclusions may specify a file-link to extract an object matched by
+@code{org-link-search}@footnote{Note that
+@code{org-link-search-must-match-exact-headline} is locally bound to
+non-@code{nil}.  Therefore, @code{org-link-search} only matches headlines and
+named elements.}  (@pxref{Search options}).
+
+To extract only the contents of the matched object, set @code{:only-contents}
+property to non-@code{nil}.  This will omit any planning lines or property
+drawers.  The ranges for @code{:lines} keyword are relative to the requested
+element.  Some examples:
+
+@example
+#+INCLUDE: "./paper.org::#theory" :only-contents t
+   @r{Include the body of the heading with the custom id @samp{theory}}
+#+INCLUDE: "./paper.org::mytable"  @r{Include named element.}
+#+INCLUDE: "./paper.org::*conclusion" :lines 1-20
+   @r{Include the first 20 lines of the headline named @samp{conclusion}.}
+@end example
+
+@table @kbd
+@kindex C-c '
+@item C-c '
+Visit the include file at point.
+@end table
+
+@node Macro replacement
+@section Macro replacement
+@cindex macro replacement, during export
+@cindex #+MACRO
+
+Macros replace text snippets during export.  This is a macro definition in
+Org:
+
+@example
+#+MACRO: name   replacement text $1, $2 are arguments
+@end example
+
+@noindent which can be referenced using
+@code{@{@{@{name(arg1, arg2)@}@}@}}@footnote{Since commas separate the
+arguments, commas within arguments have to be escaped with the backslash
+character.  So only those backslash characters before a comma need escaping
+with another backslash character.}.
+
+Org recognizes macro references in following Org markup areas: paragraphs,
+headlines, verse blocks, tables cells and lists.  Org also recognizes macro
+references in keywords, such as @code{#+CAPTION}, @code{#+TITLE},
+@code{#+AUTHOR}, @code{#+DATE}, and for some back-end specific export
+options.
+
+Org comes with following pre-defined macros:
+
+@table @code
+@item @{@{@{title@}@}@}
+@itemx @{@{@{author@}@}@}
+@itemx @{@{@{email@}@}@}
+@cindex title, macro
+@cindex author, macro
+@cindex email, macro
+Org replaces these macro references with available information at the time of
+export.
+
+@item @{@{@{date@}@}@}
+@itemx @{@{@{date(@var{FORMAT})@}@}@}
+@cindex date, macro
+This macro refers to the @code{#+DATE} keyword.  @var{FORMAT} is an optional
+argument to the @code{@{@{@{date@}@}@}} macro that will be used only if
+@code{#+DATE} is a single timestamp.  @var{FORMAT} should be a format string
+understood by @code{format-time-string}.
+
+@item @{@{@{time(@var{FORMAT})@}@}@}
+@itemx @{@{@{modification-time(@var{FORMAT}, @var{VC})@}@}@}
+@cindex time, macro
+@cindex modification time, macro
+These macros refer to the document's date and time of export and date and
+time of modification.  @var{FORMAT} is a string understood by
+@code{format-time-string}.  If the second argument to the
+@code{modification-time} macro is non-@code{nil}, Org uses @file{vc.el} to
+retrieve the document's modification time from the version control
+system.  Otherwise Org reads the file attributes.
+
+@item @{@{@{input-file@}@}@}
+@cindex input file, macro
+This macro refers to the filename of the exported file.
+
+@item @{@{@{property(@var{PROPERTY-NAME})@}@}@}
+@itemx @{@{@{property(@var{PROPERTY-NAME},@var{SEARCH-OPTION})@}@}@}
+@cindex property, macro
+This macro returns the value of property @var{PROPERTY-NAME} in the current
+entry.  If @var{SEARCH-OPTION} (@pxref{Search options}) refers to a remote
+entry, that will be used instead.
+@end table
+
+The surrounding brackets can be made invisible by setting
+@code{org-hide-macro-markers} non-@code{nil}.
+
+Org expands macros at the very beginning of the export process.
+
+@node Comment lines
+@section Comment lines
+@cindex exporting, not
+
+@cindex comment lines
+Lines starting with zero or more whitespace characters followed by one
+@samp{#} and a whitespace are treated as comments and, as such, are not
+exported.
+
+@cindex #+BEGIN_COMMENT
+Likewise, regions surrounded by @samp{#+BEGIN_COMMENT}
+... @samp{#+END_COMMENT} are not exported.
+
+@cindex comment trees
+Finally, a @samp{COMMENT} keyword at the beginning of an entry, but after any
+other keyword or priority cookie, comments out the entire subtree.  In this
+case, the subtree is not exported and no code block within it is executed
+either@footnote{For a less drastic behavior, consider using a select tag
+(@pxref{Export settings}) instead.}.  The command below helps changing the
+comment status of a headline.
+
+@table @kbd
+@kindex C-c ;
+@item C-c ;
+Toggle the @samp{COMMENT} keyword at the beginning of an entry.
+@end table
+
+@node ASCII/Latin-1/UTF-8 export
 @section ASCII/Latin-1/UTF-8 export
 @cindex ASCII export
 @cindex Latin-1 export
 @cindex UTF-8 export
 
-ASCII export produces a simple and very readable version of an Org mode
-file, containing only plain ASCII@.  Latin-1 and UTF-8 export augment the file
-with special characters and symbols available in these encodings.
+ASCII export produces an output file containing only plain ASCII characters.
+This is the most simplest and direct text output.  It does not contain any
+Org markup either.  Latin-1 and UTF-8 export use additional characters and
+symbols available in these encoding standards.  All three of these export
+formats offer the most basic of text output for maximum portability.
+
+@vindex org-ascii-text-width
+On export, Org fills and justifies text according to the text width set in
+@code{org-ascii-text-width}.
 
 @vindex org-ascii-links-to-notes
-Links are 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-ascii-links-to-notes} for details and other options.
+Org exports links using a footnote-like style where the descriptive part is
+in the text and the link is in a note before the next heading.  See the
+variable @code{org-ascii-links-to-notes} for details.
 
 @subheading ASCII export commands
 
 @table @kbd
 @orgcmd{C-c C-e t a/l/u,org-ascii-export-to-ascii}
-Export as an ASCII file.  For an Org file, @file{myfile.org}, the ASCII file
-will be @file{myfile.txt}.  The file will be overwritten without warning.
-When the original file is @file{myfile.txt}, the resulting file becomes
-@file{myfile.txt.txt} in order to prevent data loss.
+Export as an ASCII file with a @file{.txt} extension.  For @file{myfile.org},
+Org exports to @file{myfile.txt}, overwriting without warning.  For
+@file{myfile.txt}, Org exports to @file{myfile.txt.txt} in order to prevent
+data loss.
 @orgcmd{C-c C-e t A/L/U,org-ascii-export-as-ascii}
-Export to a temporary buffer.  Do not create a file.
+Export to a temporary buffer.  Does not create a file.
+@end table
+
+@subheading ASCII specific export settings
+The ASCII export back-end has one extra keyword for customizing ASCII output.
+Setting this keyword works similar to the general options (@pxref{Export
+settings}).
+
+@table @samp
+@item SUBTITLE
+@cindex #+SUBTITLE (ASCII)
+The document subtitle.  For long subtitles, use multiple @code{#+SUBTITLE}
+lines in the Org file.  Org prints them on one continuous line, wrapping into
+multiple lines if necessary.
 @end table
 
 @subheading Header and sectioning structure
 
-In the exported version, the first three outline levels become headlines,
-defining a general document structure.  Additional levels are exported as
-lists.  The transition can also occur at a different level (@pxref{Export
-settings}).
+Org converts the first three outline levels into headlines for ASCII export.
+The remaining levels are turned into lists.  To change this cut-off point
+where levels become lists, @pxref{Export settings}.
 
 @subheading Quoting ASCII text
 
-You can insert text that will only appear when using @code{ASCII} back-end
-with the following constructs:
+To insert text within the Org file by the ASCII back-end, use one the
+following constructs, inline, keyword, or export block:
 
 @cindex #+ASCII
-@cindex #+BEGIN_ASCII
+@cindex #+BEGIN_EXPORT ascii
 @example
-Text @@@@ascii:and additional text@@@@ within a paragraph.
+Inline text @@@@ascii:and additional text@@@@ within a paragraph.
 
 #+ASCII: Some text
 
-#+BEGIN_ASCII
-All lines in this block will appear only when using this back-end.
-#+END_ASCII
+#+BEGIN_EXPORT ascii
+Org exports text in this block only when using ASCII back-end.
+#+END_EXPORT
 @end example
 
 @subheading ASCII specific attributes
 @cindex #+ATTR_ASCII
 @cindex horizontal rules, in ASCII export
 
-@code{ASCII} back-end only understands one attribute, @code{:width}, which
-specifies the length, in characters, of a given horizontal rule.  It must be
-specified using an @code{ATTR_ASCII} line, directly preceding the rule.
+ASCII back-end recognizes only one attribute, @code{:width}, which specifies
+the width of an horizontal rule in number of characters.  The keyword and
+syntax for specifying widths is:
 
 @example
 #+ATTR_ASCII: :width 10
 -----
 @end example
 
-@node Beamer export, HTML export, ASCII/Latin-1/UTF-8 export, Exporting
+@subheading ASCII special blocks
+@cindex special blocks, in ASCII export
+@cindex #+BEGIN_JUSTIFYLEFT
+@cindex #+BEGIN_JUSTIFYRIGHT
+
+Besides @code{#+BEGIN_CENTER} blocks (@pxref{Paragraphs}), ASCII back-end has
+these two left and right justification blocks:
+
+@example
+#+BEGIN_JUSTIFYLEFT
+It's just a jump to the left...
+#+END_JUSTIFYLEFT
+
+#+BEGIN_JUSTIFYRIGHT
+...and then a step to the right.
+#+END_JUSTIFYRIGHT
+@end example
+
+@node Beamer export
 @section Beamer export
 @cindex Beamer export
 
-The @LaTeX{} class @emph{Beamer} allows production of high quality
-presentations using @LaTeX{} and pdf processing.  Org mode has special
-support for turning an Org mode file or tree into a Beamer presentation.
+Org uses @emph{Beamer} export to convert an Org file tree structure into a
+high-quality interactive slides for presentations.  @emph{Beamer} is a
+@LaTeX{} document class for creating presentations in PDF, HTML, and other
+popular display formats.
 
-@subheading Beamer export commands
+@menu
+* Beamer export commands::      For creating Beamer documents.
+* Beamer specific export settings::  For customizing Beamer export.
+* Sectioning Frames and Blocks in Beamer::  For composing Beamer slides.
+* Beamer specific syntax::      For using in Org documents.
+* Editing support::             For using helper functions.
+* A Beamer example::            A complete presentation.
+@end menu
+
+@node Beamer export commands
+@subsection Beamer export commands
 
 @table @kbd
 @orgcmd{C-c C-e l b,org-beamer-export-to-latex}
-Export as a @LaTeX{} file.  For an Org file @file{myfile.org}, the @LaTeX{}
-file will be @file{myfile.tex}.  The file will be overwritten without
-warning.
+Export as @LaTeX{} file with a @file{.tex} extension.  For @file{myfile.org},
+Org exports to @file{myfile.tex}, overwriting without warning.
 @orgcmd{C-c C-e l B,org-beamer-export-as-latex}
-Export to a temporary buffer.  Do not create a file.
+Export to a temporary buffer.  Does not create a file.
 @orgcmd{C-c C-e l P,org-beamer-export-to-pdf}
-Export as @LaTeX{} and then process to PDF.
+Export as @LaTeX{} file and then convert it to PDF format.
 @item C-c C-e l O
-Export as @LaTeX{} and then process to PDF, then open the resulting PDF file.
+Export as @LaTeX{} file, convert it to PDF format, and then open the PDF
+file.
+@end table
+
+@node Beamer specific export settings
+@subsection Beamer specific export settings
+
+Beamer export back-end has several additional keywords for customizing Beamer
+output.  These keywords work similar to the general options settings
+(@pxref{Export settings}).
+
+@table @samp
+@item BEAMER_THEME
+@cindex #+BEAMER_THEME
+@vindex org-beamer-theme
+The Beamer layout theme (@code{org-beamer-theme}).  Use square brackets for
+options.  For example:
+@smallexample
+#+BEAMER_THEME: Rochester [height=20pt]
+@end smallexample
+
+@item BEAMER_FONT_THEME
+@cindex #+BEAMER_FONT_THEME
+The Beamer font theme.
+
+@item BEAMER_INNER_THEME
+@cindex #+BEAMER_INNER_THEME
+The Beamer inner theme.
+
+@item BEAMER_OUTER_THEME
+@cindex #+BEAMER_OUTER_THEME
+The Beamer outer theme.
+
+@item BEAMER_HEADER
+@cindex #+BEAMER_HEADER
+Arbitrary lines inserted in the preamble, just before the @samp{hyperref}
+settings.
+
+@item DESCRIPTION
+@cindex #+DESCRIPTION (Beamer)
+The document description.  For long descriptions, use multiple
+@code{#+DESCRIPTION} keywords.  By default, @samp{hyperref} inserts
+@code{#+DESCRIPTION} as metadata.  Use @code{org-latex-hyperref-template} to
+configure document metadata.  Use @code{org-latex-title-command} to configure
+typesetting of description as part of front matter.
+
+@item KEYWORDS
+@cindex #+KEYWORDS (Beamer)
+The keywords for defining the contents of the document.  Use multiple
+@code{#+KEYWORDS} lines if necessary.  By default, @samp{hyperref} inserts
+@code{#+KEYWORDS} as metadata.  Use @code{org-latex-hyperref-template} to
+configure document metadata.  Use @code{org-latex-title-command} to configure
+typesetting of keywords as part of front matter.
+
+@item SUBTITLE
+@cindex #+SUBTITLE (Beamer)
+@vindex org-beamer-subtitle-format
+Document's subtitle.  For typesetting, use @code{org-beamer-subtitle-format}
+string.  Use @code{org-latex-hyperref-template} to configure document
+metadata.  Use @code{org-latex-title-command} to configure typesetting of
+subtitle as part of front matter.
 @end table
 
-@subheading Sectioning, Frames and Blocks
+@node Sectioning Frames and Blocks in Beamer
+@subsection Sectioning, Frames and Blocks in Beamer
 
-Any tree with not-too-deep level nesting should in principle be exportable as
-a Beamer presentation.  Headlines fall into three categories: sectioning
-elements, frames and blocks.
+Org transforms heading levels into Beamer's sectioning elements, frames and
+blocks.  Any Org tree with a not-too-deep-level nesting should in principle
+be exportable as a Beamer presentation.
 
 @itemize @minus
 @item
 @vindex org-beamer-frame-level
-Headlines become frames when their level is equal to
+Org headlines become Beamer frames when the heading level in Org is equal to
 @code{org-beamer-frame-level} or @code{H} value in an @code{OPTIONS} line
 (@pxref{Export settings}).
 
 @cindex property, BEAMER_ENV
-Though, if a headline in the current tree has a @code{BEAMER_ENV} property
-set to either to @code{frame} or @code{fullframe}, its level overrides the
-variable.  A @code{fullframe} is a frame with an empty (ignored) title.
+Org overrides headlines to frames conversion for the current tree of an Org
+file if it encounters the @code{BEAMER_ENV} property set to @code{frame} or
+@code{fullframe}.  Org ignores whatever @code{org-beamer-frame-level} happens
+to be for that headline level in the Org tree.  In Beamer terminology, a
+@code{fullframe} is a frame without its title.
 
 @item
 @vindex org-beamer-environments-default
 @vindex org-beamer-environments-extra
-All frame's children become @code{block} environments.  Special block types
-can be enforced by setting headline's @code{BEAMER_ENV} property@footnote{If
-this property is set, the entry will also get a @code{:B_environment:} tag to
-make this visible.  This tag has no semantic meaning, it is only a visual
-aid.} to an appropriate value (see @code{org-beamer-environments-default} for
-supported values and @code{org-beamer-environments-extra} for adding more).
+Org exports a Beamer frame's objects as @code{block} environments.  Org can
+enforce wrapping in special block types when @code{BEAMER_ENV} property is
+set@footnote{If @code{BEAMER_ENV} is set, Org export adds
+@code{:B_environment:} tag to make it visible.  The tag serves as a visual
+aid and has no semantic relevance.}.  For valid values see
+@code{org-beamer-environments-default}.  To add more values, see
+@code{org-beamer-environments-extra}.
 
 @item
 @cindex property, BEAMER_REF
-As a special case, if the @code{BEAMER_ENV} property is set to either
-@code{appendix}, @code{note}, @code{noteNH} or @code{againframe}, the
-headline will become, respectively, an appendix, a note (within frame or
-between frame, depending on its level), a note with its title ignored or an
-@code{\againframe} command.  In the latter case, a @code{BEAMER_REF} property
-is mandatory in order to refer to the frame being resumed, and contents are
-ignored.
-
-Also, a headline with an @code{ignoreheading} environment will have its
-contents only inserted in the output.  This special value is useful to have
-data between frames, or to properly close a @code{column} environment.
+If @code{BEAMER_ENV} is set to @code{appendix}, Org exports the entry as an
+appendix.  When set to @code{note}, Org exports the entry as a note within
+the frame or between frames, depending on the entry's heading level.  When
+set to @code{noteNH}, Org exports the entry as a note without its title.
+When set to @code{againframe}, Org exports the entry with @code{\againframe}
+command, which makes setting the @code{BEAMER_REF} property mandatory because
+@code{\againframe} needs frame to resume.
+
+When @code{ignoreheading} is set, Org export ignores the entry's headline but
+not its content.  This is useful for inserting content between frames.  It is
+also useful for properly closing a @code{column} environment.
 @end itemize
 
 @cindex property, BEAMER_ACT
 @cindex property, BEAMER_OPT
-Headlines also support @code{BEAMER_ACT} and @code{BEAMER_OPT} properties.
-The former is translated as an overlay/action specification, or a default
-overlay specification when enclosed within square brackets.  The latter
-specifies options@footnote{The @code{fragile} option is added automatically
-if it contains code that requires a verbatim environment, though.} for the
-current frame or block.  The export back-end will automatically wrap
-properties within angular or square brackets when appropriate.
+When @code{BEAMER_ACT} is set for a headline, Org export translates that
+headline as an overlay or action specification.  When enclosed in square
+brackets, Org export makes the overlay specification a default.  Use
+@code{BEAMER_OPT} to set any options applicable to the current Beamer frame
+or block.  The Beamer export back-end wraps with appropriate angular or
+square brackets.  It also adds the @code{fragile} option for any code that may
+require a verbatim block.
 
 @cindex property, BEAMER_COL
-Moreover, headlines handle the @code{BEAMER_COL} property.  Its value should
-be a decimal number representing the width of the column as a fraction of the
-total text width.  If the headline has no specific environment, its title
-will be ignored and its contents will fill the column created.  Otherwise,
-the block will fill the whole column and the title will be preserved.  Two
-contiguous headlines with a non-@code{nil} @code{BEAMER_COL} value share the same
-@code{columns} @LaTeX{} environment.  It will end before the next headline
-without such a property.  This environment is generated automatically.
-Although, it can also be explicitly created, with a special @code{columns}
-value for @code{BEAMER_ENV} property (if it needs to be set up with some
-specific options, for example).
-
-@subheading Beamer specific syntax
-
-Beamer back-end is an extension of @LaTeX{} back-end.  As such, all @LaTeX{}
-specific syntax (e.g., @samp{#+LATEX:} or @samp{#+ATTR_LATEX:}) is
-recognized.  See @ref{@LaTeX{} and PDF export} for more information.
-
-@cindex #+BEAMER_THEME
-@cindex #+BEAMER_COLOR_THEME
-@cindex #+BEAMER_FONT_THEME
-@cindex #+BEAMER_INNER_THEME
-@cindex #+BEAMER_OUTER_THEME
-Beamer export introduces a number of keywords to insert code in the
-document's header.  Four control appearance of the presentation:
-@code{#+BEAMER_THEME}, @code{#+BEAMER_COLOR_THEME},
-@code{#+BEAMER_FONT_THEME}, @code{#+BEAMER_INNER_THEME} and
-@code{#+BEAMER_OUTER_THEME}.  All of them accept optional arguments
-within square brackets.  The last one, @code{#+BEAMER_HEADER}, is more
-generic and allows you to append any line of code in the header.
-
-@example
-#+BEAMER_THEME: Rochester [height=20pt]
-#+BEAMER_COLOR_THEME: spruce
-@end example
-
-Table of contents generated from @code{toc:t} @code{OPTION} keyword are
-wrapped within a @code{frame} environment.  Those generated from a @code{TOC}
-keyword (@pxref{Table of contents}) are not.  In that case, it is also
-possible to specify options, enclosed within square brackets.
+To create a column on the Beamer slide, use the @code{BEAMER_COL} property
+for its headline in the Org file.  Set the value of @code{BEAMER_COL} to a
+decimal number representing the fraction of the total text width.  Beamer
+export uses this value to set the column's width and fills the column with
+the contents of the Org entry.  If the Org entry has no specific environment
+defined, Beamer export ignores the heading.  If the Org entry has a defined
+environment, Beamer export uses the heading as title.  Behind the scenes,
+Beamer export automatically handles @LaTeX{} column separations for
+contiguous headlines.  To manually adjust them for any unique configurations
+needs, use the @code{BEAMER_ENV} property.
+
+@node Beamer specific syntax
+@subsection Beamer specific syntax
+Since Org's Beamer export back-end is an extension of the @LaTeX{} back-end,
+it recognizes other @LaTeX{} specific syntax---for example, @samp{#+LATEX:}
+or @samp{#+ATTR_LATEX:}.  @xref{@LaTeX{} export}, for details.
+
+Beamer export wraps the table of contents generated with @code{toc:t}
+@code{OPTION} keyword in a @code{frame} environment.  Beamer export does not
+wrap the table of contents generated with @code{TOC} keyword (@pxref{Table of
+contents}).  Use square brackets for specifying options.
 
 @example
 #+TOC: headlines [currentsection]
 @end example
 
-Beamer specific code can be inserted with the following constructs:
+Insert Beamer-specific code using the following constructs:
 
 @cindex #+BEAMER
-@cindex #+BEGIN_BEAMER
+@cindex #+BEGIN_EXPORT beamer
 @example
 #+BEAMER: \pause
 
-#+BEGIN_BEAMER
-All lines in this block will appear only when using this back-end.
+#+BEGIN_EXPORT beamer
+Only Beamer export back-end will export this line.
 #+END_BEAMER
 
 Text @@@@beamer:some code@@@@ within a paragraph.
 @end example
 
-In particular, this last example can be used to add overlay specifications to
-objects whose type is among @code{bold}, @code{item}, @code{link},
-@code{radio-target} and @code{target}, when the value is enclosed within
-angular brackets and put at the beginning the object.
+Inline constructs, such as the last one above, are useful for adding overlay
+specifications to objects with @code{bold}, @code{item}, @code{link},
+@code{radio-target} and @code{target} types.  Enclose the value in angular
+brackets and place the specification at the beginning the object as shown in
+this example:
 
 @example
 A *@@@@beamer:<2->@@@@useful* feature
 @end example
 
 @cindex #+ATTR_BEAMER
-Eventually, every plain list has support for @code{:environment},
-@code{:overlay} and @code{:options} attributes through
-@code{ATTR_BEAMER} affiliated keyword.  The first one allows the use
-of a different environment, the second sets overlay specifications and
-the last one inserts optional arguments in current list environment.
+Beamer export recognizes the @code{ATTR_BEAMER} keyword with the following
+attributes from Beamer configurations: @code{:environment} for changing local
+Beamer environment, @code{:overlay} for specifying Beamer overlays in angular
+or square brackets, and @code{:options} for inserting optional arguments.
 
 @example
-#+ATTR_BEAMER: :overlay +-
+#+ATTR_BEAMER: :environment nonindentlist
+- item 1, not indented
+- item 2, not indented
+- item 3, not indented
+@end example
+
+@example
+#+ATTR_BEAMER: :overlay <+->
 - item 1
 - item 2
 @end example
 
-@subheading Editing support
+@example
+#+ATTR_BEAMER: :options [Lagrange]
+Let $G$ be a finite group, and let $H$ be
+a subgroup of $G$.  Then the order of $H$ divides the order of $G$.
+@end example
 
-You can turn on a special minor mode @code{org-beamer-mode} for faster
-editing with:
+@node Editing support
+@subsection Editing support
+
+
+The @code{org-beamer-mode} is a special minor mode for faster editing of
+Beamer documents.
 
 @example
 #+STARTUP: beamer
@@ -10959,23 +11251,19 @@ editing with:
 
 @table @kbd
 @orgcmd{C-c C-b,org-beamer-select-environment}
-In @code{org-beamer-mode}, this key offers fast selection of a Beamer
-environment or the @code{BEAMER_COL} property.
+The @code{org-beamer-mode} provides this key for quicker selections in Beamer
+normal environments, and for selecting the @code{BEAMER_COL} property.
 @end table
 
-Also, a template for useful in-buffer settings or properties can be inserted
-into the buffer with @kbd{M-x org-beamer-insert-options-template}.  Among
-other things, this will install a column view format which is very handy for
-editing special properties used by Beamer.
+@node A Beamer example
+@subsection A Beamer example
 
-@subheading An example
+Here is an example of an Org document ready for Beamer export.
 
-Here is a simple example Org document that is intended for Beamer export.
-
-@smallexample
+@example
 #+TITLE: Example Presentation
 #+AUTHOR: Carsten Dominik
-#+OPTIONS: H:2
+#+OPTIONS: H:2 toc:t num:t
 #+LATEX_CLASS: beamer
 #+LATEX_CLASS_OPTIONS: [presentation]
 #+BEAMER_THEME: Madrid
@@ -10984,91 +11272,148 @@ Here is a simple example Org document that is intended for Beamer export.
 * This is the first structural section
 
 ** Frame 1
-*** Thanks to Eric Fraga                                           :B_block:BMCOL:
+*** Thanks to Eric Fraga                                           :B_block:
     :PROPERTIES:
     :BEAMER_COL: 0.48
     :BEAMER_ENV: block
     :END:
     for the first viable Beamer setup in Org
-*** Thanks to everyone else                                        :B_block:BMCOL:
+*** Thanks to everyone else                                        :B_block:
     :PROPERTIES:
     :BEAMER_COL: 0.48
     :BEAMER_ACT: <2->
     :BEAMER_ENV: block
     :END:
     for contributing to the discussion
-**** This will be formatted as a beamer note                              :B_note:
+**** This will be formatted as a beamer note                       :B_note:
      :PROPERTIES:
      :BEAMER_env: note
      :END:
 ** Frame 2 (where we will not use columns)
 *** Request
     Please test this stuff!
-@end smallexample
+@end example
 
-@node HTML export, @LaTeX{} and PDF export, Beamer export, Exporting
+@node HTML export
 @section HTML export
 @cindex HTML export
 
-Org mode contains an HTML (XHTML 1.0 strict) exporter with extensive
-HTML formatting, in ways similar to John Gruber's @emph{markdown}
-language, but with additional support for tables.
+Org mode contains an HTML exporter with extensive HTML formatting compatible
+with XHTML 1.0 strict standard.
 
 @menu
-* HTML Export commands::        How to invoke HTML export
-* HTML doctypes::               Org can export to various (X)HTML flavors
-* HTML preamble and postamble::  How to insert a preamble and a postamble
-* Quoting HTML tags::           Using direct HTML in Org mode
-* Links in HTML export::        How links will be interpreted and formatted
-* Tables in HTML export::       How to modify the formatting of tables
-* Images in HTML export::       How to insert figures into HTML output
-* Math formatting in HTML export::  Beautiful math also on the web
-* 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
+* HTML Export commands::        Invoking HTML export
+* HTML Specific export settings::  Settings for HTML export
+* HTML doctypes::               Exporting various (X)HTML flavors
+* HTML preamble and postamble::  Inserting preamble and postamble
+* Quoting HTML tags::           Using direct HTML in Org files
+* Links in HTML export::        Interpreting and formatting links
+* Tables in HTML export::       Formatting and modifying tables
+* Images in HTML export::       Inserting figures with HTML output
+* Math formatting in HTML export::  Handling math equations
+* Text areas in HTML export::   Showing an alternate approach, an example
+* CSS support::                 Styling HTML output
+* JavaScript support::          Folding scripting in the web browser
 @end menu
 
-@node HTML Export commands, HTML doctypes, HTML export, HTML export
+
+@node HTML Export commands
 @subsection HTML export commands
 
 @table @kbd
 @orgcmd{C-c C-e h h,org-html-export-to-html}
-Export as an HTML file.  For an Org file @file{myfile.org},
-the HTML file will be @file{myfile.html}.  The file will be overwritten
-without warning.
-@kbd{C-c C-e h o}
-Export as an HTML file and immediately open it with a browser.
+Export as HTML file with a @file{.html} extension.  For @file{myfile.org},
+Org exports to @file{myfile.html}, overwriting without warning.  @kbd{C-c C-e
+h o} Exports to HTML and opens it in a web browser.
+
 @orgcmd{C-c C-e h H,org-html-export-as-html}
-Export to a temporary buffer.  Do not create a file.
+Exports to a temporary buffer.  Does not create a file.
 @end table
 
-@c FIXME Exporting sublevels
-@c @cindex headline levels, for exporting
-@c In the exported version, the first 3 outline levels will become headlines,
-@c defining a general document structure.  Additional levels will be exported as
-@c itemized lists.  If you want that transition to occur at a different level,
-@c specify it with a numeric prefix argument.  For example,
+@node HTML Specific export settings
+@subsection HTML Specific export settings
+HTML export has a number of keywords, similar to the general options settings
+described in @ref{Export settings}.
 
-@c @example
-@c @kbd{C-2 C-c C-e b}
-@c @end example
+@table @samp
+@item DESCRIPTION
+@cindex #+DESCRIPTION (HTML)
+This is the document's description, which the HTML exporter inserts it as a
+HTML meta tag in the HTML file.  For long descriptions, use multiple
+@code{#+DESCRIPTION} lines.  The exporter takes care of wrapping the lines
+properly.
+
+@item HTML_DOCTYPE
+@cindex #+HTML_DOCTYPE
+@vindex org-html-doctype
+Specify the document type, for example: HTML5 (@code{org-html-doctype}).
 
-@c @noindent
-@c creates two levels of headings and does the rest as items.
+@item HTML_CONTAINER
+@cindex #+HTML_CONTAINER
+@vindex org-html-container-element
+Specify the HTML container, such as @samp{div}, for wrapping sections and
+elements (@code{org-html-container-element}).
+
+@item HTML_LINK_HOME
+@cindex #+HTML_LINK_HOME
+@vindex org-html-link-home
+The URL for home link (@code{org-html-link-home}).
+
+@item HTML_LINK_UP
+@cindex #+HTML_LINK_UP
+@vindex org-html-link-up
+The URL for the up link of exported HTML pages (@code{org-html-link-up}).
+
+@item HTML_MATHJAX
+@cindex #+HTML_MATHJAX
+@vindex org-html-mathjax-options
+Options for MathJax (@code{org-html-mathjax-options}).  MathJax is used to
+typeset @LaTeX{} math in HTML documents.  @xref{Math formatting in HTML
+export}, for an example.
+
+@item HTML_HEAD
+@cindex #+HTML_HEAD
+@vindex org-html-head
+Arbitrary lines for appending to the HTML document's head
+(@code{org-html-head}).
 
-@node HTML doctypes, HTML preamble and postamble, HTML Export commands, HTML export
+@item HTML_HEAD_EXTRA
+@cindex #+HTML_HEAD_EXTRA
+@vindex org-html-head-extra
+More arbitrary lines for appending to the HTML document's head
+(@code{org-html-head-extra}).
+
+@item KEYWORDS
+@cindex #+KEYWORDS (HTML)
+Keywords to describe the document's content.  HTML exporter inserts these
+keywords as HTML meta tags.  For long keywords, use multiple
+@code{#+KEYWORDS} lines.
+
+@item LATEX_HEADER
+@cindex #+LATEX_HEADER (HTML)
+Arbitrary lines for appending to the preamble; HTML exporter appends when
+transcoding @LaTeX{} fragments to images (@pxref{Math formatting in HTML
+export}).
+
+@item SUBTITLE
+@cindex #+SUBTILE (HTML)
+The document's subtitle.  HTML exporter formats subtitle if document type is
+@samp{HTML5} and the CSS has a @samp{subtitle} class.
+@end table
+
+Some of these keywords are explained in more detail in the following sections
+of the manual.
+
+@node HTML doctypes
 @subsection HTML doctypes
-@vindex org-html-doctype
-@vindex org-html-doctype-alist
 
 Org can export to various (X)HTML flavors.
 
-Setting the variable @code{org-html-doctype} allows you to export to different
-(X)HTML variants.  The exported HTML will be adjusted according to the syntax
-requirements of that variant.  You can either set this variable to a doctype
-string directly, in which case the exporter will try to adjust the syntax
-automatically, or you can use a ready-made doctype.  The ready-made options
-are:
+@vindex org-html-doctype
+@vindex org-html-doctype-alist
+Set the @code{org-html-doctype} variable for different (X)HTML variants.
+Depending on the variant, the HTML exporter adjusts the syntax of HTML
+conversion accordingly.  Org includes the following ready-made variants:
 
 @itemize
 @item
@@ -11091,23 +11436,21 @@ are:
 ``xhtml5''
 @end itemize
 
-See the variable @code{org-html-doctype-alist} for details.  The default is
-``xhtml-strict''.
+@noindent See the variable @code{org-html-doctype-alist} for details.
+The default is ``xhtml-strict''.
 
-@subsubheading Fancy HTML5 export
 @vindex org-html-html5-fancy
-@vindex org-html-html5-elements
-
-HTML5 introduces several new element types.  By default, Org will not make
-use of these element types, but you can set @code{org-html-html5-fancy} to
-@code{t} (or set @code{html5-fancy} item in an @code{OPTIONS} line), to
-enable a few new block-level elements.  These are created using arbitrary
-#+BEGIN and #+END blocks. For instance:
+@cindex HTML5, export new elements
+Org's HTML exporter does not by default enable new block elements introduced
+with the HTML5 standard.  To enable them, set @code{org-html-html5-fancy} to
+non-@code{nil}.  Or use an @code{OPTIONS} line in the file to set
+@code{html5-fancy}.  HTML5 documents can now have arbitrary #+BEGIN and #+END
+blocks.  For example:
 
 @example
-#+BEGIN_ASIDE
+#+BEGIN_aside
 Lorem ipsum
-#+END_ASIDE
+#+END_aside
 @end example
 
 Will export to:
@@ -11122,14 +11465,14 @@ While this:
 
 @example
 #+ATTR_HTML: :controls controls :width 350
-#+BEGIN_VIDEO
+#+BEGIN_video
 #+HTML: <source src="movie.mp4" type="video/mp4">
 #+HTML: <source src="movie.ogg" type="video/ogg">
 Your browser does not support the video tag.
-#+END_VIDEO
+#+END_video
 @end example
 
-Becomes:
+Exports to:
 
 @example
 <video controls="controls" width="350">
@@ -11139,15 +11482,17 @@ Becomes:
 </video>
 @end example
 
-Special blocks that do not correspond to HTML5 elements (see
-@code{org-html-html5-elements}) will revert to the usual behavior, i.e.,
-@code{#+BEGIN_LEDERHOSEN} will still export to @samp{<div class="lederhosen">}.
+@vindex org-html-html5-elements
+When special blocks do not have a corresponding HTML5 element, the HTML
+exporter reverts to standard translation (see
+@code{org-html-html5-elements}).  For example, @code{#+BEGIN_lederhosen}
+exports to @samp{<div class="lederhosen">}.
 
-Headlines cannot appear within special blocks.  To wrap a headline and its
-contents in e.g., @samp{<section>} or @samp{<article>} tags, set the
-@code{HTML_CONTAINER} property on the headline itself.
+Special blocks cannot have headlines.  For the HTML exporter to wrap the
+headline and its contents in @samp{<section>} or @samp{<article>} tags, set
+the @code{HTML_CONTAINER} property for the headline.
 
-@node HTML preamble and postamble, Quoting HTML tags, HTML doctypes, HTML export
+@node HTML preamble and postamble
 @subsection HTML preamble and postamble
 @vindex org-html-preamble
 @vindex org-html-postamble
@@ -11157,69 +11502,77 @@ contents in e.g., @samp{<section>} or @samp{<article>} tags, set the
 @vindex org-export-creator-string
 @vindex org-export-time-stamp-file
 
-The HTML exporter lets you define a preamble and a postamble.
-
-The default value for @code{org-html-preamble} is @code{t}, which means
-that the preamble is inserted depending on the relevant format string in
-@code{org-html-preamble-format}.
-
-Setting @code{org-html-preamble} to a string will override the default format
-string.  If you set it to a function, it will insert the output of the
-function, which must be a string.  Setting to @code{nil} will not insert any
-preamble.
-
-The default value for @code{org-html-postamble} is @code{'auto}, which means
-that the HTML exporter will look for information about the author, the email,
-the creator and the date, and build the postamble from these values.  Setting
-@code{org-html-postamble} to @code{t} will insert the postamble from the
-relevant format string found in @code{org-html-postamble-format}.  Setting it
-to @code{nil} will not insert any postamble.
-
-@node Quoting HTML tags, Links in HTML export, HTML preamble and postamble, HTML export
+The HTML exporter has delineations for preamble and postamble.  The default
+value for @code{org-html-preamble} is @code{t}, which makes the HTML exporter
+insert the preamble.  See the variable @code{org-html-preamble-format} for
+the format string.
+
+Set @code{org-html-preamble} to a string to override the default format
+string.  If the string is a function, the HTML exporter expects the function
+to return a string upon execution.  The HTML exporter inserts this string in
+the preamble.  The HTML exporter will not insert a preamble if
+@code{org-html-preamble} is set @code{nil}.
+
+The default value for @code{org-html-postamble} is @code{auto}, which makes
+the HTML exporter build a postamble from looking up author's name, email
+address, creator's name, and date.  Set @code{org-html-postamble} to @code{t}
+to insert the postamble in the format specified in the
+@code{org-html-postamble-format} variable.  The HTML exporter will not insert
+a postamble if @code{org-html-postamble} is set to @code{nil}.
+
+@node Quoting HTML tags
 @subsection Quoting HTML tags
 
-Plain @samp{<} and @samp{>} are always transformed to @samp{&lt;} and
-@samp{&gt;} in HTML export.  If you want to include raw HTML code, which
-should only appear in HTML export, mark it with @samp{@@@@html:} as in
-@samp{@@@@html:<b>@@@@bold text@@@@html:</b>@@@@}.  For more extensive HTML
-that should be copied verbatim to the exported file use either
+The HTML export back-end transforms @samp{<} and @samp{>} to @samp{&lt;} and
+@samp{&gt;}.  To include raw HTML code in the Org file so the HTML export
+back-end can insert that HTML code in the output, use this inline syntax:
+@samp{@@@@html:}.  For example: @samp{@@@@html:<b>@@@@bold
+text@@@@html:</b>@@@@}.  For larger raw HTML code blocks, use these HTML
+export code blocks:
 
 @cindex #+HTML
-@cindex #+BEGIN_HTML
+@cindex #+BEGIN_EXPORT html
 @example
 #+HTML: Literal HTML code for export
 @end example
 
 @noindent or
-@cindex #+BEGIN_HTML
+@cindex #+BEGIN_EXPORT html
 
 @example
-#+BEGIN_HTML
+#+BEGIN_EXPORT html
 All lines between these markers are exported literally
-#+END_HTML
+#+END_EXPORT
 @end example
 
 
-@node Links in HTML export, Tables in HTML export, Quoting HTML tags, HTML export
+@node Links in HTML export
 @subsection Links in HTML export
 
 @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
-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
-that an HTML version also exists of the linked file, at the same relative
-path.  @samp{id:} links can then be used to jump to specific entries across
-files.  For information related to linking files while publishing them to a
-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{title}
-and @code{style} attributes for a link:
+@vindex org-html-link-org-files-as-html
+The HTML export back-end transforms Org's internal links (@pxref{Internal
+links}) to equivalent HTML links in the output.  The back-end similarly
+handles Org's automatic links created by radio targets (@pxref{Radio
+targets}) similarly.  For Org links to external files, the back-end
+transforms the links to @emph{relative} paths.
+
+For Org links to other @file{.org} files, the back-end automatically changes
+the file extension to @file{.html} and makes file paths relative.  If the
+@file{.org} files have an equivalent @file{.html} version at the same
+location, then the converted links should work without any further manual
+intervention.  However, to disable this automatic path translation, set
+@code{org-html-link-org-files-as-html} to @code{nil}.  When disabled, the
+HTML export back-end substitutes the @samp{id:}-based links in the HTML
+output.  For more about linking files when publishing to a directory,
+@pxref{Publishing links}.
+
+Org files can also have special directives to the HTML export back-end.  For
+example, by using @code{#+ATTR_HTML} lines to specify new format attributes
+to @code{<a>} or @code{<img>} tags.  This example shows changing the link's
+@code{title} and @code{style}:
 
 @cindex #+ATTR_HTML
 @example
@@ -11227,15 +11580,15 @@ and @code{style} attributes for a link:
 [[http://orgmode.org]]
 @end example
 
-@node Tables in HTML export, Images in HTML export, Links in HTML export, HTML export
-@subsection Tables
+@node Tables in HTML export
+@subsection Tables in HTML export
 @cindex tables, in HTML
 @vindex org-html-table-default-attributes
 
-Org mode tables are exported to HTML using the table attributes defined in
-@code{org-html-table-default-attributes}.  The default setting makes tables
-without cell borders and frame.  If you would like to change this for
-individual tables, place something like the following before the table:
+The HTML export back-end uses @code{org-html-table-default-attributes} when
+exporting Org tables to HTML.  By default, the exporter does not draw frames
+and cell borders.  To change for this for a table, use the following lines
+before the table in the Org file:
 
 @cindex #+CAPTION
 @cindex #+ATTR_HTML
@@ -11244,36 +11597,72 @@ individual tables, place something like the following before the table:
 #+ATTR_HTML: :border 2 :rules all :frame border
 @end example
 
+The HTML export back-end preserves column groupings in Org tables
+(@pxref{Column groups}) when exporting to HTML.
+
+Additional options for customizing tables for  HTML export.
+
+@table @code
+@vindex org-html-table-align-individual-fields
+@item org-html-table-align-individual-fields
+Non-@code{nil} attaches style attributes for alignment to each table field.
+
+@vindex org-html-table-caption-above
+@item org-html-table-caption-above
+Non-@code{nil} places caption string at the beginning of the table.
+
+@vindex org-html-table-data-tags
+@item org-html-table-data-tags
+Opening and ending tags for table data fields.
+
+@vindex org-html-table-default-attributes
+@item org-html-table-default-attributes
+Default attributes and values for table tags.
+
+@vindex org-html-table-header-tags
+@item org-html-table-header-tags
+Opening and ending tags for table's header fields.
+
 @vindex org-html-table-row-tags
-You can also modify the default tags used for each row by setting
-@code{org-html-table-row-tags}.  See the docstring for an example on
-how to use this option.
+@item org-html-table-row-tags
+Opening and ending tags for table rows.
+
+@vindex org-html-table-use-header-tags-for-first-column
+@item org-html-table-use-header-tags-for-first-column
+Non-@code{nil} formats column one in tables with header tags.
+@end table
 
-@node Images in HTML export, Math formatting in HTML export, Tables in HTML export, HTML export
+@node Images in HTML export
 @subsection Images in HTML export
 
 @cindex images, inline in HTML
 @cindex inlining images in HTML
 @vindex org-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
-@code{org-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
-itself is a @code{file:} link or a @code{http:} URL pointing to an
-image, this image will be inlined and activated so that clicking on the
-image will activate the link.  For example, to include a thumbnail that
-will link to a high resolution version of the image, you could use:
+
+The HTML export back-end has features to convert Org image links to HTML
+inline images and HTML clickable image links.
+
+When the link in the Org file has no description, the HTML export back-end by
+default in-lines that image.  For example: @samp{[[file:myimg.jpg]]} is
+in-lined, while @samp{[[file:myimg.jpg][the image]]} links to the text,
+@samp{the image}.
+
+For more details, see the variable @code{org-html-inline-images}.
+
+On the other hand, if the description part of the Org link is itself another
+link, such as @code{file:} or @code{http:} URL pointing to an image, the HTML
+export back-end in-lines this image and links to the main image.  This Org
+syntax enables the back-end to link low-resolution thumbnail to the
+high-resolution version of the image, as shown in this example:
 
 @example
 [[file:highres.jpg][file:thumb.jpg]]
 @end example
 
-If you need to add attributes to an inlined image, use a @code{#+ATTR_HTML}.
-In the example below we specify the @code{alt} and @code{title} attributes to
-support text viewers and accessibility, and align it to the right.
+To change attributes of in-lined images, use @code{#+ATTR_HTML} lines in the
+Org file.  This example shows realignment to right, and adds @code{alt} and
+@code{title} attributes in support of text viewers and modern web accessibility
+standards.
 
 @cindex #+CAPTION
 @cindex #+ATTR_HTML
@@ -11284,63 +11673,72 @@ support text viewers and accessibility, and align it to the right.
 @end example
 
 @noindent
-You could use @code{http} addresses just as well.
+The HTML export back-end copies the @code{http} links from the Org file as
+is.
 
-@node Math formatting in HTML export, Text areas in HTML export, Images in HTML export, HTML export
+@node Math formatting in HTML export
 @subsection Math formatting in HTML export
 @cindex MathJax
 @cindex dvipng
+@cindex dvisvgm
 @cindex imagemagick
 
 @LaTeX{} math snippets (@pxref{@LaTeX{} fragments}) can be displayed in two
-different ways on HTML pages.  The default is to use the
-@uref{http://www.mathjax.org, MathJax system} which should work out of the
-box with Org mode installation because @uref{http://orgmode.org} serves
-@file{MathJax} for Org mode users for small applications and for testing
-purposes.  @b{If you plan to use this regularly or on pages with significant
-page views, you should install@footnote{Installation instructions can be
-found on the MathJax website, see
-@uref{http://www.mathjax.org/resources/docs/?installation.html}.} MathJax on
-your own server in order to limit the load of our server.}  To configure
-@file{MathJax}, use the variable @code{org-html-mathjax-options} or
-insert something like the following into the buffer:
-
-@example
-#+HTML_MATHJAX: align:"left" mathml:t path:"/MathJax/MathJax.js"
-@end example
+different ways on HTML pages.  The default is to use
+@uref{http://www.mathjax.org, MathJax} which should work out of the box with
+Org@footnote{By default Org loads MathJax from @uref{https://cdnjs.com, cdnjs.com} as
+recommended by @uref{http://www.mathjax.org, MathJax}.}.  Some MathJax display
+options can be configured via @code{org-html-mathjax-options}, or in the
+buffer.  For example, with the following settings,
+@smallexample
+#+HTML_MATHJAX: align: left indent: 5em tagside: left font: Neo-Euler
+@end smallexample
+equation labels will be displayed on the left marign and equations will be
+five ems from the left margin.
 
-@noindent See the docstring of the variable
-@code{org-html-mathjax-options} for the meaning of the parameters in
-this line.
+@noindent See the docstring of
+@code{org-html-mathjax-options} for all supported variables.  The MathJax
+template can be configure via @code{org-html-mathjax-template}.
 
 If you prefer, you can also request that @LaTeX{} fragments are processed
 into small images that will be inserted into the browser page.  Before the
 availability of MathJax, this was the default method for Org files.  This
-method requires that the @file{dvipng} program or @file{imagemagick} suite is
-available on your system.  You can still get this processing with
+method requires that the @file{dvipng} program, @file{dvisvgm} or
+@file{imagemagick} suite is available on your system.  You can still get
+this processing with
 
 @example
 #+OPTIONS: tex:dvipng
 @end example
 
+@example
+#+OPTIONS: tex:dvisvgm
+@end example
+
 or:
 
 @example
 #+OPTIONS: tex:imagemagick
 @end example
 
-@node Text areas in HTML export, CSS support, Math formatting in HTML export, HTML export
+@node Text areas in HTML export
 @subsection Text areas in HTML export
 
 @cindex text areas, in HTML
-An alternative way to publish literal code examples in HTML is to use text
-areas, where the example can even be edited before pasting it into an
-application.  It is triggered by @code{:textarea} attribute at an
-@code{example} or @code{src} block.
+Before Org mode's Babel, one popular approach to publishing code in HTML was
+by using @code{:textarea}.  The advantage of this approach was that copying
+and pasting was built into browsers with simple JavaScript commands.  Even
+editing before pasting was made simple.
+
+The HTML export back-end can create such text areas.  It requires an
+@code{#+ATTR_HTML:} line as shown in the example below with the
+@code{:textarea} option.  This must be followed by either an
+@code{example} or a @code{src} code block.  Other Org block types will not
+honor the @code{:textarea} option.
 
-You may also use @code{:height} and @code{:width} attributes to specify the
-height and width of the text area, which default to the number of lines in
-the example, and 80, respectively.  For example
+By default, the HTML export back-end creates a text area 80 characters wide
+and height just enough to fit the content.  Override these defaults with
+@code{:width} and @code{:height} options on the @code{#+ATTR_HTML:} line.
 
 @example
 #+ATTR_HTML: :textarea t :width 40
@@ -11352,7 +11750,7 @@ the example, and 80, respectively.  For example
 @end example
 
 
-@node CSS support, JavaScript support, Text areas in HTML export, HTML export
+@node CSS support
 @subsection CSS support
 @cindex CSS, for HTML export
 @cindex HTML export, CSS
@@ -11371,6 +11769,7 @@ p.author            @r{author information, including email}
 p.date              @r{publishing date}
 p.creator           @r{creator info, about org mode version}
 .title              @r{document title}
+.subtitle           @r{document subtitle}
 .todo               @r{TODO keywords, all not-done states}
 .done               @r{the DONE keywords, all states that count as done}
 .WAITING            @r{each TODO keyword also uses a class named after itself}
@@ -11388,7 +11787,7 @@ div.outline-text-N  @r{extra div for text at outline level N}
 .figure-number      @r{label like "Figure 1:"}
 .table-number       @r{label like "Table 1:"}
 .listing-number     @r{label like "Listing 1:"}
-div.figure          @r{how to format an inlined image}
+div.figure          @r{how to format an in-lined image}
 pre.src             @r{formatted source code}
 pre.example         @r{normal example}
 p.verse             @r{verse paragraph}
@@ -11396,6 +11795,7 @@ 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>)}
+.org-svg            @r{default class for a linked @file{.svg} image}
 @end example
 
 @vindex org-html-style-default
@@ -11403,15 +11803,10 @@ p.footnote          @r{footnote definition paragraph, containing a footnote}
 @vindex org-html-head
 @vindex org-html-head-extra
 @cindex #+HTML_INCLUDE_STYLE
-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-html-style-default}, which you should not modify.  To turn
-inclusion of these defaults off, customize
-@code{org-html-head-include-default-style} or set @code{html-style} to
-@code{nil} in an @code{OPTIONS} line.}.  You may overwrite these settings, or
-add to them by using the variables @code{org-html-head} and
-@code{org-html-head-extra}.  You can override the global values of these
-variables for each file by using these keywords:
+The HTML export back-end includes a compact default style in each exported
+HTML file.  To override the default style with another style, use these
+keywords in the Org file.  They will replace the global defaults the HTML
+exporter uses.
 
 @cindex #+HTML_HEAD
 @cindex #+HTML_HEAD_EXTRA
@@ -11420,38 +11815,49 @@ variables for each file by using these keywords:
 #+HTML_HEAD_EXTRA: <link rel="alternate stylesheet" type="text/css" href="style2.css" />
 @end example
 
+To just turn off the default style, customize
+@code{org-html-head-include-default-style} variable, or use this option line in
+the Org file.
+
+@example
+#+OPTIONS: html-style:nil
+@end example
+
 @noindent
-For longer style definitions, you can use several such lines.  You could also
-directly write a @code{<style>} @code{</style>} section in this way, without
-referring to an external file.
+For longer style definitions, either use several @code{#+HTML_HEAD} and
+@code{#+HTML_HEAD_EXTRA} lines, or use @code{<style>} @code{</style>} blocks
+around them.  Both of these approaches can avoid referring to an external
+file.
 
-In order to add styles to a subtree, use the @code{:HTML_CONTAINER_CLASS:}
+In order to add styles to a sub-tree, use the @code{:HTML_CONTAINER_CLASS:}
 property to assign a class to the tree.  In order to specify CSS styles for a
 particular headline, you can use the id specified in a @code{:CUSTOM_ID:}
 property.
 
+Never change the @code{org-html-style-default} constant.  Instead use other
+simpler ways of customizing as described above.
+
+
 @c FIXME: More about header and footer styles
 @c FIXME: Talk about links and targets.
 
-@node JavaScript support,  , CSS support, HTML export
+@node JavaScript support
 @subsection JavaScript supported display of web pages
 
 @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
+program enhances large files in two different ways of viewing.  One is an
+@emph{Info}-like mode where each section is displayed separately and
 navigation can be done with the @kbd{n} and @kbd{p} keys (and some other keys
 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 host the script at our site, but if you use it a lot, you might not want
-to be dependent on @url{http://orgmode.org} and prefer to install a local
-copy on your own web server.
+one has a @emph{folding} view, much like Org provides inside Emacs.  The
+script is available at @url{http://orgmode.org/org-info.js} and the
+documentation at @url{http://orgmode.org/worg/code/org-info-js/}.  The script
+is hosted on @url{http://orgmode.org}, but for reliability, prefer installing
+it on your own web server.
 
-All it then takes to use this program is adding a single line to the Org
-file:
+To use this program, just add this line to the Org file:
 
 @cindex #+INFOJS_OPT
 @example
@@ -11459,12 +11865,12 @@ file:
 @end example
 
 @noindent
-If this line is found, the HTML header will automatically contain the code
-needed to invoke the script.  Using the line above, you can set the following
-viewing options:
+The HTML header now has the code needed to automatically invoke the script.
+For setting options, use the syntax from the above line for options described
+below:
 
 @example
-path:    @r{The path to the script.  The default is to grab the script from}
+path:    @r{The path to the script.  The default grabs the script from}
          @r{@url{http://orgmode.org/org-info.js}, but you might want to have}
          @r{a local copy and use a path like @samp{../scripts/org-info.js}.}
 view:    @r{Initial view when the website is first shown.  Possible values are:}
@@ -11494,105 +11900,204 @@ buttons: @r{Should view-toggle buttons be everywhere?  When @code{nil} (the}
 @vindex org-html-infojs-options
 @vindex org-html-use-infojs
 You can choose default values for these options by customizing the variable
-@code{org-html-infojs-options}.  If you always want to apply the script to your
-pages, configure the variable @code{org-html-use-infojs}.
+@code{org-html-infojs-options}.  If you want the script to always apply to
+your pages, configure the variable @code{org-html-use-infojs}.
 
-@node @LaTeX{} and PDF export, Markdown export, HTML export, Exporting
-@section @LaTeX{} and PDF export
+@node @LaTeX{} export
+@section @LaTeX{} export
 @cindex @LaTeX{} export
 @cindex PDF export
 
-@LaTeX{} export can produce an arbitrarily complex LaTeX document of any
-standard or custom document class.  With further processing@footnote{The
-default @LaTeX{} output is designed for processing with @code{pdftex} or
-@LaTeX{}.  It includes packages that are not compatible with @code{xetex} and
-possibly @code{luatex}.  The @LaTeX{} exporter can be configured to support
-alternative TeX engines, see the options
-@code{org-latex-default-packages-alist} and @code{org-latex-packages-alist}.},
-which the @LaTeX{} exporter is able to control, this back-end is able to
-produce PDF output.  Because the @LaTeX{} exporter can be configured to use
-the @code{hyperref} package, the default setup produces fully-linked PDF
-output.
-
-As in @LaTeX{}, blank lines are meaningful for this back-end: a paragraph
-will not be started if two contiguous syntactical elements are not separated
-by an empty line.
-
-This back-end also offers enhanced support for footnotes.  Thus, it handles
-nested footnotes, footnotes in tables and footnotes in a list item's
-description.
+The @LaTeX{} export back-end can handle complex documents, incorporate
+standard or custom @LaTeX{} document classes, generate documents using
+alternate @LaTeX{} engines, and produce fully linked PDF files with indexes,
+bibliographies, and tables of contents, destined for interactive online
+viewing or high-quality print publication.
+
+While the details are covered in-depth in this section, here are some quick
+references to variables for the impatient: for engines, see
+@code{org-latex-compiler}; for build sequences, see
+@code{org-latex-pdf-process}; for packages, see
+@code{org-latex-default-packages-alist} and @code{org-latex-packages-alist}.
+
+An important note about the @LaTeX{} export back-end: it is sensitive to
+blank lines in the Org document.  That's because @LaTeX{} itself depends on
+blank lines to tell apart syntactical elements, such as paragraphs.
 
 @menu
-* @LaTeX{} export commands::    How to export to LaTeX and PDF
-* Header and sectioning::       Setting up the export file structure
-* Quoting @LaTeX{} code::       Incorporating literal @LaTeX{} code
-* @LaTeX{} specific attributes::  Controlling @LaTeX{} output
+* @LaTeX{} export commands::    For producing @LaTeX{} and PDF documents.
+* @LaTeX{} specific export settings::  Unique to this @LaTeX{} back-end.
+* @LaTeX{} header and sectioning::  For file structure.
+* Quoting @LaTeX{} code::       Directly in the Org document.
+* Tables in @LaTeX{} export::   Attributes specific to tables.
+* Images in @LaTeX{} export::   Attributes specific to images.
+* Plain lists in @LaTeX{} export::  Attributes specific to lists.
+* Source blocks in @LaTeX{} export::  Attributes specific to source code blocks.
+* Example blocks in @LaTeX{} export::  Attributes specific to example blocks.
+* Special blocks in @LaTeX{} export::  Attributes specific to special blocks.
+* Horizontal rules in @LaTeX{} export::  Attributes specific to horizontal rules.
 @end menu
 
-@node @LaTeX{} export commands, Header and sectioning, @LaTeX{} and PDF export, @LaTeX{} and PDF export
+@node @LaTeX{} export commands
 @subsection @LaTeX{} export commands
 
 @table @kbd
 @orgcmd{C-c C-e l l,org-latex-export-to-latex}
-Export as a @LaTeX{} file.  For an Org file @file{myfile.org}, the @LaTeX{}
-file will be @file{myfile.tex}.  The file will be overwritten without
-warning.
+Export as @LaTeX{} file with a @file{.tex} extension.  For @file{myfile.org},
+Org exports to @file{myfile.tex}, overwriting without warning.  @kbd{C-c C-e
+l l} Exports to @LaTeX{} file.
+
 @orgcmd{C-c C-e l L,org-latex-export-as-latex}
 Export to a temporary buffer.  Do not create a file.
 @orgcmd{C-c C-e l p,org-latex-export-to-pdf}
-Export as @LaTeX{} and then process to PDF.
+Export as @LaTeX{} file and convert it to PDF file.
 @item C-c C-e l o
-Export as @LaTeX{} and then process to PDF, then open the resulting PDF file.
+Export as @LaTeX{} file and convert it to PDF, then open the PDF using the default viewer.
+@end table
+
+@vindex org-latex-compiler
+@vindex org-latex-bibtex-compiler
+@vindex org-latex-default-packages-alist
+The @LaTeX{} export back-end can use any of these @LaTeX{} engines:
+@samp{pdflatex}, @samp{xelatex}, and @samp{lualatex}.  These engines compile
+@LaTeX{} files with different compilers, packages, and output options.  The
+@LaTeX{} export back-end finds the compiler version to use from
+@code{org-latex-compiler} variable or the @code{#+LATEX_COMPILER} keyword in
+the Org file.  See the docstring for the
+@code{org-latex-default-packages-alist} for loading packages with certain
+compilers.  Also see @code{org-latex-bibtex-compiler} to set the bibliography
+compiler@footnote{This does not allow setting different bibliography
+compilers for different files.  However, ``smart'' @LaTeX{} compilation
+systems, such as @samp{latexmk}, can select the correct bibliography
+compiler.}.
+
+@node @LaTeX{} specific export settings
+@subsection @LaTeX{} specific export settings
+
+The @LaTeX{} export back-end has several additional keywords for customizing
+@LaTeX{} output.  Setting these keywords works similar to the general options
+(@pxref{Export settings}).
+
+@table @samp
+@item DESCRIPTION
+@cindex #+DESCRIPTION (@LaTeX{})
+The document's description.  The description along with author name,
+keywords, and related file metadata are inserted in the output file by the
+@samp{hyperref} package.  See @code{org-latex-hyperref-template} for
+customizing metadata items.  See @code{org-latex-title-command} for
+typesetting description into the document's front matter.  Use multiple
+@code{#+DESCRIPTION} lines for long descriptions.
+
+@item LATEX_CLASS
+@cindex #+LATEX_CLASS
+@vindex org-latex-default-class
+@vindex org-latex-classes
+This is @LaTeX{} document class, such as @code{article}, @code{report},
+@code{book}, and so on, which contain predefined preamble and headline level
+mapping that the @LaTeX{} export back-end needs.  The back-end reads the
+default class name from the @code{org-latex-default-class} variable.  Org has
+@code{article} as the default class.  A valid default class must be an
+element of @code{org-latex-classes}.
+
+@item LATEX_CLASS_OPTIONS
+@cindex #+LATEX_CLASS_OPTIONS
+Options the @LaTeX{} export back-end uses when calling the @LaTeX{} document
+class.
+
+@item LATEX_COMPILER
+@cindex #+LATEX_COMPILER
+@vindex org-latex-compiler
+The compiler, such as @samp{pdflatex}, @samp{xelatex}, @samp{lualatex}, for
+producing the PDF (@code{org-latex-compiler}).
+
+@item LATEX_HEADER
+@cindex #+LATEX_HEADER
+@vindex org-latex-classes
+Arbitrary lines to add to the document's preamble, before the @samp{hyperref}
+settings.  See @code{org-latex-classes} for adjusting the structure and order
+of the @LaTeX{} headers.
+
+@item LATEX_HEADER_EXTRA
+@cindex #+LATEX_HEADER_EXTRA
+@vindex org-latex-classes
+Arbitrary lines to add to the document's preamble, before the @samp{hyperref}
+settings.  See @code{org-latex-classes} for adjusting the structure and order
+of the @LaTeX{} headers.
+
+@item KEYWORDS
+@cindex #+KEYWORDS (@LaTeX{})
+The keywords for the document.  The description along with author name,
+keywords, and related file metadata are inserted in the output file by the
+@samp{hyperref} package.  See @code{org-latex-hyperref-template} for
+customizing metadata items.  See @code{org-latex-title-command} for
+typesetting description into the document's front matter.  Use multiple
+@code{#+KEYWORDS} lines if necessary.
+
+@item SUBTITLE
+@cindex #+SUBTITLE (@LaTeX{})
+@vindex org-latex-subtitle-separate
+@vindex org-latex-subtitle-format
+The document's subtitle.  It is typeset as per
+@code{org-latex-subtitle-format}.  If @code{org-latex-subtitle-separate} is
+non-@code{nil}, it is typed as part of the @samp{\title}-macro.  See
+@code{org-latex-hyperref-template} for customizing metadata items.  See
+@code{org-latex-title-command} for typesetting description into the
+document's front matter.
 @end table
 
-@node Header and sectioning, Quoting @LaTeX{} code, @LaTeX{} export commands, @LaTeX{} and PDF export
-@subsection Header and sectioning structure
+The following sections have further details.
+
+@node @LaTeX{} header and sectioning
+@subsection @LaTeX{} header and sectioning structure
 @cindex @LaTeX{} class
 @cindex @LaTeX{} sectioning structure
 @cindex @LaTeX{} header
 @cindex header, for @LaTeX{} files
 @cindex sectioning structure, for @LaTeX{} export
 
-By default, the first three outline levels become headlines, defining a
-general document structure.  Additional levels are exported as @code{itemize}
-or @code{enumerate} lists.  The transition can also occur at a different
-level (@pxref{Export settings}).
+The @LaTeX{} export back-end converts the first three of Org's outline levels
+into @LaTeX{} headlines.  The remaining Org levels are exported as
+@code{itemize} or @code{enumerate} lists.  To change this globally for the
+cut-off point between levels and lists, (@pxref{Export settings}).
 
-By default, the @LaTeX{} output uses the class @code{article}.
+By default, the @LaTeX{} export back-end uses the @code{article} class.
 
 @vindex org-latex-default-class
 @vindex org-latex-classes
 @vindex org-latex-default-packages-alist
 @vindex org-latex-packages-alist
-You can change this globally by setting a different value for
-@code{org-latex-default-class} or locally by adding an option like
-@code{#+LATEX_CLASS: myclass} in your file, or with
-a @code{EXPORT_LATEX_CLASS} property that applies when exporting a region
-containing only this (sub)tree.  The class must be listed in
-@code{org-latex-classes}.  This variable defines a header template for each
-class@footnote{Into which the values of
-@code{org-latex-default-packages-alist} and @code{org-latex-packages-alist}
-are spliced.}, and allows you to define the sectioning structure for each
-class.  You can also define your own classes there.
+To change the default class globally, edit @code{org-latex-default-class}.
+To change the default class locally in an Org file, add option lines
+@code{#+LATEX_CLASS: myclass}.  To change the default class for just a part
+of the Org file, set a sub-tree property, @code{EXPORT_LATEX_CLASS}.  The
+class name entered here must be valid member of @code{org-latex-classes}.
+This variable defines a header template for each class into which the
+exporter splices the values of @code{org-latex-default-packages-alist} and
+@code{org-latex-packages-alist}.  Use the same three variables to define
+custom sectioning or custom classes.
 
 @cindex #+LATEX_CLASS
 @cindex #+LATEX_CLASS_OPTIONS
 @cindex property, EXPORT_LATEX_CLASS
 @cindex property, EXPORT_LATEX_CLASS_OPTIONS
-The @code{LATEX_CLASS_OPTIONS} keyword or @code{EXPORT_LATEX_CLASS_OPTIONS}
-property can specify the options for the @code{\documentclass} macro.  These
-options have to be provided, as expected by @LaTeX{}, within square brackets.
+The @LaTeX{} export back-end sends the @code{LATEX_CLASS_OPTIONS} keyword and
+@code{EXPORT_LATEX_CLASS_OPTIONS} property as options to the @LaTeX{}
+@code{\documentclass} macro.  The options and the syntax for specifying them,
+including enclosing them in square brackets, follow @LaTeX{} conventions.
+
+@example
+#+LATEX_CLASS_OPTIONS: [a4paper,11pt,twoside,twocolumn]
+@end example
 
 @cindex #+LATEX_HEADER
 @cindex #+LATEX_HEADER_EXTRA
-You can also use the @code{LATEX_HEADER} and
-@code{LATEX_HEADER_EXTRA}@footnote{Unlike @code{LATEX_HEADER}, contents
-from @code{LATEX_HEADER_EXTRA} keywords will not be loaded when previewing
-@LaTeX{} snippets (@pxref{Previewing @LaTeX{} fragments}).} keywords in order
-to add lines to the header.  See the docstring of @code{org-latex-classes} for
-more information.
+The @LaTeX{} export back-end appends values from @code{LATEX_HEADER} and
+@code{LATEX_HEADER_EXTRA} keywords to the @LaTeX{} header.  The docstring for
+@code{org-latex-classes} explains in more detail.  Also note that @LaTeX{}
+export back-end does not append @code{LATEX_HEADER_EXTRA} to the header when
+previewing @LaTeX{} snippets (@pxref{Previewing @LaTeX{} fragments}).
 
-An example is shown below.
+A sample Org file with the above headers:
 
 @example
 #+LATEX_CLASS: article
@@ -11601,103 +12106,117 @@ An example is shown below.
 
 * Headline 1
   some text
+* Headline 2
+  some more text
 @end example
 
-@node Quoting @LaTeX{} code, @LaTeX{} specific attributes, Header and sectioning, @LaTeX{} and PDF export
+@node Quoting @LaTeX{} code
 @subsection Quoting @LaTeX{} code
 
-Embedded @LaTeX{} as described in @ref{Embedded @LaTeX{}}, will be correctly
-inserted into the @LaTeX{} file.  Furthermore, you can add special code that
-should only be present in @LaTeX{} export with the following constructs:
+The @LaTeX{} export back-end can insert any arbitrary @LaTeX{} code,
+@pxref{Embedded @LaTeX{}}.  There are three ways to embed such code in the
+Org file and they all use different quoting syntax.
 
-@cindex #+LATEX
-@cindex #+BEGIN_LATEX
+Inserting in-line quoted with @ symbols:
+@cindex inline, in @LaTeX{} export
 @example
-Code within @@@@latex:some code@@@@ a paragraph.
-
-#+LATEX: Literal @LaTeX{} code for export
-
-#+BEGIN_LATEX
-All lines between these markers are exported literally
-#+END_LATEX
+Code embedded in-line @@@@latex:any arbitrary LaTeX code@@@@ in a paragraph.
 @end example
 
-@node @LaTeX{} specific attributes,  , Quoting @LaTeX{} code, @LaTeX{} and PDF export
-@subsection @LaTeX{} specific attributes
-@cindex #+ATTR_LATEX
+Inserting as one or more keyword lines in the Org file:
+@cindex #+LATEX
+@example
+#+LATEX: any arbitrary LaTeX code
+@end example
 
-@LaTeX{} understands attributes specified in an @code{ATTR_LATEX} line.  They
-affect tables, images, plain lists, special blocks and source blocks.
+Inserting as an export block in the Org file, where the back-end exports any
+code between begin and end markers:
+@cindex #+BEGIN_EXPORT latex
+@example
+#+BEGIN_EXPORT latex
+any arbitrary LaTeX code
+#+END_EXPORT
+@end example
 
-@subsubheading Tables in @LaTeX{} export
+@node Tables in @LaTeX{} export
+@subsection Tables in @LaTeX{} export
 @cindex tables, in @LaTeX{} export
+@cindex #+ATTR_LATEX, in tables
 
-For @LaTeX{} export of a table, you can specify a label and a caption
-(@pxref{Images and tables}).  You can also use attributes to control table
-layout and contents.  Valid @LaTeX{} attributes include:
+The @LaTeX{} export back-end can pass several @LaTeX{} attributes for table
+contents and layout.  Besides specifying label and caption (@pxref{Images and
+tables}), the other valid @LaTeX{} attributes include:
 
 @table @code
 @item :mode
 @vindex org-latex-default-table-mode
-Nature of table's contents.  It can be set to @code{table}, @code{math},
-@code{inline-math} or @code{verbatim}.  In particular, when in @code{math} or
-@code{inline-math} mode, every cell is exported as-is, horizontal rules are
-ignored and the table will be wrapped in a math environment.  Also,
-contiguous tables sharing the same math mode will be wrapped within the same
-environment.  Default mode is determined in
-@code{org-latex-default-table-mode}.
+The @LaTeX{} export back-end wraps the table differently depending on the
+mode for accurate rendering of math symbols.  Mode is either @code{table},
+@code{math}, @code{inline-math} or @code{verbatim}.  For @code{math} or
+@code{inline-math} mode, @LaTeX{} export back-end wraps the table in a math
+environment, but every cell in it is exported as-is.  The @LaTeX{} export
+back-end determines the default mode from
+@code{org-latex-default-table-mode}.  For , The @LaTeX{} export back-end
+merges contiguous tables in the same mode into a single environment.
 @item :environment
 @vindex org-latex-default-table-environment
-Environment used for the table.  It can be set to any @LaTeX{} table
-environment, like @code{tabularx}@footnote{Requires adding the
-@code{tabularx} package to @code{org-latex-packages-alist}.},
-@code{longtable}, @code{array}, @code{tabu}@footnote{Requires adding the
-@code{tabu} package to @code{org-latex-packages-alist}.},
-@code{bmatrix}@enddots{} It defaults to
-@code{org-latex-default-table-environment} value.
+Set the default @LaTeX{} table environment for the @LaTeX{} export back-end
+to use when exporting Org tables.  Common @LaTeX{} table environments are
+provided by these packages: @code{tabularx}, @code{longtable}, @code{array},
+@code{tabu}, and @code{bmatrix}.  For packages, such as @code{tabularx} and
+@code{tabu}, or any newer replacements, include them in the
+@code{org-latex-packages-alist} variable so the @LaTeX{} export back-end can
+insert the appropriate load package headers in the converted @LaTeX{} file.
+Look in the docstring for the @code{org-latex-packages-alist} variable for
+configuring these packages for @LaTeX{} snippet previews, if any.
 @item :caption
-@code{#+CAPTION} keyword is the simplest way to set a caption for a table
-(@pxref{Images and tables}).  If you need more advanced commands for that
-task, you can use @code{:caption} attribute instead.  Its value should be raw
-@LaTeX{} code.  It has precedence over @code{#+CAPTION}.
+Use @code{#+CAPTION} keyword to set a simple caption for a table
+(@pxref{Images and tables}).  For custom captions, use @code{:caption}
+attribute, which accepts raw @LaTeX{} code.  @code{:caption} value overrides
+@code{#+CAPTION} value.
 @item :float
 @itemx :placement
-Float environment for the table.  Possible values are @code{sidewaystable},
-@code{multicolumn}, @code{t} and @code{nil}.  When unspecified, a table with
-a caption will have a @code{table} environment.  Moreover, @code{:placement}
-attribute can specify the positioning of the float.
+The table environments by default are not floats in @LaTeX{}.  To make them
+floating objects use @code{:float} with one of the following options:
+@code{sideways}, @code{multicolumn}, @code{t}, and @code{nil}.  Note that
+@code{sidewaystable} has been deprecated since Org 8.3.  @LaTeX{} floats can
+also have additional layout @code{:placement} attributes.  These are the
+usual @code{[h t b p ! H]} permissions specified in square brackets.  Note
+that for @code{:float sideways} tables, the @LaTeX{} export back-end ignores
+@code{:placement} attributes.
 @item :align
 @itemx :font
 @itemx :width
-Set, respectively, the alignment string of the table, its font size and its
-width.  They only apply on regular tables.
+The @LaTeX{} export back-end uses these attributes for regular tables to set
+their alignments, fonts, and widths.
 @item :spread
-Boolean specific to the @code{tabu} and @code{longtabu} environments, and
-only takes effect when used in conjunction with the @code{:width} attribute.
-When @code{:spread} is non-@code{nil}, the table will be spread or shrunk by the
-value of @code{:width}.
+When @code{:spread} is non-@code{nil}, the @LaTeX{} export back-end spreads
+or shrinks the table by the @code{:width} for @code{tabu} and @code{longtabu}
+environments.  @code{:spread} has no effect if @code{:width} is not set.
 @item :booktabs
 @itemx :center
 @itemx :rmlines
 @vindex org-latex-tables-booktabs
 @vindex org-latex-tables-centered
-They toggle, respectively, @code{booktabs} usage (assuming the package is
-properly loaded), table centering and removal of every horizontal rule but
-the first one (in a "table.el" table only).  In particular,
-@code{org-latex-tables-booktabs} (respectively @code{org-latex-tables-centered})
-activates the first (respectively second) attribute globally.
+All three commands are toggles.  @code{:booktabs} brings in modern
+typesetting enhancements to regular tables.  The @code{booktabs} package has
+to be loaded through @code{org-latex-packages-alist}.  @code{:center} is for
+centering the table.  @code{:rmlines} removes all but the very first
+horizontal line made of ASCII characters from "table.el" tables only.
 @item :math-prefix
 @itemx :math-suffix
 @itemx :math-arguments
-A string that will be inserted, respectively, before the table within the
-math environment, after the table within the math environment, and between
-the macro name and the contents of the table.  The @code{:math-arguments}
-attribute is used for matrix macros that require more than one argument
-(e.g., @code{qbordermatrix}).
+The @LaTeX{} export back-end inserts @code{:math-prefix} string value in a
+math environment before the table.  The @LaTeX{} export back-end inserts
+@code{:math-suffix} string value in a math environment after the table.  The
+@LaTeX{} export back-end inserts @code{:math-arguments} string value between
+the macro name and the table's contents.  @code{:math-arguments} comes in use
+for matrix macros that require more than one argument, such as
+@code{qbordermatrix}.
 @end table
 
-Thus, attributes can be used in a wide array of situations, like writing
-a table that will span over multiple pages, or a matrix product:
+@LaTeX{} table attributes help formatting tables for a wide range of
+situations, such as matrix product or spanning multiple pages:
 
 @example
 #+ATTR_LATEX: :environment longtable :align l|lp@{3cm@}r|l
@@ -11712,8 +12231,8 @@ a table that will span over multiple pages, or a matrix product:
 | 3 | 4 |
 @end example
 
-In the example below, @LaTeX{} command
-@code{\bicaption@{HeadingA@}@{HeadingB@}} will set the caption.
+Set the caption with the @LaTeX{} command
+@code{\bicaption@{HeadingA@}@{HeadingB@}}:
 
 @example
 #+ATTR_LATEX: :caption \bicaption@{HeadingA@}@{HeadingB@}
@@ -11722,128 +12241,203 @@ In the example below, @LaTeX{} command
 @end example
 
 
-@subsubheading Images in @LaTeX{} export
+@node Images in @LaTeX{} export
+@subsection Images in @LaTeX{} export
 @cindex images, inline in @LaTeX{}
 @cindex inlining images in @LaTeX{}
+@cindex #+ATTR_LATEX, in images
 
-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 file resulting from @LaTeX{} processing.  Org will use an
-@code{\includegraphics} macro to insert the image@footnote{In the case of
-TikZ (@url{http://sourceforge.net/projects/pgf/}) images, it will become an
-@code{\input} macro wrapped within a @code{tikzpicture} environment.}.
+The @LaTeX{} export back-end processes image links in Org files that do not
+have descriptions, such as these links @samp{[[file:img.jpg]]} or
+@samp{[[./img.jpg]]}, as direct image insertions in the final PDF output.  In
+the PDF, they are no longer links but actual images embedded on the page.
+The @LaTeX{} export back-end uses @code{\includegraphics} macro to insert the
+image.  But for TikZ@footnote{@url{http://sourceforge.net/projects/pgf/}}
+images, the back-end uses an @code{\input} macro wrapped within
+a @code{tikzpicture} environment.
 
-You can specify specify image width or height with, respectively,
-@code{:width} and @code{:height} attributes.  It is also possible to add any
-other option with the @code{:options} attribute, as shown in the following
-example:
+For specifying image @code{:width}, @code{:height}, and other
+@code{:options}, use this syntax:
 
 @example
 #+ATTR_LATEX: :width 5cm :options angle=90
 [[./img/sed-hr4049.pdf]]
 @end example
 
-If you need a specific command for the caption, use @code{:caption}
-attribute.  It will override standard @code{#+CAPTION} value, if any.
+For custom commands for captions, use the @code{:caption} attribute.  It will
+override the default @code{#+CAPTION} value:
 
 @example
 #+ATTR_LATEX: :caption \bicaption@{HeadingA@}@{HeadingB@}
 [[./img/sed-hr4049.pdf]]
 @end example
 
-If you have specified a caption as described in @ref{Images and tables}, the
-picture will be wrapped into a @code{figure} environment and thus become
-a floating element.  You can also ask Org to export an image as a float
-without specifying caption by setting the @code{:float} attribute.  You may
-also set it to:
+When captions follow the method as described in @ref{Images and tables}, the
+@LaTeX{} export back-end wraps the picture in a floating @code{figure}
+environment.  To float an image without specifying a caption, set the
+@code{:float} attribute to one of the following:
 @itemize @minus
 @item
-@code{t}: if you want to use the standard @samp{figure} environment.  It is
-used by default if you provide a caption to the image.
+@code{t}: for a standard @samp{figure} environment; used by default whenever
+an image has a caption.
 @item
-@code{multicolumn}: if you wish to include an image which spans multiple
-columns in a page.  This will export the image wrapped in a @code{figure*}
-environment.
+@code{multicolumn}: to span the image across multiple columns of a page; the
+back-end wraps the image in a @code{figure*} environment.
 @item
-@code{wrap}: if you would like to let text flow around the image.  It will
-make the figure occupy the left half of the page.
+@code{wrap}: for text to flow around the image on the right; the figure
+occupies the left half of the page.
 @item
-@code{nil}: if you need to avoid any floating environment, even when
-a caption is provided.
+@code{sideways}: for a new page with the image sideways, rotated ninety
+degrees, in a @code{sidewaysfigure} environment; overrides @code{:placement}
+setting.
+@item
+@code{nil}: to avoid a @code{:float} even if using a caption.
 @end itemize
 @noindent
-To modify the placement option of any floating environment, set the
-@code{placement} attribute.
+Use the @code{placement} attribute to modify a floating environment's placement.
 
 @example
-#+ATTR_LATEX: :float wrap :width 0.38\textwidth :placement @{r@}@{0.4\textwidth@}
-[[./img/hst.png]]
+#+ATTR_LATEX: :float wrap :width 0.38\textwidth :placement
+@{r@}@{0.4\textwidth@} [[./img/hst.png]]
 @end example
 
-If the @code{:comment-include} attribute is set to a non-@code{nil} value,
-the @LaTeX{} @code{\includegraphics} macro will be commented out.
+@vindex org-latex-images-centered
+@cindex center image (@LaTeX{} export)
+@cindex image, centering (@LaTeX{} export)
+
+The @LaTeX{} export back-end centers all images by default.  Setting
+@code{:center} attribute to @code{nil} disables centering.  To disable
+centering globally, set @code{org-latex-images-centered} to @code{t}.
 
-@subsubheading Plain lists in @LaTeX{} export
+Set the @code{:comment-include} attribute to non-@code{nil} value for the
+@LaTeX{} export back-end to comment out the @code{\includegraphics} macro.
+
+@node Plain lists in @LaTeX{} export
+@subsection Plain lists in @LaTeX{} export
 @cindex plain lists, in @LaTeX{} export
+@cindex #+ATTR_LATEX, in plain lists
+
+The @LaTeX{} export back-end accepts the @code{:environment} and
+@code{:options} attributes for plain lists.  Both attributes work together
+for customizing lists, as shown in the examples:
+
+@example
+#+LATEX_HEADER: \usepackage[inline]@{enumitem@}
+Some ways to say "Hello":
+#+ATTR_LATEX: :environment itemize*
+#+ATTR_LATEX: :options [label=@{@}, itemjoin=@{,@}, itemjoin*=@{, and@}]
+- Hola
+- Bonjour
+- Guten Tag.
+@end example
 
-Plain lists accept two optional attributes: @code{:environment} and
-@code{:options}.  The first one allows the use of a non-standard environment
-(e.g., @samp{inparaenum}).  The second one specifies additional arguments for
-that environment.
+Since @LaTeX{} supports only four levels of nesting for lists, use an
+external package, such as @samp{enumitem} in @LaTeX{}, for levels deeper than
+four:
 
 @example
-#+ATTR_LATEX: :environment compactitem :options [$\circ$]
-- you need ``paralist'' package to reproduce this example.
+#+LATEX_HEADER: \usepackage@{enumitem@}
+#+LATEX_HEADER: \renewlist@{itemize@}@{itemize@}@{9@}
+#+LATEX_HEADER: \setlist[itemize]@{label=$\circ$@}
+- One
+  - Two
+    - Three
+      - Four
+        - Five
 @end example
 
-@subsubheading Source blocks in @LaTeX{} export
+@node Source blocks in @LaTeX{} export
+@subsection Source blocks in @LaTeX{} export
 @cindex source blocks, in @LaTeX{} export
+@cindex #+ATTR_LATEX, in source blocks
+
+The @LaTeX{} export back-end can make source code blocks into floating
+objects through the attributes @code{:float} and @code{:options}.  For
+@code{:float}:
 
-In addition to syntax defined in @ref{Literal examples}, names and captions
-(@pxref{Images and tables}), source blocks also accept a @code{:float}
-attribute.  You may set it to:
 @itemize @minus
 @item
-@code{t}: if you want to make the source block a float.  It is the default
-value when a caption is provided.
+@code{t}: makes a source block float; by default floats any source block with
+a caption.
 @item
-@code{multicolumn}: if you wish to include a source block which spans multiple
-columns in a page.
+@code{multicolumn}: spans the source block across multiple columns of a page.
 @item
-@code{nil}: if you need to avoid any floating environment, even when a caption
-is provided.  It is useful for source code that may not fit in a single page.
+@code{nil}: avoids a @code{:float} even if using a caption; useful for
+source code blocks that may not fit on a page.
 @end itemize
 
 @example
 #+ATTR_LATEX: :float nil
 #+BEGIN_SRC emacs-lisp
-Code that may not fit in a single page.
+Lisp code that may not fit in a single page.
 #+END_SRC
 @end example
 
-@subsubheading Special blocks in @LaTeX{} export
+@vindex org-latex-listings-options
+@vindex org-latex-minted-options
+The @LaTeX{} export back-end passes string values in @code{:options} to
+@LaTeX{} packages for customization of that specific source block.  In the
+example below, the @code{:options} are set for Minted.  Minted is a source
+code highlighting @LaTeX{}package with many configurable options.
+
+@example
+#+ATTR_LATEX: :options commentstyle=\bfseries
+#+BEGIN_SRC emacs-lisp
+  (defun Fib (n)
+    (if (< n 2) n (+ (Fib (- n 1)) (Fib (- n 2)))))
+#+END_SRC
+@end example
+
+To apply similar configuration options for all source blocks in a file, use
+the @code{org-latex-listings-options} and @code{org-latex-minted-options}
+variables.
+
+@node Example blocks in @LaTeX{} export
+@subsection Example blocks in @LaTeX{} export
+@cindex example blocks, in @LaTeX{} export
+@cindex verbatim blocks, in @LaTeX{} export
+@cindex #+ATTR_LATEX, in example blocks
+
+The @LaTeX{} export back-end wraps the contents of example blocks in a
+@samp{verbatim} environment.  To change this behavior to use another
+environment globally, specify an appropriate export filter (@pxref{Advanced
+configuration}).  To change this behavior to use another environment for each
+block, use the @code{:environment} parameter to specify a custom environment.
+
+@example
+#+ATTR_LATEX: :environment myverbatim
+#+BEGIN_EXAMPLE
+This sentence is false.
+#+END_EXAMPLE
+@end example
+
+@node Special blocks in @LaTeX{} export
+@subsection Special blocks in @LaTeX{} export
 @cindex special blocks, in @LaTeX{} export
 @cindex abstract, in @LaTeX{} export
 @cindex proof, in @LaTeX{} export
+@cindex #+ATTR_LATEX, in special blocks
 
-In @LaTeX{} back-end, special blocks become environments of the same name.
-Value of @code{:options} attribute will be appended as-is to that
-environment's opening string.  For example:
+
+For other special blocks in the Org file, the @LaTeX{} export back-end makes
+a special environment of the same name.  The back-end also takes
+@code{:options}, if any, and appends as-is to that environment's opening
+string.  For example:
 
 @example
-#+BEGIN_ABSTRACT
+#+BEGIN_abstract
 We demonstrate how to solve the Syracuse problem.
-#+END_ABSTRACT
+#+END_abstract
 
 #+ATTR_LATEX: :options [Proof of important theorem]
-#+BEGIN_PROOF
+#+BEGIN_proof
 ...
 Therefore, any even number greater than 2 is the sum of two primes.
-#+END_PROOF
+#+END_proof
 @end example
 
 @noindent
-becomes
+exports to
 
 @example
 \begin@{abstract@}
@@ -11862,43 +12456,43 @@ example:
 
 @example
 #+ATTR_LATEX: :caption \MyCaption@{HeadingA@}
-#+BEGIN_PROOF
+#+BEGIN_proof
 ...
-#+END_PROOF
+#+END_proof
 @end example
 
-@subsubheading Horizontal rules
+@node Horizontal rules in @LaTeX{} export
+@subsection Horizontal rules in @LaTeX{} export
 @cindex horizontal rules, in @LaTeX{} export
+@cindex #+ATTR_LATEX, in horizontal rules
 
-Width and thickness of a given horizontal rule can be controlled with,
-respectively, @code{:width} and @code{:thickness} attributes:
+The @LaTeX{} export back-end converts horizontal rules by the specified
+@code{:width} and @code{:thickness} attributes.  For example:
 
 @example
 #+ATTR_LATEX: :width .6\textwidth :thickness 0.8pt
 -----
 @end example
 
-@node Markdown export, OpenDocument Text export, @LaTeX{} and PDF export, Exporting
+@node Markdown export
 @section Markdown export
 @cindex Markdown export
 
-@code{md} export back-end generates Markdown syntax@footnote{Vanilla flavor,
-as defined at @url{http://daringfireball.net/projects/markdown/}.} for an Org
-mode buffer.
+The Markdown export back-end, @code{md}, converts an Org file to a Markdown
+format, as defined at @url{http://daringfireball.net/projects/markdown/}.
 
-It is built over HTML back-end: any construct not supported by Markdown
-syntax (e.g., tables) will be controlled and translated by @code{html}
-back-end (@pxref{HTML export}).
+Since @code{md} is built on top of the HTML back-end, any Org constructs not
+supported by Markdown, such as tables, the underlying @code{html} back-end
+(@pxref{HTML export}) converts them.
 
 @subheading Markdown export commands
 
 @table @kbd
 @orgcmd{C-c C-e m m,org-md-export-to-markdown}
-Export as a text file written in Markdown syntax.  For an Org file,
-@file{myfile.org}, the resulting file will be @file{myfile.md}.  The file
-will be overwritten without warning.
+Export to a text file with Markdown syntax.  For @file{myfile.org}, Org
+exports to @file{myfile.md}, overwritten without warning.
 @orgcmd{C-c C-e m M,org-md-export-as-markdown}
-Export to a temporary buffer.  Do not create a file.
+Export to a temporary buffer.  Does not create a file.
 @item C-c C-e m o
 Export as a text file with Markdown syntax, then open it.
 @end table
@@ -11906,54 +12500,52 @@ Export as a text file with Markdown syntax, then open it.
 @subheading Header and sectioning structure
 
 @vindex org-md-headline-style
-Markdown export can generate both @code{atx} and @code{setext} types for
-headlines, according to @code{org-md-headline-style}.  The former introduces
-a hard limit of two levels, whereas the latter pushes it to six.  Headlines
-below that limit are exported as lists.  You can also set a soft limit before
-that one (@pxref{Export settings}).
+Based on @code{org-md-headline-style}, markdown export can generate headlines
+of both @code{atx} and @code{setext} types.  @code{atx} limits headline
+levels to two.  @code{setext} limits headline levels to six.  Beyond these
+limits, the export back-end converts headlines to lists.  To set a limit to a
+level before the absolute limit (@pxref{Export settings}).
 
 @c begin opendocument
 
-@node OpenDocument Text export, Org export, Markdown export, Exporting
+@node OpenDocument Text export
 @section OpenDocument Text export
 @cindex ODT
 @cindex OpenDocument
 @cindex export, OpenDocument
 @cindex LibreOffice
 
-Org mode@footnote{Versions 7.8 or later} supports export to OpenDocument Text
-(ODT) format.  Documents created by this exporter use the
-@cite{OpenDocument-v1.2
+The ODT export back-end handles creating of OpenDocument Text (ODT) format
+files.  The format complies with @cite{OpenDocument-v1.2
 specification}@footnote{@url{http://docs.oasis-open.org/office/v1.2/OpenDocument-v1.2.html,
 Open Document Format for Office Applications (OpenDocument) Version 1.2}} and
-are compatible with LibreOffice 3.4.
+is compatible with LibreOffice 3.4.
 
 @menu
-* Pre-requisites for ODT export::  What packages ODT exporter relies on
-* ODT export commands::         How to invoke ODT export
-* Extending ODT export::        How to produce @samp{doc}, @samp{pdf} files
-* Applying custom styles::      How to apply custom styles to the output
-* Links in ODT export::         How links will be interpreted and formatted
-* Tables in ODT export::        How Tables are exported
-* Images in ODT export::        How to insert images
-* Math formatting in ODT export::  How @LaTeX{} fragments are formatted
-* Labels and captions in ODT export::  How captions are rendered
-* Literal examples in ODT export::  How source and example blocks are formatted
-* Advanced topics in ODT export::  Read this if you are a power user
+* Pre-requisites for ODT export::  Required packages.
+* ODT export commands::         Invoking export.
+* ODT specific export settings::  Configuration options.
+* Extending ODT export::        Producing @file{.doc}, @file{.pdf} files.
+* Applying custom styles::      Styling the output.
+* Links in ODT export::         Handling and formatting links.
+* Tables in ODT export::        Org table conversions.
+* Images in ODT export::        Inserting images.
+* Math formatting in ODT export::  Formatting @LaTeX{} fragments.
+* Labels and captions in ODT export::  Rendering objects.
+* Literal examples in ODT export::  For source code and example blocks.
+* Advanced topics in ODT export::  For power users.
 @end menu
 
-@node Pre-requisites for ODT export, ODT export commands, OpenDocument Text export, OpenDocument Text export
+@node Pre-requisites for ODT export
 @subsection Pre-requisites for ODT export
 @cindex zip
-The ODT exporter relies on the @file{zip} program to create the final
-output.  Check the availability of this program before proceeding further.
+The ODT export back-end relies on the @file{zip} program to create the final
+compressed ODT output.  Check if @file{zip} is locally available and
+executable.  Without @file{zip}, export cannot finish.
 
-@node ODT export commands, Extending ODT export, Pre-requisites for ODT export, OpenDocument Text export
+@node ODT export commands
 @subsection ODT export commands
-
-@subsubheading Exporting to ODT
 @anchor{x-export-to-odt}
-
 @cindex region, active
 @cindex active region
 @cindex transient-mark-mode
@@ -11964,94 +12556,121 @@ output.  Check the availability of this program before proceeding further.
 Export as OpenDocument Text file.
 
 @vindex org-odt-preferred-output-format
-If @code{org-odt-preferred-output-format} is specified, automatically convert
-the exported file to that format.  @xref{x-export-to-other-formats, ,
-Automatically exporting to other formats}.
-
-For an Org file @file{myfile.org}, the ODT file will be
-@file{myfile.odt}.  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.
+If @code{org-odt-preferred-output-format} is specified, the ODT export
+back-end automatically converts the exported file to that format.
+@xref{x-export-to-other-formats, , Automatically exporting to other formats}.
+
+For @file{myfile.org}, Org exports to @file{myfile.odt}, overwriting without
+warning.  The ODT export back-end exports a region only if a region was
+active.  Note for exporting active regions, the @code{transient-mark-mode}
+has to be turned on.
+
+If the selected region is a single tree, the ODT export back-end makes the
+tree head the document title.  Incidentally, @kbd{C-c @@} selects the current
+sub-tree.  If the tree head entry has, or inherits, an
+@code{EXPORT_FILE_NAME} property, the ODT export back-end uses that for file
+name.
 
 @kbd{C-c C-e o O}
-Export as an OpenDocument Text file and open the resulting file.
+Export to an OpenDocument Text file format and open it.
 
 @vindex org-odt-preferred-output-format
-If @code{org-odt-preferred-output-format} is specified, open the converted
+When @code{org-odt-preferred-output-format} is specified, open the converted
 file instead.  @xref{x-export-to-other-formats, , Automatically exporting to
 other formats}.
 @end table
 
-@node Extending ODT export, Applying custom styles, ODT export commands, OpenDocument Text export
+@node ODT specific export settings
+@subsection ODT specific export settings
+The ODT export back-end has several additional keywords for customizing ODT
+output.  Setting these keywords works similar to the general options
+(@pxref{Export settings}).
+
+@table @samp
+@item DESCRIPTION
+@cindex #+DESCRIPTION (ODT)
+This is the document's description, which the ODT export back-end inserts as
+document metadata.  For long descriptions, use multiple @code{#+DESCRIPTION}
+lines.
+
+@item KEYWORDS
+@cindex #+KEYWORDS (ODT)
+The keywords for the document.  The ODT export back-end inserts the
+description along with author name, keywords, and related file metadata as
+metadata in the output file.  Use multiple @code{#+KEYWORDS} lines if
+necessary.
+
+@item ODT_STYLES_FILE
+@cindex ODT_STYLES_FILE
+@vindex org-odt-styles-file
+The ODT export back-end uses the @code{org-odt-styles-file} by default.  See
+@ref{Applying custom styles} for details.
+
+@item SUBTITLE
+@cindex SUBTITLE (ODT)
+The document subtitle.
+@end table
+
+@node Extending ODT export
 @subsection Extending ODT export
 
-The ODT exporter can interface with a variety of document
-converters and supports popular converters out of the box.  As a result, you
-can use it to export to formats like @samp{doc} or convert a document from
-one format (say @samp{csv}) to another format (say @samp{ods} or @samp{xls}).
+The ODT export back-end can produce documents in other formats besides ODT
+using a specialized ODT converter process.  Its common interface works with
+popular converters to produce formats such as @samp{doc}, or convert a
+document from one format, say @samp{csv}, to another format, say @samp{xls}.
 
 @cindex @file{unoconv}
 @cindex LibreOffice
-If you have a working installation of LibreOffice, a document converter is
-pre-configured for you and you can use it right away.  If you would like to
-use @file{unoconv} as your preferred converter, customize the variable
-@code{org-odt-convert-process} to point to @code{unoconv}.  You can
-also use your own favorite converter or tweak the default settings of the
-@file{LibreOffice} and @samp{unoconv} converters.  @xref{Configuring a
-document converter}.
-
-@subsubsection Automatically exporting to other formats
+
+Customize @code{org-odt-convert-process} variable to point to @code{unoconv},
+which is the ODT's preferred converter.  Working installations of LibreOffice
+would already have @code{unoconv} installed.  Alternatively, other converters
+may be substituted here.  @xref{Configuring a document converter}.
+
+@subsubheading Automatically exporting to other formats
 @anchor{x-export-to-other-formats}
 
 @vindex org-odt-preferred-output-format
-Very often, you will find yourself exporting to ODT format, only to
-immediately save the exported document to other formats like @samp{doc},
-@samp{docx}, @samp{rtf}, @samp{pdf} etc.  In such cases, you can specify your
-preferred output format by customizing the variable
-@code{org-odt-preferred-output-format}.  This way, the export commands
-(@pxref{x-export-to-odt,,Exporting to ODT}) can be extended to export to a
-format that is of immediate interest to you.
-
-@subsubsection Converting between document formats
+If ODT format is just an intermediate step to get to other formats, such as
+@samp{doc}, @samp{docx}, @samp{rtf}, or @samp{pdf}, etc., then extend the ODT
+export back-end to directly produce that format.  Specify the final format in
+the @code{org-odt-preferred-output-format} variable.  This is one way to
+extend (@pxref{x-export-to-odt,,Exporting to ODT}).
+
+@subsubheading Converting between document formats
 @anchor{x-convert-to-other-formats}
 
-There are many document converters in the wild which support conversion to
-and from various file formats, including, but not limited to the
-ODT format.  LibreOffice converter, mentioned above, is one such
-converter.  Once a converter is configured, you can interact with it using
-the following command.
+The Org export back-end is made to be inter-operable with a wide range of text
+document format converters.  Newer generation converters, such as LibreOffice
+and Pandoc, can handle hundreds of formats at once.  Org provides a
+consistent interaction with whatever converter is installed.  Here are some
+generic commands:
 
 @vindex org-odt-convert
 @table @kbd
 
 @item M-x org-odt-convert RET
 Convert an existing document from one format to another.  With a prefix
-argument, also open the newly produced file.
+argument, opens the newly produced file.
 @end table
 
-@node Applying custom styles, Links in ODT export, Extending ODT export, OpenDocument Text export
+@node Applying custom styles
 @subsection Applying custom styles
 @cindex styles, custom
 @cindex template, custom
 
-The ODT exporter ships with a set of OpenDocument styles
-(@pxref{Working with OpenDocument style files}) that ensure a well-formatted
-output.  These factory styles, however, may not cater to your specific
-tastes.  To customize the output, you can either modify the above styles
-files directly, or generate the required styles using an application like
-LibreOffice.  The latter method is suitable for expert and non-expert
-users alike, and is described here.
+The ODT export back-end comes with many OpenDocument styles (@pxref{Working
+with OpenDocument style files}).  To expand or further customize these
+built-in style sheets, either edit the style sheets directly or generate them
+using an application such as LibreOffice.  The example here shows creating a
+style using LibreOffice.
 
-@subsubsection Applying custom styles: the easy way
+@subsubheading Applying custom styles: the easy way
 
 @enumerate
 @item
-Create a sample @file{example.org} file with the below settings and export it
-to ODT format.
+Create a sample @file{example.org} file with settings as shown below, and
+export it to ODT format.
 
 @example
 #+OPTIONS: H:10 num:t
@@ -12059,9 +12678,9 @@ to ODT format.
 
 @item
 Open the above @file{example.odt} using LibreOffice.  Use the @file{Stylist}
-to locate the target styles---these typically have the @samp{Org} prefix---and
-modify those to your taste.  Save the modified file either as an
-OpenDocument Text (@file{.odt}) or OpenDocument Template (@file{.ott}) file.
+to locate the target styles, which typically have the @samp{Org} prefix.
+Open one, modify, and save as either OpenDocument Text (@file{.odt}) or
+OpenDocument Template (@file{.ott}) file.
 
 @item
 @cindex #+ODT_STYLES_FILE
@@ -12070,8 +12689,8 @@ Customize the variable @code{org-odt-styles-file} and point it to the
 newly created file.  For additional configuration options
 @pxref{x-overriding-factory-styles,,Overriding factory styles}.
 
-If you would like to choose a style on a per-file basis, you can use the
-@code{#+ODT_STYLES_FILE} option.  A typical setting will look like
+To apply and ODT style to a particular file, use the @code{#+ODT_STYLES_FILE}
+option as shown in the example below:
 
 @example
 #+ODT_STYLES_FILE: "/path/to/example.ott"
@@ -12085,51 +12704,48 @@ or
 
 @end enumerate
 
-@subsubsection Using third-party styles and templates
+@subsubheading Using third-party styles and templates
 
-You can use third-party styles and templates for customizing your output.
-This will produce the desired output only if the template provides all
-style names that the @samp{ODT} exporter relies on.  Unless this condition is
-met, the output is going to be less than satisfactory.  So it is highly
-recommended that you only work with templates that are directly derived from
-the factory settings.
+The ODT export back-end relies on many templates and style names.  Using
+third-party styles and templates can lead to mismatches.  Templates derived
+from built in ODT templates and styles seem to have fewer problems.
 
-@node Links in ODT export, Tables in ODT export, Applying custom styles, OpenDocument Text export
+@node Links in ODT export
 @subsection Links in ODT export
 @cindex links, in ODT export
 
-ODT exporter creates native cross-references for internal links.  It creates
-Internet-style links for all other links.
+ODT export back-end creates native cross-references for internal links and
+Internet-style links for all other link types.
 
-A link with no description and destined to a regular (un-itemized) outline
+A link with no description and pointing to a regular---un-itemized---outline
 heading is replaced with a cross-reference and section number of the heading.
 
 A @samp{\ref@{label@}}-style reference to an image, table etc.@: is replaced
 with a cross-reference and sequence number of the labeled entity.
 @xref{Labels and captions in ODT export}.
 
-@node Tables in ODT export, Images in ODT export, Links in ODT export, OpenDocument Text export
+@node Tables in ODT export
 @subsection Tables in ODT export
 @cindex tables, in ODT export
 
-Export of native Org mode tables (@pxref{Tables}) and simple @file{table.el}
-tables is supported.  However, export of complex @file{table.el} tables---tables
-that have column or row spans---is not supported.  Such tables are
-stripped from the exported document.
+The ODT export back-end handles native Org mode tables (@pxref{Tables}) and
+simple @file{table.el} tables.  Complex @file{table.el} tables having column
+or row spans are not supported.  Such tables are stripped from the exported
+document.
 
-By default, a table is exported with top and bottom frames and with rules
-separating row and column groups (@pxref{Column groups}).  Furthermore, all
-tables are typeset to occupy the same width.  If the table specifies
-alignment and relative width for its columns (@pxref{Column width and
-alignment}) then these are honored on export.@footnote{The column widths are
-interpreted as weighted ratios with the default weight being 1}
+By default, the ODT export back-end exports a table with top and bottom
+frames and with ruled lines separating row and column groups (@pxref{Column
+groups}).  All tables are typeset to occupy the same width.  The ODT export
+back-end honors any table alignments and relative widths for columns
+(@pxref{Column width and alignment}).
+
+Note that the ODT export back-end interprets column widths as weighted
+ratios, the default weight being 1.
 
 @cindex #+ATTR_ODT
-You can control the width of the table by specifying @code{:rel-width}
-property using an @code{#+ATTR_ODT} line.
 
-For example, consider the following table which makes use of all the rules
-mentioned above.
+Specifying @code{:rel-width} property on an @code{#+ATTR_ODT} line controls
+the width of the table.  For example:
 
 @example
 #+ATTR_ODT: :rel-width 50
@@ -12144,25 +12760,25 @@ mentioned above.
 | Sum           |    16 |   123 |  2560 |  2699 |
 @end example
 
-On export, the table will occupy 50% of text area.  The columns will be sized
-(roughly) in the ratio of 13:5:5:5:6.  The first column will be left-aligned
-and rest of the columns will be right-aligned.  There will be vertical rules
-after separating the header and last columns from other columns.  There will
-be horizontal rules separating the header and last rows from other rows.
+On export, the above table takes 50% of text width area.  The exporter sizes
+the columns in the ratio: 13:5:5:5:6.  The first column is left-aligned and
+rest of the columns, right-aligned.  Vertical rules separate the header and
+the last column.  Horizontal rules separate the header and the last row.
 
-If you are not satisfied with the above formatting options, you can create
-custom table styles and associate them with a table using the
-@code{#+ATTR_ODT} line.  @xref{Customizing tables in ODT export}.
+For even more customization, create custom table styles and associate them
+with a table using the @code{#+ATTR_ODT} line.  @xref{Customizing tables in
+ODT export}.
 
-@node Images in ODT export, Math formatting in ODT export, Tables in ODT export, OpenDocument Text export
+@node Images in ODT export
 @subsection Images in ODT export
 @cindex images, embedding in ODT
 @cindex embedding images in ODT
 
 @subsubheading Embedding images
-You can embed images within the exported document by providing a link to the
-desired image file with no link description.  For example, to embed
-@samp{img.png} do either of the following:
+The ODT export back-end processes image links in Org files that do not have
+descriptions, such as these links @samp{[[file:img.jpg]]} or
+@samp{[[./img.jpg]]}, as direct image insertions in the final output.  Either
+of these examples works:
 
 @example
 [[file:img.png]]
@@ -12173,10 +12789,9 @@ desired image file with no link description.  For example, to embed
 @end example
 
 @subsubheading Embedding clickable images
-You can create clickable images by providing a link whose description is a
-link to an image file.  For example, to embed a image
-@file{org-mode-unicorn.png} which when clicked jumps to
-@uref{http://Orgmode.org} website, do the following
+For clickable images, provide a link whose description is another link to an
+image file.  For example, to embed a image @file{org-mode-unicorn.png} which
+when clicked jumps to @uref{http://Orgmode.org} website, do the following
 
 @example
 [[http://orgmode.org][./org-mode-unicorn.png]]
@@ -12185,25 +12800,22 @@ link to an image file.  For example, to embed a image
 @subsubheading Sizing and scaling of embedded images
 
 @cindex #+ATTR_ODT
-You can control the size and scale of the embedded images using the
-@code{#+ATTR_ODT} attribute.
+Control the size and scale of the embedded images with the @code{#+ATTR_ODT}
+attribute.
 
 @cindex identify, ImageMagick
 @vindex org-odt-pixels-per-inch
-The exporter specifies the desired size of the image in the final document in
-units of centimeters.  In order to scale the embedded images, the exporter
-queries for pixel dimensions of the images using one of a) ImageMagick's
-@file{identify} program or b) Emacs @code{create-image} and @code{image-size}
-APIs@footnote{Use of @file{ImageMagick} is only desirable.  However, if you
-routinely produce documents that have large images or you export your Org
-files that has images using a Emacs batch script, then the use of
-@file{ImageMagick} is mandatory.}. The pixel dimensions are subsequently
-converted in to units of centimeters using
-@code{org-odt-pixels-per-inch}.  The default value of this variable is
-set to @code{display-pixels-per-inch}.  You can tweak this variable to
-achieve the best results.
-
-The examples below illustrate the various possibilities.
+The ODT export back-end starts with establishing the size of the image in the
+final document.  The dimensions of this size is measured in centimeters.  The
+back-end then queries the image file for its dimensions measured in pixels.
+For this measurement, the back-end relies on ImageMagick's @file{identify}
+program or Emacs @code{create-image} and @code{image-size} API.  ImageMagick
+is the preferred choice for large file sizes or frequent batch operations.
+The back-end then converts the pixel dimensions using
+@code{org-odt-pixels-per-inch} into the familiar 72 dpi or 96 dpi.  The
+default value for this is in @code{display-pixels-per-inch}, which can be
+tweaked for better results based on the capabilities of the output device.
+Here are some common image scaling operations:
 
 @table @asis
 @item Explicitly size the image
@@ -12244,38 +12856,37 @@ height:width ratio, do the following
 @subsubheading Anchoring of images
 
 @cindex #+ATTR_ODT
-You can control the manner in which an image is anchored by setting the
-@code{:anchor} property of it's @code{#+ATTR_ODT} line.  You can specify one
-of the following three values for the @code{:anchor} property:
-@samp{"as-char"}, @samp{"paragraph"} and @samp{"page"}.
+The ODT export back-end can anchor images to @samp{"as-char"},
+@samp{"paragraph"}, or @samp{"page"}.  Set the preferred anchor using the
+@code{:anchor} property of the @code{#+ATTR_ODT} line.
 
-To create an image that is anchored to a page, do the following:
+To create an image that is anchored to a page:
 @example
 #+ATTR_ODT: :anchor "page"
 [[./img.png]]
 @end example
 
-@node Math formatting in ODT export, Labels and captions in ODT export, Images in ODT export, OpenDocument Text export
+@node Math formatting in ODT export
 @subsection Math formatting in ODT export
 
-The ODT exporter has special support for handling math.
+The ODT export back-end has special support built-in for handling math.
 
 @menu
-* Working with @LaTeX{} math snippets::  How to embed @LaTeX{} math fragments
-* Working with MathML or OpenDocument formula files::  How to embed equations in native format
+* Working with @LaTeX{} math snippets::  Embedding in @LaTeX{} format.
+* Working with MathML or OpenDocument formula files::  Embedding in native format.
 @end menu
 
-@node Working with @LaTeX{} math snippets, Working with MathML or OpenDocument formula files, Math formatting in ODT export, Math formatting in ODT export
-@subsubsection Working with @LaTeX{} math snippets
+@node Working with @LaTeX{} math snippets
+@subsubheading Working with @LaTeX{} math snippets
 
-@LaTeX{} math snippets (@pxref{@LaTeX{} fragments}) can be embedded in the ODT
+@LaTeX{} math snippets (@pxref{@LaTeX{} fragments}) can be embedded in an ODT
 document in one of the following ways:
 
 @cindex MathML
 @enumerate
 @item MathML
 
-This option is activated on a per-file basis with
+Add this line to the Org file.  This option is activated on a per-file basis.
 
 @example
 #+OPTIONS: LaTeX:t
@@ -12289,13 +12900,13 @@ the exported document.
 @vindex org-latex-to-mathml-convert-command
 @vindex org-latex-to-mathml-jar-file
 
-You can specify the @LaTeX{}-to-MathML converter by customizing the variables
+To specify the @LaTeX{}-to-MathML converter, customize the variables
 @code{org-latex-to-mathml-convert-command} and
 @code{org-latex-to-mathml-jar-file}.
 
-If you prefer to use @file{MathToWeb}@footnote{See
-@uref{http://www.mathtoweb.com/cgi-bin/mathtoweb_home.pl, MathToWeb}} as your
-converter, you can configure the above variables as shown below.
+To use MathToWeb@footnote{See
+@uref{http://www.mathtoweb.com/cgi-bin/mathtoweb_home.pl, MathToWeb}.} as the
+preferred converter, configure the above variables as
 
 @lisp
 (setq org-latex-to-mathml-convert-command
@@ -12303,9 +12914,14 @@ converter, you can configure the above variables as shown below.
       org-latex-to-mathml-jar-file
       "/path/to/mathtoweb.jar")
 @end lisp
+To use @LaTeX{}ML@footnote{See @uref{http://dlmf.nist.gov/LaTeXML/}.} use
+@lisp
+(setq org-latex-to-mathml-convert-command
+      "latexmlmath \"%i\" --presentationmathml=%o")
+@end lisp
 
-You can use the following commands to quickly verify the reliability of
-the @LaTeX{}-to-MathML converter.
+To quickly verify the reliability of the @LaTeX{}-to-MathML converter, use
+the following commands:
 
 @table @kbd
 @item M-x org-odt-export-as-odf RET
@@ -12317,34 +12933,39 @@ and open the formula file with the system-registered application.
 @end table
 
 @cindex dvipng
+@cindex dvisvgm
 @cindex imagemagick
 @item PNG images
 
-This option is activated on a per-file basis with
+Add this line to the Org file.  This option is activated on a per-file basis.
 
 @example
 #+OPTIONS: tex:dvipng
 @end example
 
+@example
+#+OPTIONS: tex:dvisvgm
+@end example
+
 or:
 
 @example
 #+OPTIONS: tex:imagemagick
 @end example
 
-With this option, @LaTeX{} fragments are processed into PNG images and the
-resulting images are embedded in the exported document.  This method requires
-that the @file{dvipng} program or @file{imagemagick} suite be available on
-your system.
+Under this option, @LaTeX{} fragments are processed into PNG or SVG images
+and the resulting images are embedded in the exported document.  This method
+requires @file{dvipng} program, @file{dvisvgm} or @file{imagemagick}
+programs.
 @end enumerate
 
-@node Working with MathML or OpenDocument formula files,  , Working with @LaTeX{} math snippets, Math formatting in ODT export
-@subsubsection Working with MathML or OpenDocument formula files
+@node Working with MathML or OpenDocument formula files
+@subsubheading Working with MathML or OpenDocument formula files
 
-For various reasons, you may find embedding @LaTeX{} math snippets in an
-ODT document less than reliable.  In that case, you can embed a
-math equation by linking to its MathML (@file{.mml}) source or its
-OpenDocument formula (@file{.odf}) file as shown below:
+When embedding @LaTeX{} math snippets in ODT documents is not reliable, there
+is one more option to try.  Embed an equation by linking to its MathML
+(@file{.mml}) source or its OpenDocument formula (@file{.odf}) file as shown
+below:
 
 @example
 [[./equation.mml]]
@@ -12356,19 +12977,14 @@ or
 [[./equation.odf]]
 @end example
 
-@node Labels and captions in ODT export, Literal examples in ODT export, Math formatting in ODT export, OpenDocument Text export
+@node Labels and captions in ODT export
 @subsection Labels and captions in ODT export
 
-You can label and caption various category of objects---an inline image, a
-table, a @LaTeX{} fragment or a Math formula---using @code{#+LABEL} and
-@code{#+CAPTION} lines.  @xref{Images and tables}.  ODT exporter enumerates
-each labeled or captioned object of a given category separately.  As a
-result, each such object is assigned a sequence number based on order of it's
-appearance in the Org file.
-
-In the exported document, a user-provided caption is augmented with the
-category and sequence number.  Consider the following inline image in an Org
-file.
+ODT format handles labeling and captioning of objects based on their
+types.  Inline images, tables, @LaTeX{} fragments, and Math formulas are
+numbered and captioned separately.  Each object also gets a unique sequence
+number based on its order of first appearance in the Org file.  Each category
+has its own sequence.  A caption is just a label applied to these objects.
 
 @example
 #+CAPTION: Bell curve
@@ -12376,94 +12992,86 @@ file.
 [[./img/a.png]]
 @end example
 
-It could be rendered as shown below in the exported document.
+When rendered, it may show as follows in the exported document:
 
 @example
 Figure 2: Bell curve
 @end example
 
 @vindex org-odt-category-map-alist
-You can modify the category component of the caption by customizing the
-option @code{org-odt-category-map-alist}.  For example, to tag all embedded
-images with the string @samp{Illustration} (instead of the default
-@samp{Figure}) use the following setting:
+To modify the category component of the caption, customize the option
+@code{org-odt-category-map-alist}.  For example, to tag embedded images with
+the string @samp{Illustration} instead of the default string @samp{Figure},
+use the following setting:
 
 @lisp
 (setq org-odt-category-map-alist
-      (("__Figure__" "Illustration" "value" "Figure" org-odt--enumerable-image-p)))
+      '(("__Figure__" "Illustration" "value" "Figure" org-odt--enumerable-image-p)))
 @end lisp
 
-With this, previous image will be captioned as below in the exported
-document.
+With the above modification, the previous example changes to:
 
 @example
 Illustration 2: Bell curve
 @end example
 
-@node Literal examples in ODT export, Advanced topics in ODT export, Labels and captions in ODT export, OpenDocument Text export
+@node Literal examples in ODT export
 @subsection Literal examples in ODT export
 
-Export of literal examples (@pxref{Literal examples}) with full fontification
-is supported.  Internally, the exporter relies on @file{htmlfontify.el} to
-generate all style definitions needed for a fancy listing.@footnote{Your
-@file{htmlfontify.el} library must at least be at Emacs 24.1 levels for
-fontification to be turned on.}  The auto-generated styles have @samp{OrgSrc}
-as prefix and inherit their color from the faces used by Emacs
-@code{font-lock} library for the source language.
+The ODT export back-end supports literal examples (@pxref{Literal examples})
+with full fontification.  Internally, the ODT export back-end relies on
+@file{htmlfontify.el} to generate the style definitions needed for fancy
+listings.  The auto-generated styles get @samp{OrgSrc} prefix and inherit
+colors from the faces used by Emacs @code{font-lock} library for that source
+language.
 
 @vindex org-odt-fontify-srcblocks
-If you prefer to use your own custom styles for fontification, you can do
-so by customizing the option
-@code{org-odt-create-custom-styles-for-srcblocks}.
+For custom fontification styles, customize the
+@code{org-odt-create-custom-styles-for-srcblocks} option.
 
 @vindex org-odt-create-custom-styles-for-srcblocks
-You can turn off fontification of literal examples by customizing the
-option @code{org-odt-fontify-srcblocks}.
+To turn off fontification of literal examples, customize the
+@code{org-odt-fontify-srcblocks} option.
 
-@node Advanced topics in ODT export,  , Literal examples in ODT export, OpenDocument Text export
+@node Advanced topics in ODT export
 @subsection Advanced topics in ODT export
 
-If you rely heavily on ODT export, you may want to exploit the full
-set of features that the exporter offers.  This section describes features
-that would be of interest to power users.
+The ODT export back-end has extensive features useful for power users and
+frequent uses of ODT formats.
 
 @menu
-* Configuring a document converter::  How to register a document converter
-* Working with OpenDocument style files::  Explore the internals
-* Creating one-off styles::     How to produce custom highlighting etc
-* Customizing tables in ODT export::  How to define and use Table templates
-* Validating OpenDocument XML::  How to debug corrupt OpenDocument files
+* Configuring a document converter::  Registering a document converter.
+* Working with OpenDocument style files::  Exploring internals.
+* Creating one-off styles::     Customizing styles, highlighting.
+* Customizing tables in ODT export::  Defining table templates.
+* Validating OpenDocument XML::  Debugging corrupted OpenDocument files.
 @end menu
 
-@node Configuring a document converter, Working with OpenDocument style files, Advanced topics in ODT export, Advanced topics in ODT export
-@subsubsection Configuring a document converter
+@node Configuring a document converter
+@subsubheading Configuring a document converter
 @cindex convert
 @cindex doc, docx, rtf
 @cindex converter
 
-The ODT exporter can work with popular converters with little or no
-extra configuration from your side. @xref{Extending ODT export}.
-If you are using a converter that is not supported by default or if you would
-like to tweak the default converter settings, proceed as below.
+The ODT export back-end works with popular converters with little or no extra
+configuration.  @xref{Extending ODT export}.  The following is for unsupported
+converters or tweaking existing defaults.
 
 @enumerate
 @item Register the converter
 
 @vindex org-odt-convert-processes
-Name your converter and add it to the list of known converters by
-customizing the option @code{org-odt-convert-processes}.  Also specify how
-the converter can be invoked via command-line to effect the conversion.
+Add the name of the converter to the @code{org-odt-convert-processes}
+variable.  Note that it also requires how the converter is invoked on the
+command line.  See the variable's docstring for details.
 
 @item Configure its capabilities
 
 @vindex org-odt-convert-capabilities
-@anchor{x-odt-converter-capabilities} Specify the set of formats the
-converter can handle by customizing the variable
-@code{org-odt-convert-capabilities}.  Use the default value for this
-variable as a guide for configuring your converter.  As suggested by the
-default setting, you can specify the full set of formats supported by the
-converter and not limit yourself to specifying formats that are related to
-just the OpenDocument Text format.
+@anchor{x-odt-converter-capabilities} Specify which formats the converter can
+handle by customizing the variable @code{org-odt-convert-capabilities}.  Use
+the entry for the default values in this variable for configuring the new
+converter.  Also see its docstring for details.
 
 @item Choose the converter
 
@@ -12472,18 +13080,17 @@ Select the newly added converter as the preferred one by customizing the
 option @code{org-odt-convert-process}.
 @end enumerate
 
-@node Working with OpenDocument style files, Creating one-off styles, Configuring a document converter, Advanced topics in ODT export
-@subsubsection Working with OpenDocument style files
+@node Working with OpenDocument style files
+@subsubheading Working with OpenDocument style files
 @cindex styles, custom
 @cindex template, custom
 
-This section explores the internals of the ODT exporter and the
-means by which it produces styled documents.  Read this section if you are
-interested in exploring the automatic and custom OpenDocument styles used by
-the exporter.
+This section explores the internals of the ODT exporter; the means by which
+it produces styled documents; the use of automatic and custom OpenDocument
+styles.
 
 @anchor{x-factory-styles}
-@subsubheading Factory styles
+@subsubheading a) Factory styles
 
 The ODT exporter relies on two files for generating its output.
 These files are bundled with the distribution under the directory pointed to
@@ -12524,25 +13131,25 @@ the exporter.
 
 @item
 It contains @samp{<text:sequence-decl>}@dots{}@samp{</text:sequence-decl>}
-elements that control how various entities---tables, images, equations,
-etc.---are numbered.
+elements that control numbering of tables, images, equations, and similar
+entities.
 @end enumerate
 @end itemize
 
 @anchor{x-overriding-factory-styles}
-@subsubheading Overriding factory styles
-The following two variables control the location from which the ODT
-exporter picks up the custom styles and content template files.  You can
-customize these variables to override the factory styles used by the
-exporter.
+@subsubheading b) Overriding factory styles
+The following two variables control the location from where the ODT exporter
+picks up the custom styles and content template files.  Customize these
+variables to override the factory styles used by the exporter.
 
 @itemize
 @anchor{x-org-odt-styles-file}
 @item
 @code{org-odt-styles-file}
 
-Use this variable to specify the @file{styles.xml} that will be used in the
-final output.  You can specify one of the following values:
+The ODT export back-end uses the file pointed to by this variable, such as
+@file{styles.xml}, for the final output.  It can take one of the following
+values:
 
 @enumerate
 @item A @file{styles.xml} file
@@ -12576,28 +13183,26 @@ Use this variable to specify the blank @file{content.xml} that will be used
 in the final output.
 @end itemize
 
-@node Creating one-off styles, Customizing tables in ODT export, Working with OpenDocument style files, Advanced topics in ODT export
-@subsubsection Creating one-off styles
+@node Creating one-off styles
+@subsubheading Creating one-off styles
 
-There are times when you would want one-off formatting in the exported
-document.  You can achieve this by embedding raw OpenDocument XML in the Org
-file.  The use of this feature is better illustrated with couple of examples.
+The ODT export back-end can read embedded raw OpenDocument XML from the Org
+file.  Such direct formatting are useful for one-off instances.
 
 @enumerate
 @item Embedding ODT tags as part of regular text
 
-You can inline OpenDocument syntax by enclosing it within
-@samp{@@@@odt:...@@@@} markup.  For example, to highlight a region of text do
-the following:
+Enclose OpenDocument syntax in @samp{@@@@odt:...@@@@} for inline markup.  For
+example, to highlight a region of text do the following:
 
 @example
-@@@@odt:<text:span text:style-name="Highlight">This is a highlighted
-text</text:span>@@@@.  But this is a regular text.
+@@@@odt:<text:span text:style-name="Highlight">This is highlighted
+text</text:span>@@@@.  But this is regular text.
 @end example
 
-@strong{Hint:} To see the above example in action, edit your
-@file{styles.xml} (@pxref{x-orgodtstyles-xml,,Factory styles}) and add a
-custom @samp{Highlight} style as shown below.
+@strong{Hint:} To see the above example in action, edit the @file{styles.xml}
+(@pxref{x-orgodtstyles-xml,,Factory styles}) and add a custom
+@samp{Highlight} style as shown below:
 
 @example
 <style:style style:name="Highlight" style:family="text">
@@ -12607,8 +13212,8 @@ custom @samp{Highlight} style as shown below.
 
 @item Embedding a one-line OpenDocument XML
 
-You can add a simple OpenDocument one-liner using the @code{#+ODT:}
-directive.  For example, to force a page break do the following:
+The ODT export back-end can read one-liner options with @code{#+ODT:}
+in the Org file.  For example, to force a page break:
 
 @example
 #+ODT: <text:p text:style-name="PageBreak"/>
@@ -12627,41 +13232,40 @@ custom @samp{PageBreak} style as shown below.
 
 @item Embedding a block of OpenDocument XML
 
-You can add a large block of OpenDocument XML using the
-@code{#+BEGIN_ODT}@dots{}@code{#+END_ODT} construct.
+The ODT export back-end can also read ODT export blocks for OpenDocument XML.
+Such blocks use the @code{#+BEGIN_EXPORT odt}@dots{}@code{#+END_EXPORT}
+constructs.
 
 For example, to create a one-off paragraph that uses bold text, do the
 following:
 
 @example
-#+BEGIN_ODT
+#+BEGIN_EXPORT odt
 <text:p text:style-name="Text_20_body_20_bold">
 This paragraph is specially formatted and uses bold text.
 </text:p>
-#+END_ODT
+#+END_EXPORT
 @end example
 
 @end enumerate
 
-@node Customizing tables in ODT export, Validating OpenDocument XML, Creating one-off styles, Advanced topics in ODT export
-@subsubsection Customizing tables in ODT export
+@node Customizing tables in ODT export
+@subsubheading Customizing tables in ODT export
 @cindex tables, in ODT export
 
 @cindex #+ATTR_ODT
-You can override the default formatting of the table by specifying a custom
-table style with the @code{#+ATTR_ODT} line.  For a discussion on default
-formatting of tables @pxref{Tables in ODT export}.
+Override the default table format by specifying a custom table style with the
+@code{#+ATTR_ODT} line.  For a discussion on default formatting of tables
+@pxref{Tables in ODT export}.
 
 This feature closely mimics the way table templates are defined in the
 OpenDocument-v1.2
 specification.@footnote{@url{http://docs.oasis-open.org/office/v1.2/OpenDocument-v1.2.html,
 OpenDocument-v1.2 Specification}}
 
-@subsubheading Custom table styles: an illustration
-
 @vindex org-odt-table-styles
-To have a quick preview of this feature, install the below setting and
-export the table that follows:
+For quick preview of this feature, install the settings below and export the
+table that follows:
 
 @lisp
 (setq org-odt-table-styles
@@ -12675,22 +13279,20 @@ export the table that follows:
 @end lisp
 
 @example
-#+ATTR_ODT: :style "TableWithHeaderRowAndColumn"
+#+ATTR_ODT: :style TableWithHeaderRowAndColumn
 | Name  | Phone | Age |
 | Peter |  1234 |  17 |
 | Anna  |  4321 |  25 |
 @end example
 
-In the above example, you used a template named @samp{Custom} and installed
-two table styles with the names @samp{TableWithHeaderRowAndColumn} and
-@samp{TableWithFirstRowandLastRow}.  (@strong{Important:} The OpenDocument
-styles needed for producing the above template have been pre-defined for
-you.  These styles are available under the section marked @samp{Custom
-Table Template} in @file{OrgOdtContentTemplate.xml}
-(@pxref{x-orgodtcontenttemplate-xml,,Factory styles}).  If you need
-additional templates you have to define these styles yourselves.
+The example above used @samp{Custom} template and installed two table styles
+@samp{TableWithHeaderRowAndColumn} and @samp{TableWithFirstRowandLastRow}.
+@strong{Important:} The OpenDocument styles needed for producing the above
+template were pre-defined.  They are available in the section marked
+@samp{Custom Table Template} in @file{OrgOdtContentTemplate.xml}
+(@pxref{x-orgodtcontenttemplate-xml,,Factory styles}.  For adding new
+templates, define new styles here.
 
-@subsubheading Custom table styles: the nitty-gritty
 To use this feature proceed as follows:
 
 @enumerate
@@ -12698,8 +13300,8 @@ To use this feature proceed as follows:
 Create a table template@footnote{See the @code{<table:table-template>}
 element of the OpenDocument-v1.2 specification}
 
-A table template is nothing but a set of @samp{table-cell} and
-@samp{paragraph} styles for each of the following table cell categories:
+A table template is set of @samp{table-cell} and @samp{paragraph} styles for
+each of the following table cell categories:
 
 @itemize @minus
 @item Body
@@ -12809,25 +13411,22 @@ the @code{ATTR_ODT} line as shown below.
 @end example
 @end enumerate
 
-@node Validating OpenDocument XML,  , Customizing tables in ODT export, Advanced topics in ODT export
-@subsubsection Validating OpenDocument XML
-
-Occasionally, you will discover that the document created by the
-ODT exporter cannot be opened by your favorite application.  One of
-the common reasons for this is that the @file{.odt} file is corrupt.  In such
-cases, you may want to validate the document against the OpenDocument RELAX
-NG Compact Syntax (RNC) schema.
+@node Validating OpenDocument XML
+@subsubheading Validating OpenDocument XML
 
-For de-compressing the @file{.odt} file@footnote{@file{.odt} files are
-nothing but @samp{zip} archives}: @inforef{File Archives,,emacs}.  For
-general help with validation (and schema-sensitive editing) of XML files:
+Sometimes ODT format files may not open due to @file{.odt} file corruption.
+To verify if the @file{.odt} file is corrupt, validate it against the
+OpenDocument RELAX NG Compact Syntax---RNC---schema.  But first the
+@file{.odt} files have to be decompressed using @samp{zip}.  Note that
+@file{.odt} files are @samp{zip} archives: @inforef{File Archives,,emacs}.
+The contents of @file{.odt} files are in @file{.xml}.  For general help with
+validation---and schema-sensitive editing---of XML files:
 @inforef{Introduction,,nxml-mode}.
 
 @vindex org-odt-schema-dir
-If you have ready access to OpenDocument @file{.rnc} files and the needed
-schema-locating rules in a single folder, you can customize the variable
-@code{org-odt-schema-dir} to point to that directory.  The ODT exporter
-will take care of updating the @code{rng-schema-locating-files} for you.
+Customize @code{org-odt-schema-dir} to point to a directory with OpenDocument
+@file{.rnc} files and the needed schema-locating rules.  The ODT export
+back-end takes care of updating the @code{rng-schema-locating-files}.
 
 @c end opendocument
 
@@ -12836,102 +13435,146 @@ will take care of updating the @code{rng-schema-locating-files} for you.
 @cindex Org export
 
 @code{org} export back-end creates a normalized version of the Org document
-in current buffer.  In particular, it evaluates Babel code (@pxref{Evaluating
-code blocks}) and removes other back-ends specific contents.
+in current buffer.  The exporter evaluates Babel code (@pxref{Evaluating code
+blocks}) and removes content specific to other back-ends.
 
 @subheading Org export commands
 
 @table @kbd
 @orgcmd{C-c C-e O o,org-org-export-to-org}
-Export as an Org document.  For an Org file, @file{myfile.org}, the resulting
-file will be @file{myfile.org.org}.  The file will be overwritten without
-warning.
+Export as an Org file with a @file{.org} extension.  For @file{myfile.org},
+Org exports to @file{myfile.org.org}, overwriting without warning.
+
 @orgcmd{C-c C-e O O,org-org-export-as-org}
-Export to a temporary buffer.  Do not create a file.
+Export to a temporary buffer.  Does not create a file.
 @item C-c C-e O v
 Export to an Org file, then open it.
 @end table
 
-@node Texinfo export, iCalendar export, Org export, Exporting
+@node Texinfo export
 @section Texinfo export
 @cindex Texinfo export
 
-@samp{texinfo} export back-end generates Texinfo code and can compile it into
-an Info file.
+The @samp{texinfo} export back-end generates documents with Texinfo code that
+can compile to Info format.
 
 @menu
-* Texinfo export commands::     How to invoke Texinfo export
-* Document preamble::           File header, title and copyright page
-* Headings and sectioning structure:: Building document structure
-* Indices::                     Creating indices
-* Quoting Texinfo code::        Incorporating literal Texinfo code
-* Texinfo specific attributes:: Controlling Texinfo output
-* An example::
+* Texinfo export commands::     Invoking commands.
+* Texinfo specific export settings::  Setting the environment.
+* Texinfo file header::         Generating the header.
+* Texinfo title and copyright page::  Creating preamble pages.
+* Info directory file::     Installing a manual in Info file hierarchy.
+* Headings and sectioning structure::  Building document structure.
+* Indices::                     Creating indices.
+* Quoting Texinfo code::        Incorporating literal Texinfo code.
+* Plain lists in Texinfo export::  List attributes.
+* Tables in Texinfo export::    Table attributes.
+* Images in Texinfo export::    Image attributes.
+* Special blocks in Texinfo export::  Special block attributes.
+* A Texinfo example::           Processing Org to Texinfo.
 @end menu
 
-@node Texinfo export commands, Document preamble, Texinfo export, Texinfo export
+@node Texinfo export commands
 @subsection Texinfo export commands
 
 @vindex org-texinfo-info-process
 @table @kbd
 @orgcmd{C-c C-e i t,org-texinfo-export-to-texinfo}
-Export as a Texinfo file.  For an Org file, @file{myfile.org}, the resulting
-file will be @file{myfile.texi}.  The file will be overwritten without
-warning.
+Export as a Texinfo file with @file{.texi} extension.  For @file{myfile.org},
+Org exports to @file{myfile.texi}, overwriting without warning.
 @orgcmd{C-c C-e i i,org-texinfo-export-to-info}
-Export to Texinfo and then process to an Info file@footnote{By setting
-@code{org-texinfo-info-process}, it is possible to generate other formats,
-including DocBook.}.
+Export to Texinfo format first and then process it to make an Info file.  To
+generate other formats, such as DocBook, customize the
+@code{org-texinfo-info-process} variable.
 @end table
 
-@node Document preamble, Headings and sectioning structure, Texinfo export commands, Texinfo export
-@subsection Document preamble
+@node Texinfo specific export settings
+@subsection Texinfo specific export settings
+The Texinfo export back-end has several additional keywords for customizing
+Texinfo output.  Setting these keywords works similar to the general options
+(@pxref{Export settings}).
+
+@table @samp
 
-When processing a document, @samp{texinfo} back-end generates a minimal file
-header along with a title page, a copyright page, and a menu.  You control
-the latter through the structure of the document (@pxref{Headings and
-sectioning structure}).  Various keywords allow you to tweak the other parts.
-It is also possible to give directions to install the document in the
-@samp{Top} node.
+@item SUBTITLE
+@cindex #+SUBTITLE (Texinfo)
+The document subtitle.
 
-@subsubheading File header
+@item SUBAUTHOR
+@cindex #+SUBAUTHOR
+The document subauthor.
 
+@item TEXINFO_FILENAME
 @cindex #+TEXINFO_FILENAME
-Upon creating the header of a Texinfo file, the back-end guesses a name for
-the Info file to be compiled.  This may not be a sensible choice, e.g., if
-you want to produce the final document in a different directory.  Specify an
-alternate path with @code{#+TEXINFO_FILENAME} keyword to override the default
-destination.
+The Texinfo filename.
+
+@item TEXINFO_CLASS
+@cindex #+TEXINFO_CLASS
+@vindex org-texinfo-default-class
+The default document class (@code{org-texinfo-default-class}), which must be
+a member of @code{org-texinfo-classes}.
+
+@item TEXINFO_HEADER
+@cindex #+TEXINFO_HEADER
+Arbitrary lines inserted at the end of the header.
+
+@item TEXINFO_POST_HEADER
+@cindex #+TEXINFO_POST_HEADER
+Arbitrary lines inserted after the end of the header.
+
+@item TEXINFO_DIR_CATEGORY
+@cindex #+TEXINFO_DIR_CATEGORY
+The directory category of the document.
+
+@item TEXINFO_DIR_TITLE
+@cindex #+TEXINFO_DIR_TITLE
+The directory title of the document.
+
+@item TEXINFO_DIR_DESC
+@cindex #+TEXINFO_DIR_DESC
+The directory description of the document.
+
+@item TEXINFO_PRINTED_TITLE
+@cindex #+TEXINFO_PRINTED_TITLE
+The printed title of the document.
+@end table
+
+@node Texinfo file header
+@subsection Texinfo file header
+
+@cindex #+TEXINFO_FILENAME
+After creating the header for a Texinfo file, the Texinfo back-end
+automatically generates a name and destination path for the Info file.  To
+override this default with a more sensible path and name, specify the
+@code{#+TEXINFO_FILENAME} keyword.
 
 @vindex org-texinfo-coding-system
 @vindex org-texinfo-classes
 @cindex #+TEXINFO_HEADER
 @cindex #+TEXINFO_CLASS
-Along with the output file name, the header contains information about the
-language (@pxref{Export settings}) and current encoding used@footnote{See
-@code{org-texinfo-coding-system} for more information.}.  Insert
-a @code{#+TEXINFO_HEADER} keyword for each additional command needed, e.g.,
+Along with the output's file name, the Texinfo header also contains language
+details (@pxref{Export settings}) and encoding system as set in the
+@code{org-texinfo-coding-system} variable.  Insert @code{#+TEXINFO_HEADER}
+keywords for each additional command in the header, for example:
 @@code@{@@synindex@}.
 
-If you happen to regularly install the same set of commands, it may be easier
-to define your own class in @code{org-texinfo-classes}, which see.  Set
-@code{#+TEXINFO_CLASS} keyword accordingly in your document to activate it.
+Instead of repeatedly installing the same set of commands, define a class in
+@code{org-texinfo-classes} once, and then activate it in the document by
+setting the @code{#+TEXINFO_CLASS} keyword to that class.
 
-@subsubheading Title and copyright page
+@node Texinfo title and copyright page
+@subsection Texinfo title and copyright page
 
 @cindex #+TEXINFO_PRINTED_TITLE
-@cindex #+SUBTITLE
-The default template includes a title page for hard copy output.  The title
-and author displayed on this page are extracted from, respectively,
-@code{#+TITLE} and @code{#+AUTHOR} keywords (@pxref{Export settings}).  It is
-also possible to print a different, more specific, title with
-@code{#+TEXINFO_PRINTED_TITLE} keyword, and add subtitles with
-@code{#+SUBTITLE} keyword.  Both expect raw Texinfo code in their value.
+The default template for hard copy output has a title page with
+@code{#+TITLE} and @code{#+AUTHOR} (@pxref{Export settings}).  To replace the
+regular @code{#+TITLE} with something different for the printed version, use
+the @code{#+TEXINFO_PRINTED_TITLE} and @code{#+SUBTITLE} keywords.  Both
+expect raw Texinfo code for setting their values.
 
 @cindex #+SUBAUTHOR
-Likewise, information brought by @code{#+AUTHOR} may not be enough.  You can
-include other authors with several @code{#+SUBAUTHOR} keywords.  Values are
-also expected to be written in Texinfo code.
+If one @code{#+AUTHOR} is not sufficient, add multiple @code{#+SUBAUTHOR}
+keywords.  They have to be set in raw Texinfo code.
 
 @example
 #+AUTHOR: Jane Smith
@@ -12940,10 +13583,10 @@ also expected to be written in Texinfo code.
 @end example
 
 @cindex property, COPYING
-Copying material is defined in a dedicated headline with a non-nil
-@code{:COPYING:} property.  The contents are inserted within
-a @code{@@copying} command at the beginning of the document whereas the
-heading itself does not appear in the structure of the document.
+Copying material is defined in a dedicated headline with a non-@code{nil}
+@code{:COPYING:} property.  The back-end inserts the contents within a
+@code{@@copying} command at the beginning of the document.  The heading
+itself does not appear in the structure of the document.
 
 Copyright information is printed on the back of the title page.
 
@@ -12955,20 +13598,28 @@ Copyright information is printed on the back of the title page.
 
   This is a short example of a complete Texinfo file, version 1.0.
 
-  Copyright \copy 2017 Free Software Foundation, Inc.
+  Copyright \copy 2016 Free Software Foundation, Inc.
 @end example
 
-@subsubheading The Top node
+@node Info directory file
+@subsection Info directory file
+@cindex @samp{dir} file, in Texinfo export
+@cindex Texinfo export, @samp{dir} file
+@cindex Info directory file, in Texinfo export
+@cindex Texinfo export, Info directory file
+@cindex @code{install-info} parameters, in Texinfo export
+@cindex Texinfo export, @code{install-info} parameters
 
 @cindex #+TEXINFO_DIR_CATEGORY
 @cindex #+TEXINFO_DIR_TITLE
 @cindex #+TEXINFO_DIR_DESC
-You may ultimately want to install your new Info file to your system.  You
-can write an appropriate entry in the top level directory specifying its
-category and title with, respectively, @code{#+TEXINFO_DIR_CATEGORY} and
-@code{#+TEXINFO_DIR_TITLE}.  Optionally, you can add a short description
-using @code{#+TEXINFO_DIR_DESC}.  The following example would write an entry
-similar to Org's in the @samp{Top} node.
+The end result of the Texinfo export process is the creation of an Info file.
+This Info file's metadata has variables for category, title, and description:
+@code{#+TEXINFO_DIR_CATEGORY}, @code{#+TEXINFO_DIR_TITLE}, and
+@code{#+TEXINFO_DIR_DESC} that establish where in the Info hierarchy the file
+fits.
+
+Here is an example that writes to the Info directory file:
 
 @example
 #+TEXINFO_DIR_CATEGORY: Emacs
@@ -12976,34 +13627,38 @@ similar to Org's in the @samp{Top} node.
 #+TEXINFO_DIR_DESC: Outline-based notes management and organizer
 @end example
 
-@node Headings and sectioning structure, Indices, Document preamble, Texinfo export
+@node Headings and sectioning structure
 @subsection Headings and sectioning structure
 
 @vindex org-texinfo-classes
 @vindex org-texinfo-default-class
 @cindex #+TEXINFO_CLASS
-@samp{texinfo} uses a pre-defined scheme, or class, to convert headlines into
-Texinfo structuring commands.  For example, a top level headline appears as
-@code{@@chapter} if it should be numbered or as @code{@@unnumbered}
-otherwise.  If you need to use a different set of commands, e.g., to start
-with @code{@@part} instead of @code{@@chapter}, install a new class in
-@code{org-texinfo-classes}, then activate it with @code{#+TEXINFO_CLASS}
-keyword.  Export process defaults to @code{org-texinfo-default-class} when
-there is no such keyword in the document.
-
-If a headline's level has no associated structuring command, or is below
-a certain threshold @pxref{Export settings}, that headline becomes a list in
-Texinfo output.
+The Texinfo export back-end uses a pre-defined scheme to convert Org
+headlines to an equivalent Texinfo structuring commands.  A scheme like this
+maps top-level headlines to numbered chapters tagged as @code{@@chapter} and
+lower-level headlines to unnumbered chapters tagged as @code{@@unnumbered}.
+To override such mappings to introduce @code{@@part} or other Texinfo
+structuring commands, define a new class in @code{org-texinfo-classes}.
+Activate the new class with the @code{#+TEXINFO_CLASS} keyword.  When no new
+class is defined and activated, the Texinfo export back-end defaults to the
+@code{org-texinfo-default-class}.
+
+If an Org headline's level has no associated Texinfo structuring command, or
+is below a certain threshold (@pxref{Export settings}), then the Texinfo
+export back-end makes it into a list item.
 
 @cindex property, APPENDIX
-As an exception, a headline with a non-nil @code{:APPENDIX:} property becomes
-an appendix, independently on its level and the class used.
+The Texinfo export back-end makes any headline with a non-@code{nil}
+@code{:APPENDIX:} property into an appendix.  This happens independent of the
+Org headline level or the @code{#+TEXINFO_CLASS}.
 
 @cindex property, DESCRIPTION
-Each regular sectioning structure creates a menu entry, named after the
-heading.  You can provide a different, e.g., shorter, title in
-@code{:ALT_TITLE:} property (@pxref{Table of contents}).  Optionally, you can
-specify a description for the item in @code{:DESCRIPTION:} property.  E.g.,
+The Texinfo export back-end creates a menu entry after the Org headline for
+each regular sectioning structure.  To override this with a shorter menu
+entry, use the @code{:ALT_TITLE:} property (@pxref{Table of contents}).
+Texinfo menu entries also have an option for a longer @code{:DESCRIPTION:}
+property.  Here's an example that uses both to override the default menu
+entry:
 
 @example
 * Controlling Screen Display
@@ -13013,30 +13668,51 @@ specify a description for the item in @code{:DESCRIPTION:} property.  E.g.,
   :END:
 @end example
 
-@node Indices, Quoting Texinfo code, Headings and sectioning structure, Texinfo export
+@cindex The Top node, in Texinfo export
+@cindex Texinfo export, Top node
+The text before the first headline belongs to the @samp{Top} node, i.e., the
+node in which a reader enters an Info manual.  As such, it is expected not to
+appear in printed output generated from the @file{.texi} file.  @inforef{The
+Top Node,,texinfo}, for more information.
+
+@node Indices
 @subsection Indices
 
 @cindex #+CINDEX
+@cindex concept index, in Texinfo export
+@cindex Texinfo export, index, concept
 @cindex #+FINDEX
+@cindex function index, in Texinfo export
+@cindex Texinfo export, index, function
 @cindex #+KINDEX
+@cindex keystroke index, in Texinfo export
+@cindex Texinfo export, keystroke index
 @cindex #+PINDEX
+@cindex program index, in Texinfo export
+@cindex Texinfo export, program index
 @cindex #+TINDEX
+@cindex data type index, in Texinfo export
+@cindex Texinfo export, data type index
 @cindex #+VINDEX
-Index entries are created using dedicated keywords.  @samp{texinfo} back-end
-provides one for each predefined type: @code{#+CINDEX}, @code{#+FINDEX},
-@code{#+KINDEX}, @code{#+PINDEX}, @code{#+TINDEX} and @code{#+VINDEX}.  For
-custom indices, you can write raw Texinfo code (@pxref{Quoting Texinfo
-code}).
+@cindex variable index, in Texinfo export
+@cindex Texinfo export, variable index
+The Texinfo export back-end recognizes these indexing keywords if used in the
+Org file: @code{#+CINDEX}, @code{#+FINDEX}, @code{#+KINDEX}, @code{#+PINDEX},
+@code{#+TINDEX}, and @code{#+VINDEX}.  Write their value as verbatim Texinfo
+code; in particular, @samp{@{}, @samp{@}} and @samp{@@} characters need to be
+escaped with @samp{@@} if they not belong to a Texinfo command.
 
 @example
 #+CINDEX: Defining indexing entries
 @end example
 
 @cindex property, INDEX
-To generate an index, you need to set the @code{:INDEX:} property of
-a headline to an appropriate abbreviation (e.g., @samp{cp} or @samp{vr}).
-The headline is then exported as an unnumbered chapter or section command and
-the index is inserted after its contents.
+For the back-end to generate an index entry for a headline, set the
+@code{:INDEX:} property to @samp{cp} or @samp{vr}.  These abbreviations come
+from Texinfo that stand for concept index and variable index.  The Texinfo
+manual has abbreviations for all other kinds of indexes.  The back-end
+exports the headline as an unnumbered chapter or section command, and then
+inserts the index after its contents.
 
 @example
 * Concept Index
@@ -13045,78 +13721,115 @@ the index is inserted after its contents.
   :END:
 @end example
 
-@node Quoting Texinfo code, Texinfo specific attributes, Indices, Texinfo export
+@node Quoting Texinfo code
 @subsection Quoting Texinfo code
 
-It is possible to insert raw Texinfo code using any of the following
-constructs
+Use any of the following three methods to insert or escape raw Texinfo code:
 
 @cindex #+TEXINFO
-@cindex #+BEGIN_TEXINFO
+@cindex #+BEGIN_EXPORT texinfo
 @example
 Richard @@@@texinfo:@@sc@{@@@@Stallman@@@@texinfo:@}@@@@ commence' GNU.
 
 #+TEXINFO: @@need800
 This paragraph is preceded by...
 
-#+BEGIN_TEXINFO
+#+BEGIN_EXPORT texinfo
 @@auindex Johnson, Mark
 @@auindex Lakoff, George
-#+END_TEXINFO
+#+END_EXPORT
 @end example
 
-@node Texinfo specific attributes, An example, Quoting Texinfo code, Texinfo export
-@subsection Texinfo specific attributes
-
-@cindex #+ATTR_TEXINFO
-@samp{texinfo} back-end understands several attributes in plain lists and
-tables.  They must be specified using an @code{#+ATTR_TEXINFO} keyword,
-written just above the list or table.
-
-@subsubheading Plain lists
-
-In Texinfo output, description lists appear as two-column tables, using the
-default command @code{@@table}.  You can use @code{@@ftable} or
-@code{@@vtable}@footnote{For more information, @inforef{Two-column
-Tables,,texinfo}.} instead with @code{:table-type} attribute.
+@node Plain lists in Texinfo export
+@subsection Plain lists in Texinfo export
+@cindex #+ATTR_TEXINFO, in plain lists
+The Texinfo export back-end by default converts description lists in the Org
+file using the default command @code{@@table}, which results in a table with
+two columns.  To change this behavior, specify @code{:table-type} with
+@code{@@ftable} or @code{@@vtable} attributes.  For more information,
+@inforef{Two-column Tables,,texinfo}.
 
 @vindex org-texinfo-def-table-markup
-In any case, these constructs require a highlighting command for entries in
-the list.  You can provide one with @code{:indic} attribute.  If you do not,
-it defaults to the value stored in @code{org-texinfo-def-table-markup}, which
-see.
+The Texinfo export back-end by default also applies a text highlight based on
+the defaults stored in @code{org-texinfo-def-table-markup}.  To override the
+default highlight command, specify another one with the @code{:indic}
+attribute as shown in this example:
 
 @example
 #+ATTR_TEXINFO: :indic @@asis
 - foo :: This is the text for /foo/, with no highlighting.
 @end example
 
-@subsubheading Tables
+@node Tables in Texinfo export
+@subsection Tables in Texinfo export
+@cindex #+ATTR_TEXINFO, in tables
 
-When exporting a table, column widths are deduced from the longest cell in
-each column.  You can also define them explicitly as fractions of the line
-length, using @code{:columns} attribute.
+When exporting tables, the Texinfo export back-end uses the widest cell width
+in each column.  To override this and instead specify as fractions of line
+length, use the @code{:columns} attribute.  See example below.
 
 @example
 #+ATTR_TEXINFO: :columns .5 .5
 | a cell | another cell |
 @end example
 
-@node An example,  , Texinfo specific attributes, Texinfo export
-@subsection An example
+@node Images in Texinfo export
+@subsection Images in Texinfo export
+@cindex #+ATTR_TEXINFO, in images
 
-Here is a thorough example, taken from @inforef{GNU Sample Texts,,texinfo}.
+Insert a file link to the image in the Org file, and the Texinfo export
+back-end inserts the image.  These links must have the usual supported image
+extensions and no descriptions.  To scale the image, use @code{:width} and
+@code{:height} attributes.  For alternate text, use @code{:alt} and specify
+the text using Texinfo code, as shown in the example:
 
-@smallexample
-#+MACRO: version 2.0
-#+MACRO: updated last updated 4 March 2014
+@example
+#+ATTR_TEXINFO: :width 1in :alt Alternate @@i@{text@}
+[[ridt.pdf]]
+@end example
 
-#+OPTIONS: ':t toc:t author:t email:t
+@node Special blocks in Texinfo export
+@subsection Special blocks
+@cindex #+ATTR_TEXINFO, in special blocks
+
+The Texinfo export back-end converts special blocks to commands with the same
+name.  It also adds any @code{:options} attributes to the end of the command,
+as shown in this example:
+
+@example
+#+ATTR_TEXINFO: :options org-org-export-to-org ...
+#+begin_defun
+A somewhat obsessive function.
+#+end_defun
+@end example
+
+@noindent
+becomes
+
+@example
+@@defun org-org-export-to-org ...
+A somewhat obsessive function.
+@@end defun
+@end example
+
+@node A Texinfo example
+@subsection A Texinfo example
+
+Here is a more detailed example Org file.  @inforef{GNU Sample
+Texts,,texinfo} for an equivalent example using Texinfo code.
+
+@example
 #+TITLE: GNU Sample @{@{@{version@}@}@}
+#+SUBTITLE: for version @{@{@{version@}@}@}, @{@{@{updated@}@}@}
 #+AUTHOR: A.U. Thor
 #+EMAIL: bug-sample@@gnu.org
+
+#+OPTIONS: ':t toc:t author:t email:t
 #+LANGUAGE: en
 
+#+MACRO: version 2.0
+#+MACRO: updated last updated 4 March 2014
+
 #+TEXINFO_FILENAME: sample.info
 #+TEXINFO_HEADER: @@syncodeindex pg cp
 
@@ -13125,7 +13838,9 @@ Here is a thorough example, taken from @inforef{GNU Sample Texts,,texinfo}.
 #+TEXINFO_DIR_DESC: Invoking sample
 
 #+TEXINFO_PRINTED_TITLE: GNU Sample
-#+SUBTITLE: for version 2.0, last updated 4 March 2014
+
+This manual is for GNU Sample (version @{@{@{version@}@}@},
+@{@{@{updated@}@}@}).
 
 * Copying
   :PROPERTIES:
@@ -13135,8 +13850,7 @@ Here is a thorough example, taken from @inforef{GNU Sample Texts,,texinfo}.
   This manual is for GNU Sample (version @{@{@{version@}@}@},
   @{@{@{updated@}@}@}), which is an example in the Texinfo documentation.
 
-  Copyright @@@@texinfo:@@copyright@{@}@@@@ 2013 Free Software Foundation,
-  Inc.
+  Copyright \copy 2016 Free Software Foundation, Inc.
 
   #+BEGIN_QUOTE
   Permission is granted to copy, distribute and/or modify this
@@ -13167,9 +13881,9 @@ Here is a thorough example, taken from @inforef{GNU Sample Texts,,texinfo}.
   :PROPERTIES:
   :INDEX:    cp
   :END:
-@end smallexample
+@end example
 
-@node iCalendar export, Other built-in back-ends, Texinfo export, Exporting
+@node iCalendar export
 @section iCalendar export
 @cindex iCalendar export
 
@@ -13178,49 +13892,51 @@ Here is a thorough example, taken from @inforef{GNU Sample Texts,,texinfo}.
 @vindex org-icalendar-use-scheduled
 @vindex org-icalendar-categories
 @vindex org-icalendar-alarm-time
-Some people use Org mode for keeping track of projects, but still prefer a
-standard calendar application for anniversaries and appointments.  In this
-case it can be useful to show deadlines and other time-stamped items in Org
-files in the calendar application.  Org mode can export calendar information
-in the standard iCalendar format.  If you also want to have TODO entries
-included in the export, configure the variable
-@code{org-icalendar-include-todo}.  Plain timestamps are exported as VEVENT,
-and TODO items as VTODO@.  It will also create events from deadlines that are
-in non-TODO items.  Deadlines and scheduling dates in TODO items will be used
-to set the start and due dates for the TODO entry@footnote{See the variables
-@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}.}.  See the variable
-@code{org-icalendar-alarm-time} for a way to assign alarms to entries with a
-time.
+A large part of Org mode's inter-operability success is its ability to easily
+export to or import from external applications.  The iCalendar export
+back-end takes calendar data from Org files and exports to the standard
+iCalendar format.
+
+The iCalendar export back-end can also incorporate TODO entries based on the
+configuration of the @code{org-icalendar-include-todo} variable.  The
+back-end exports plain timestamps as VEVENT, TODO items as VTODO, and also
+create events from deadlines that are in non-TODO items.  The back-end uses
+the deadlines and scheduling dates in Org TODO items for setting the start
+and due dates for the iCalendar TODO entry.  Consult the
+@code{org-icalendar-use-deadline} and @code{org-icalendar-use-scheduled}
+variables for more details.
+
+For tags on the headline, the iCalendar export back-end makes them into
+iCalendar categories.  To tweak the inheritance of tags and TODO states,
+configure the variable @code{org-icalendar-categories}.  To assign clock
+alarms based on time, configure the @code{org-icalendar-alarm-time} variable.
 
 @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
-@code{:ID:} property of the entry and re-used next time you report this
-entry.  Since a single entry can give rise to multiple iCalendar entries (as
-a timestamp, a deadline, a scheduled item, and as a TODO item), Org adds
-prefixes to the UID, depending on what triggered the inclusion of the entry.
-In this way the UID remains unique, but a synchronization program can still
-figure out from which entry all the different instances originate.
+The iCalendar format standard requires globally unique identifier---UID---for
+each entry.  The iCalendar export back-end creates UIDs during export.  To
+save a copy of the UID in the Org file set the variable
+@code{org-icalendar-store-UID}.  The back-end looks for the @code{:ID:}
+property of the entry for re-using the same UID for subsequent exports.
+
+Since a single Org entry can result in multiple iCalendar entries---as
+timestamp, deadline, scheduled item, or TODO item---Org adds prefixes to the
+UID, depending on which part of the Org entry triggered the creation of the
+iCalendar entry.  Prefixing ensures UIDs remains unique, yet enable
+synchronization programs trace the connections.
 
 @table @kbd
 @orgcmd{C-c C-e c f,org-icalendar-export-to-ics}
-Create iCalendar entries for the current buffer and store them in the same
-directory, using a file extension @file{.ics}.
+Create iCalendar entries from the current Org buffer and store them in the
+same directory, using a file extension @file{.ics}.
 @orgcmd{C-c C-e c a, org-icalendar-export-agenda-files}
 @vindex org-agenda-files
-Like @kbd{C-c C-e c f}, but do this for all files in
-@code{org-agenda-files}.  For each of these files, a separate iCalendar
-file will be written.
+Create iCalendar entries from Org files in @code{org-agenda-files} and store
+in a separate iCalendar file for each Org file.
 @orgcmd{C-c C-e c c,org-icalendar-combine-agenda-files}
 @vindex org-icalendar-combined-agenda-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-icalendar-combined-agenda-file}.
+Create a combined iCalendar file from Org files in @code{org-agenda-files}
+and write it to @code{org-icalendar-combined-agenda-file} file name.
 @end table
 
 @vindex org-use-property-inheritance
@@ -13228,72 +13944,54 @@ Create a single large iCalendar file from all files in
 @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
-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, depends on the application
-you are using.  The FAQ covers this issue.
-
-@node Other built-in back-ends, Export in foreign buffers, iCalendar export, Exporting
+The iCalendar export back-end includes SUMMARY, DESCRIPTION and LOCATION
+properties from the Org entries when exporting.  To force the back-end to
+inherit the LOCATION property, configure the
+@code{org-use-property-inheritance} variable.
+
+When Org entries do not have SUMMARY, DESCRIPTION and LOCATION properties,
+the iCalendar export back-end derives the summary from the headline, and
+derives the description from the body of the Org item.  The
+@code{org-icalendar-include-body} variable limits the maximum number of
+characters of the content are turned into its description.
+
+Exporting to iCalendar format depends in large part on the capabilities of
+the destination application.  Some are more lenient than others.  Consult the
+Org mode FAQ for advice on specific applications.
+
+@node Other built-in back-ends
 @section Other built-in back-ends
 @cindex export back-ends, built-in
 @vindex org-export-backends
 
-On top of the aforementioned back-ends, Org comes with other built-in ones:
+Other export back-ends included with Org are:
 
 @itemize
 @item @file{ox-man.el}: export to a man page.
 @end itemize
 
-To activate these export back-end, customize @code{org-export-backends} or
-load them directly with e.g., @code{(require 'ox-man)}.  This will add new
-keys in the export dispatcher (@pxref{The Export Dispatcher}).
-
-See the comment section of these files for more information on how to use
-them.
-
-@node Export in foreign buffers, Advanced configuration, Other built-in back-ends, Exporting
-@section Export in foreign buffers
-
-Most built-in back-ends come with a command to convert the selected region
-into a selected format and replace this region by the exported output.  Here
-is a list of such conversion commands:
-
-@table @code
-@item org-html-convert-region-to-html
-Convert the selected region into HTML.
-@item org-latex-convert-region-to-latex
-Convert the selected region into @LaTeX{}.
-@item org-texinfo-convert-region-to-texinfo
-Convert the selected region into @code{Texinfo}.
-@item org-md-convert-region-to-md
-Convert the selected region into @code{MarkDown}.
-@end table
+To activate such back-ends, either customize @code{org-export-backends} or
+load directly with @code{(require 'ox-man)}.  On successful load, the
+back-end adds new keys in the export dispatcher (@pxref{The export
+dispatcher}).
 
-This is particularly useful for converting tables and lists in foreign
-buffers.  E.g., in an HTML buffer, you can turn on @code{orgstruct-mode}, then
-use Org commands for editing a list, and finally select and convert the list
-with @code{M-x org-html-convert-region-to-html RET}.
+Follow the comment section of such files, for example, @file{ox-man.el}, for
+usage and configuration details.
 
-@node Advanced configuration,  , Export in foreign buffers, Exporting
+@node Advanced configuration
 @section Advanced configuration
 
 @subheading Hooks
 
 @vindex org-export-before-processing-hook
 @vindex org-export-before-parsing-hook
-Two hooks are run during the first steps of the export process.  The first
-one, @code{org-export-before-processing-hook} is called before expanding
-macros, Babel code and include keywords in the buffer.  The second one,
-@code{org-export-before-parsing-hook}, as its name suggests, happens just
-before parsing the buffer.  Their main use is for heavy duties, that is
-duties involving structural modifications of the document.  For example, one
-may want to remove every headline in the buffer during export.  The following
-code can achieve this:
+The export process executes two hooks before the actual exporting begins.
+The first hook, @code{org-export-before-processing-hook}, runs before any
+expansions of macros, Babel code, and include keywords in the buffer.  The
+second hook, @code{org-export-before-parsing-hook}, runs before the buffer is
+parsed.  Both hooks are specified as functions, see example below.  Their main
+use is for heavy duty structural modifications of the Org content.  For
+example, removing every headline in the buffer during export:
 
 @lisp
 @group
@@ -13307,86 +14005,83 @@ BACKEND is the export back-end being used, as a symbol."
 @end group
 @end lisp
 
-Note that functions used in these hooks require a mandatory argument,
-a symbol representing the back-end used.
+Note that the hook function must have a mandatory argument that is a symbol
+for the back-end.
 
 @subheading Filters
 
 @cindex Filters, exporting
-Filters are lists of functions applied on a specific part of the output from
-a given back-end.  More explicitly, each time a back-end transforms an Org
-object or element into another language, all functions within a given filter
-type are called in turn on the string produced.  The string returned by the
-last function will be the one used in the final output.
-
-There are filters sets for each type of element or object, for plain text,
-for the parse tree, for the export options and for the final output.  They
-are all named after the same scheme: @code{org-export-filter-TYPE-functions},
-where @code{TYPE} is the type targeted by the filter.  Valid types are:
+The Org export process relies on filters to process specific parts of
+conversion process.  Filters are just lists of functions to be applied to
+certain parts for a given back-end.  The output from the first function in
+the filter is passed on to the next function in the filter.  The final output
+is the output from the final function in the filter.
+
+The Org export process has many filter sets applicable to different types of
+objects, plain text, parse trees, export options, and final output formats.
+The filters are named after the element type or object type:
+@code{org-export-filter-TYPE-functions}, where @code{TYPE} is the type
+targeted by the filter.  Valid types are:
 
 @multitable @columnfractions .33 .33 .33
-@item bold
+@item body
+@tab bold
 @tab babel-call
-@tab center-block
-@item clock
+@item center-block
+@tab clock
 @tab code
-@tab comment
-@item comment-block
-@tab diary-sexp
+@item diary-sexp
 @tab drawer
-@item dynamic-block
-@tab entity
+@tab dynamic-block
+@item entity
 @tab example-block
-@item export-block
-@tab export-snippet
+@tab export-block
+@item export-snippet
 @tab final-output
-@item fixed-width
-@tab footnote-definition
+@tab fixed-width
+@item footnote-definition
 @tab footnote-reference
-@item headline
-@tab horizontal-rule
+@tab headline
+@item horizontal-rule
 @tab inline-babel-call
-@item inline-src-block
-@tab inlinetask
+@tab inline-src-block
+@item inlinetask
 @tab italic
-@item item
-@tab keyword
+@tab item
+@item keyword
 @tab latex-environment
-@item latex-fragment
-@tab line-break
+@tab latex-fragment
+@item line-break
 @tab link
-@item node-property
-@tab options
+@tab node-property
+@item options
 @tab paragraph
-@item parse-tree
-@tab plain-list
+@tab parse-tree
+@item plain-list
 @tab plain-text
-@item planning
-@tab property-drawer
+@tab planning
+@item property-drawer
 @tab quote-block
-@item quote-section
 @tab radio-target
-@tab section
-@item special-block
+@item section
+@tab special-block
 @tab src-block
-@tab statistics-cookie
-@item strike-through
+@item statistics-cookie
+@tab strike-through
 @tab subscript
-@tab superscript
-@item table
+@item superscript
+@tab table
 @tab table-cell
-@tab table-row
-@item target
+@item table-row
+@tab target
 @tab timestamp
-@tab underline
-@item verbatim
+@item underline
+@tab verbatim
 @tab verse-block
-@tab
 @end multitable
 
-For example, the following snippet allows me to use non-breaking spaces in
-the Org buffer and get them translated into @LaTeX{} without using the
-@code{\nbsp} macro (where @code{_} stands for the non-breaking space):
+Here is an example filter that replaces non-breaking spaces @code{~} in the
+Org buffer with @code{_} for the @LaTeX{} back-end.
 
 @lisp
 @group
@@ -13400,33 +14095,49 @@ the Org buffer and get them translated into @LaTeX{} without using the
 @end group
 @end lisp
 
-Three arguments must be provided to a filter: the code being changed, the
-back-end used, and some information about the export process.  You can safely
-ignore the third argument for most purposes.  Note the use of
-@code{org-export-derived-backend-p}, which ensures that the filter will only
-be applied when using @code{latex} back-end or any other back-end derived
-from it (e.g., @code{beamer}).
+A filter requires three arguments: the code to be transformed, the name of
+the back-end, and some optional information about the export process.  The
+third argument can be safely ignored.  Note the use of
+@code{org-export-derived-backend-p} predicate that tests for @code{latex}
+back-end or any other back-end, such as @code{beamer}, derived from
+@code{latex}.
 
-@subheading Extending an existing back-end
+@subheading Defining filters for individual files
+
+The Org export can filter not just for back-ends, but also for specific files
+through the @code{#+BIND} keyword.  Here is an example with two filters; one
+removes brackets from time stamps, and the other removes strike-through text.
+The filter functions are defined in a @samp{src} code block in the same Org
+file, which is a handy location for debugging.
+
+@example
+#+BIND: org-export-filter-timestamp-functions (tmp-f-timestamp)
+#+BIND: org-export-filter-strike-through-functions (tmp-f-strike-through)
+#+begin_src emacs-lisp :exports results :results none
+  (defun tmp-f-timestamp (s backend info)
+    (replace-regexp-in-string "&[lg]t;\\|[][]" "" s))
+  (defun tmp-f-strike-through (s backend info) "")
+#+end_src
+@end example
 
-This is obviously the most powerful customization, since the changes happen
-at the parser level.  Indeed, some export back-ends are built as extensions
-of other ones (e.g., Markdown back-end an extension of HTML back-end).
+@subheading Extending an existing back-end
 
-Extending a back-end means that if an element type is not transcoded by the
-new back-end, it will be handled by the original one.  Hence you can extend
-specific parts of a back-end without too much work.
+Some parts of the conversion process can be extended for certain elements so
+as to introduce a new or revised translation.  That is how the HTML export
+back-end was extended to handle Markdown format.  The extensions work
+seamlessly so any aspect of filtering not done by the extended back-end is
+handled by the original back-end.  Of all the export customization in Org,
+extending is very powerful as it operates at the parser level.
 
-As an example, imagine we want the @code{ascii} back-end to display the
-language used in a source block, when it is available, but only when some
-attribute is non-@code{nil}, like the following:
+For this example, make the @code{ascii} back-end display the language used in
+a source code block.  Also make it display only when some attribute is
+non-@code{nil}, like the following:
 
 @example
 #+ATTR_ASCII: :language t
 @end example
 
-Because that back-end is lacking in that area, we are going to create a new
-back-end, @code{my-ascii} that will do the job.
+Then extend @code{ascii} back-end with a custom @code{my-ascii} back-end.
 
 @lisp
 @group
@@ -13450,20 +14161,47 @@ channel."
 @end lisp
 
 The @code{my-ascii-src-block} function looks at the attribute above the
-element.  If it isn't true, it gives hand to the @code{ascii} back-end.
-Otherwise, it creates a box around the code, leaving room for the language.
-A new back-end is then created.  It only changes its behavior when
-translating @code{src-block} type element.  Now, all it takes to use the new
-back-end is calling the following from an Org buffer:
+current element.  If not true, hands over to @code{ascii} back-end.  If true,
+which it is in this example, it creates a box around the code and leaves room
+for the inserting a string for language.  The last form creates the new
+back-end that springs to action only when translating @code{src-block} type
+elements.
+
+To use the newly defined back-end, call the following from an Org buffer:
 
 @smalllisp
 (org-export-to-buffer 'my-ascii "*Org MY-ASCII Export*")
 @end smalllisp
 
-It is obviously possible to write an interactive function for this, install
-it in the export dispatcher menu, and so on.
+Further steps to consider would be an interactive function, self-installing
+an item in the export dispatcher menu, and other user-friendly improvements.
+
+@node Export in foreign buffers
+@section Export in foreign buffers
+
+The export back-ends in Org often include commands to convert selected
+regions.  A convenient feature of this in-place conversion is that the
+exported output replaces the original source.  Here are such functions:
+
+@table @code
+@item org-html-convert-region-to-html
+Convert the selected region into HTML.
+@item org-latex-convert-region-to-latex
+Convert the selected region into @LaTeX{}.
+@item org-texinfo-convert-region-to-texinfo
+Convert the selected region into @code{Texinfo}.
+@item org-md-convert-region-to-md
+Convert the selected region into @code{MarkDown}.
+@end table
+
+In-place conversions are particularly handy for quick conversion of tables
+and lists in foreign buffers.  For example, turn on the minor mode @code{M-x
+orgstruct-mode} in an HTML buffer, then use the convenient Org keyboard
+commands to create a list, select it, and covert it to HTML with @code{M-x
+org-html-convert-region-to-html RET}.
+
 
-@node Publishing, Working With Source Code, Exporting, Top
+@node Publishing
 @chapter Publishing
 @cindex publishing
 
@@ -13485,7 +14223,7 @@ Publishing has been contributed to Org by David O'Toole.
 * Triggering publication::      Publication commands
 @end menu
 
-@node Configuration, Uploading files, Publishing, Publishing
+@node Configuration
 @section Configuration
 
 Publishing needs significant configuration to specify files, destination
@@ -13502,7 +14240,7 @@ and many other properties of a project.
 * Generating an index::         An index that reaches across pages
 @end menu
 
-@node Project alist, Sources and destinations, Configuration, Configuration
+@node Project alist
 @subsection The variable @code{org-publish-project-alist}
 @cindex org-publish-project-alist
 @cindex projects, for publishing
@@ -13529,7 +14267,7 @@ together files requiring different publishing options.  When you publish such
 a ``meta-project'', all the components will also be published, in the
 sequence given.
 
-@node Sources and destinations, Selecting files, Project alist, Configuration
+@node Sources and destinations
 @subsection Sources and destinations for files
 @cindex directories, for publishing
 
@@ -13548,17 +14286,17 @@ use external tools to upload your website (@pxref{Uploading files}).
 @item @code{:preparation-function}
 @tab Function or list of functions to be called before starting the
 publishing process, for example, to run @code{make} for updating files to be
-published.  The project property list is scoped into this call as the
-variable @code{project-plist}.
+published.  Each preparation function is called with a single argument, the
+project property list.
 @item @code{:completion-function}
 @tab Function or list of functions called after finishing the publishing
-process, for example, to change permissions of the resulting files.  The
-project property list is scoped into this call as the variable
-@code{project-plist}.
+process, for example, to change permissions of the resulting files.  Each
+completion function is called with a single argument, the project property
+list.
 @end multitable
 @noindent
 
-@node Selecting files, Publishing action, Sources and destinations, Configuration
+@node Selecting files
 @subsection Selecting files
 @cindex files, selecting for publishing
 
@@ -13584,7 +14322,7 @@ and @code{:exclude}.
 @tab non-@code{nil} means, check base-directory recursively for files to publish.
 @end multitable
 
-@node Publishing action, Publishing options, Selecting files, Configuration
+@node Publishing action
 @subsection Publishing action
 @cindex action, for publishing
 
@@ -13623,46 +14361,26 @@ and the path to the publishing directory of the output file.  It should take
 the specified file, make the necessary transformation (if any) and place the
 result into the destination folder.
 
-@node Publishing options, Publishing links, Publishing action, Configuration
+@node Publishing options
 @subsection Options for the exporters
 @cindex options, for publishing
 
-The property list can be used to set many export options for the exporters.
-In most cases, these properties correspond to user variables in Org.  The
-first table below lists these properties along with the variable they belong
-to.  The second table list HTML specific properties.  See the documentation
-string of these options for details.
+The property list can be used to set export options during the publishing
+process.  In most cases, these properties correspond to user variables in
+Org.  While some properties are available for all export back-ends, most of
+them are back-end specific.  The following sections list properties along
+with the variable they belong to.  See the documentation string of these
+options for details.
 
-@vindex org-display-custom-times
-@vindex org-export-default-language
-@vindex org-export-exclude-tags
-@vindex org-export-headline-levels
-@vindex org-export-preserve-breaks
-@vindex org-export-publishing-directory
-@vindex org-export-select-tags
-@vindex org-export-with-archived-trees
-@vindex org-export-with-author
-@vindex org-export-with-creator
-@vindex org-export-with-drawers
-@vindex org-export-with-email
-@vindex org-export-with-emphasize
-@vindex org-export-with-fixed-width
-@vindex org-export-with-footnotes
-@vindex org-export-with-latex
-@vindex org-export-with-planning
-@vindex org-export-with-priority
-@vindex org-export-with-section-numbers
-@vindex org-export-with-special-strings
-@vindex org-export-with-sub-superscripts
-@vindex org-export-with-tables
-@vindex org-export-with-tags
-@vindex org-export-with-tasks
-@vindex org-export-with-timestamps
-@vindex org-export-with-toc
-@vindex org-export-with-todo-keywords
-@vindex user-mail-address
+@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 settings}),
+however, override everything.
+
+@subsubheading Generic properties
 
-@multitable @columnfractions 0.32 0.68
+@multitable {@code{:with-sub-superscript}}  {@code{org-export-with-sub-superscripts}}
 @item @code{:archived-trees}        @tab @code{org-export-with-archived-trees}
 @item @code{:exclude-tags}          @tab @code{org-export-exclude-tags}
 @item @code{:headline-levels}       @tab @code{org-export-headline-levels}
@@ -13671,7 +14389,10 @@ string of these options for details.
 @item @code{:section-numbers}       @tab @code{org-export-with-section-numbers}
 @item @code{:select-tags}           @tab @code{org-export-select-tags}
 @item @code{:with-author}           @tab @code{org-export-with-author}
+@item @code{:with-broken-links}     @tab @code{org-export-with-broken-links}
+@item @code{:with-clocks}           @tab @code{org-export-with-clocks}
 @item @code{:with-creator}          @tab @code{org-export-with-creator}
+@item @code{:with-date}             @tab @code{org-export-with-date}
 @item @code{:with-drawers}          @tab @code{org-export-with-drawers}
 @item @code{:with-email}            @tab @code{org-export-with-email}
 @item @code{:with-emphasize}        @tab @code{org-export-with-emphasize}
@@ -13680,83 +14401,225 @@ string of these options for details.
 @item @code{:with-latex}            @tab @code{org-export-with-latex}
 @item @code{:with-planning}         @tab @code{org-export-with-planning}
 @item @code{:with-priority}         @tab @code{org-export-with-priority}
+@item @code{:with-properties}       @tab @code{org-export-with-properties}
 @item @code{:with-special-strings}  @tab @code{org-export-with-special-strings}
 @item @code{:with-sub-superscript}  @tab @code{org-export-with-sub-superscripts}
 @item @code{:with-tables}           @tab @code{org-export-with-tables}
 @item @code{:with-tags}             @tab @code{org-export-with-tags}
 @item @code{:with-tasks}            @tab @code{org-export-with-tasks}
 @item @code{:with-timestamps}       @tab @code{org-export-with-timestamps}
+@item @code{:with-title}            @tab @code{org-export-with-title}
 @item @code{:with-toc}              @tab @code{org-export-with-toc}
 @item @code{:with-todo-keywords}    @tab @code{org-export-with-todo-keywords}
 @end multitable
 
-@vindex org-html-doctype
-@vindex org-html-container-element
-@vindex org-html-html5-fancy
-@vindex org-html-xml-declaration
-@vindex org-html-link-up
-@vindex org-html-link-home
-@vindex org-html-link-org-files-as-html
-@vindex org-html-link-use-abs-url
-@vindex org-html-head
-@vindex org-html-head-extra
-@vindex org-html-inline-images
-@vindex org-html-extension
-@vindex org-html-preamble
-@vindex org-html-postamble
-@vindex org-html-table-default-attributes
-@vindex org-html-table-row-tags
-@vindex org-html-head-include-default-style
-@vindex org-html-head-include-scripts
-@multitable @columnfractions 0.32 0.68
-@item @code{:html-doctype}          @tab @code{org-html-doctype}
-@item @code{:html-container}        @tab @code{org-html-container-element}
-@item @code{:html-html5-fancy}      @tab @code{org-html-html5-fancy}
-@item @code{:html-xml-declaration}  @tab @code{org-html-xml-declaration}
-@item @code{:html-link-up}          @tab @code{org-html-link-up}
-@item @code{:html-link-home}        @tab @code{org-html-link-home}
-@item @code{:html-link-org-as-html} @tab @code{org-html-link-org-files-as-html}
-@item @code{:html-link-use-abs-url} @tab @code{org-html-link-use-abs-url}
-@item @code{:html-head}             @tab @code{org-html-head}
-@item @code{:html-head-extra}       @tab @code{org-html-head-extra}
-@item @code{:html-inline-images}    @tab @code{org-html-inline-images}
-@item @code{:html-extension}        @tab @code{org-html-extension}
-@item @code{:html-preamble}         @tab @code{org-html-preamble}
-@item @code{:html-postamble}        @tab @code{org-html-postamble}
-@item @code{:html-table-attributes} @tab @code{org-html-table-default-attributes}
-@item @code{:html-table-row-tags}   @tab @code{org-html-table-row-tags}
+@subsubheading ASCII specific properties
+
+@multitable {@code{:ascii-table-keep-all-vertical-lines}} {@code{org-ascii-table-keep-all-vertical-lines}}
+@item @code{:ascii-bullets}                       @tab @code{org-ascii-bullets}
+@item @code{:ascii-caption-above}                 @tab @code{org-ascii-caption-above}
+@item @code{:ascii-charset}                       @tab @code{org-ascii-charset}
+@item @code{:ascii-global-margin}                 @tab @code{org-ascii-global-margin}
+@item @code{:ascii-format-drawer-function}        @tab @code{org-ascii-format-drawer-function}
+@item @code{:ascii-format-inlinetask-function}    @tab @code{org-ascii-format-inlinetask-function}
+@item @code{:ascii-headline-spacing}              @tab @code{org-ascii-headline-spacing}
+@item @code{:ascii-indented-line-width}           @tab @code{org-ascii-indented-line-width}
+@item @code{:ascii-inlinetask-width}              @tab @code{org-ascii-inlinetask-width}
+@item @code{:ascii-inner-margin}                  @tab @code{org-ascii-inner-margin}
+@item @code{:ascii-links-to-notes}                @tab @code{org-ascii-links-to-notes}
+@item @code{:ascii-list-margin}                   @tab @code{org-ascii-list-margin}
+@item @code{:ascii-paragraph-spacing}             @tab @code{org-ascii-paragraph-spacing}
+@item @code{:ascii-quote-margin}                  @tab @code{org-ascii-quote-margin}
+@item @code{:ascii-table-keep-all-vertical-lines} @tab @code{org-ascii-table-keep-all-vertical-lines}
+@item @code{:ascii-table-use-ascii-art}           @tab @code{org-ascii-table-use-ascii-art}
+@item @code{:ascii-table-widen-columns}           @tab @code{org-ascii-table-widen-columns}
+@item @code{:ascii-text-width}                    @tab @code{org-ascii-text-width}
+@item @code{:ascii-underline}                     @tab @code{org-ascii-underline}
+@item @code{:ascii-verbatim-format}               @tab @code{org-ascii-verbatim-format}
+@end multitable
+
+@subsubheading Beamer specific properties
+
+@multitable {@code{:beamer-frame-default-options}} {@code{org-beamer-frame-default-options}}
+@item @code{:beamer-theme}                 @tab @code{org-beamer-theme}
+@item @code{:beamer-column-view-format}    @tab @code{org-beamer-column-view-format}
+@item @code{:beamer-environments-extra}    @tab @code{org-beamer-environments-extra}
+@item @code{:beamer-frame-default-options} @tab @code{org-beamer-frame-default-options}
+@item @code{:beamer-outline-frame-options} @tab @code{org-beamer-outline-frame-options}
+@item @code{:beamer-outline-frame-title}   @tab @code{org-beamer-outline-frame-title}
+@item @code{:beamer-subtitle-format}       @tab @code{org-beamer-subtitle-format}
+@end multitable
+
+@subsubheading HTML specific properties
+
+@multitable {@code{:html-table-use-header-tags-for-first-column}} {@code{org-html-table-use-header-tags-for-first-column}}
+@item @code{:html-allow-name-attribute-in-anchors} @tab @code{org-html-allow-name-attribute-in-anchors}
+@item @code{:html-checkbox-type}              @tab @code{org-html-checkbox-type}
+@item @code{:html-container}                  @tab @code{org-html-container-element}
+@item @code{:html-divs}                       @tab @code{org-html-divs}
+@item @code{:html-doctype}                    @tab @code{org-html-doctype}
+@item @code{:html-extension}                  @tab @code{org-html-extension}
+@item @code{:html-footnote-format}            @tab @code{org-html-footnote-format}
+@item @code{:html-footnote-separator}         @tab @code{org-html-footnote-separator}
+@item @code{:html-footnotes-section}          @tab @code{org-html-footnotes-section}
+@item @code{:html-format-drawer-function}     @tab @code{org-html-format-drawer-function}
+@item @code{:html-format-headline-function}   @tab @code{org-html-format-headline-function}
+@item @code{:html-format-inlinetask-function} @tab @code{org-html-format-inlinetask-function}
+@item @code{:html-head-extra}                 @tab @code{org-html-head-extra}
 @item @code{:html-head-include-default-style} @tab @code{org-html-head-include-default-style}
-@item @code{:html-head-include-scripts} @tab @code{org-html-head-include-scripts}
+@item @code{:html-head-include-scripts}       @tab @code{org-html-head-include-scripts}
+@item @code{:html-head}                       @tab @code{org-html-head}
+@item @code{:html-home/up-format}             @tab @code{org-html-home/up-format}
+@item @code{:html-html5-fancy}                @tab @code{org-html-html5-fancy}
+@item @code{:html-indent}                     @tab @code{org-html-indent}
+@item @code{:html-infojs-options}             @tab @code{org-html-infojs-options}
+@item @code{:html-infojs-template}            @tab @code{org-html-infojs-template}
+@item @code{:html-inline-image-rules}         @tab @code{org-html-inline-image-rules}
+@item @code{:html-inline-images}              @tab @code{org-html-inline-images}
+@item @code{:html-link-home}                  @tab @code{org-html-link-home}
+@item @code{:html-link-org-files-as-html}     @tab @code{org-html-link-org-files-as-html}
+@item @code{:html-link-up}                    @tab @code{org-html-link-up}
+@item @code{:html-link-use-abs-url}           @tab @code{org-html-link-use-abs-url}
+@item @code{:html-mathjax-options}            @tab @code{org-html-mathjax-options}
+@item @code{:html-mathjax-template}           @tab @code{org-html-mathjax-template}
+@item @code{:html-metadata-timestamp-format}  @tab @code{org-html-metadata-timestamp-format}
+@item @code{:html-postamble-format}           @tab @code{org-html-postamble-format}
+@item @code{:html-postamble}                  @tab @code{org-html-postamble}
+@item @code{:html-preamble-format}            @tab @code{org-html-preamble-format}
+@item @code{:html-preamble}                   @tab @code{org-html-preamble}
+@item @code{:html-table-align-individual-fields} @tab @code{org-html-table-align-individual-fields}
+@item @code{:html-table-attributes}           @tab @code{org-html-table-default-attributes}
+@item @code{:html-table-caption-above}        @tab @code{org-html-table-caption-above}
+@item @code{:html-table-data-tags}            @tab @code{org-html-table-data-tags}
+@item @code{:html-table-header-tags}          @tab @code{org-html-table-header-tags}
+@item @code{:html-table-row-tags}             @tab @code{org-html-table-row-tags}
+@item @code{:html-table-use-header-tags-for-first-column} @tab @code{org-html-table-use-header-tags-for-first-column}
+@item @code{:html-tag-class-prefix}           @tab @code{org-html-tag-class-prefix}
+@item @code{:html-text-markup-alist}          @tab @code{org-html-text-markup-alist}
+@item @code{:html-todo-kwd-class-prefix}      @tab @code{org-html-todo-kwd-class-prefix}
+@item @code{:html-toplevel-hlevel}            @tab @code{org-html-toplevel-hlevel}
+@item @code{:html-use-infojs}                 @tab @code{org-html-use-infojs}
+@item @code{:html-validation-link}            @tab @code{org-html-validation-link}
+@item @code{:html-viewport}                   @tab @code{org-html-viewport}
+@item @code{:html-xml-declaration}            @tab @code{org-html-xml-declaration}
 @end multitable
 
-Most of the @code{org-export-with-*} variables have the same effect in each
-exporter.
+@subsubheading @LaTeX{} specific properties
+
+@multitable {@code{:latex-link-with-unknown-path-format}} {@code{org-latex-link-with-unknown-path-format}}
+@item @code{:latex-active-timestamp-format}    @tab @code{org-latex-active-timestamp-format}
+@item @code{:latex-caption-above}              @tab @code{org-latex-caption-above}
+@item @code{:latex-classes}                    @tab @code{org-latex-classes}
+@item @code{:latex-class}                      @tab @code{org-latex-default-class}
+@item @code{:latex-compiler}                   @tab @code{org-latex-compiler}
+@item @code{:latex-default-figure-position}    @tab @code{org-latex-default-figure-position}
+@item @code{:latex-default-table-environment}  @tab @code{org-latex-default-table-environment}
+@item @code{:latex-default-table-mode}         @tab @code{org-latex-default-table-mode}
+@item @code{:latex-diary-timestamp-format}     @tab @code{org-latex-diary-timestamp-format}
+@item @code{:latex-footnote-defined-format}    @tab @code{org-latex-footnote-defined-format}
+@item @code{:latex-footnote-separator}         @tab @code{org-latex-footnote-separator}
+@item @code{:latex-format-drawer-function}     @tab @code{org-latex-format-drawer-function}
+@item @code{:latex-format-headline-function}   @tab @code{org-latex-format-headline-function}
+@item @code{:latex-format-inlinetask-function} @tab @code{org-latex-format-inlinetask-function}
+@item @code{:latex-hyperref-template}          @tab @code{org-latex-hyperref-template}
+@item @code{:latex-image-default-height}       @tab @code{org-latex-image-default-height}
+@item @code{:latex-image-default-option}       @tab @code{org-latex-image-default-option}
+@item @code{:latex-image-default-width}        @tab @code{org-latex-image-default-width}
+@item @code{:latex-images-centered}            @tab @code{org-latex-images-centered}
+@item @code{:latex-inactive-timestamp-format}  @tab @code{org-latex-inactive-timestamp-format}
+@item @code{:latex-inline-image-rules}         @tab @code{org-latex-inline-image-rules}
+@item @code{:latex-link-with-unknown-path-format} @tab @code{org-latex-link-with-unknown-path-format}
+@item @code{:latex-listings-langs}             @tab @code{org-latex-listings-langs}
+@item @code{:latex-listings-options}           @tab @code{org-latex-listings-options}
+@item @code{:latex-listings}                   @tab @code{org-latex-listings}
+@item @code{:latex-minted-langs}               @tab @code{org-latex-minted-langs}
+@item @code{:latex-minted-options}             @tab @code{org-latex-minted-options}
+@item @code{:latex-prefer-user-labels}         @tab @code{org-latex-prefer-user-labels}
+@item @code{:latex-subtitle-format}            @tab @code{org-latex-subtitle-format}
+@item @code{:latex-subtitle-separate}          @tab @code{org-latex-subtitle-separate}
+@item @code{:latex-table-scientific-notation}  @tab @code{org-latex-table-scientific-notation}
+@item @code{:latex-tables-booktabs}            @tab @code{org-latex-tables-booktabs}
+@item @code{:latex-tables-centered}            @tab @code{org-latex-tables-centered}
+@item @code{:latex-text-markup-alist}          @tab @code{org-latex-text-markup-alist}
+@item @code{:latex-title-command}              @tab @code{org-latex-title-command}
+@item @code{:latex-toc-command}                @tab @code{org-latex-toc-command}
+@end multitable
 
-@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 settings}),
-however, override everything.
+@subsubheading Markdown specific properties
+
+@multitable {@code{:md-footnotes-section}} {@code{org-md-footnotes-section}}
+@item @code{:md-footnote-format} @tab @code{org-md-footnote-format}
+@item @code{:md-footnotes-section} @tab @code{org-md-footnotes-section}
+@item @code{:md-headline-style} @tab @code{org-md-headline-style}
+@end multitable
+
+@subsubheading ODT specific properties
+
+@multitable {@code{:odt-format-inlinetask-function}} {@code{org-odt-format-inlinetask-function}}
+@item @code{:odt-content-template-file}      @tab @code{org-odt-content-template-file}
+@item @code{:odt-display-outline-level}      @tab @code{org-odt-display-outline-level}
+@item @code{:odt-fontify-srcblocks}          @tab @code{org-odt-fontify-srcblocks}
+@item @code{:odt-format-drawer-function}     @tab @code{org-odt-format-drawer-function}
+@item @code{:odt-format-headline-function}   @tab @code{org-odt-format-headline-function}
+@item @code{:odt-format-inlinetask-function} @tab @code{org-odt-format-inlinetask-function}
+@item @code{:odt-inline-formula-rules}       @tab @code{org-odt-inline-formula-rules}
+@item @code{:odt-inline-image-rules}         @tab @code{org-odt-inline-image-rules}
+@item @code{:odt-pixels-per-inch}            @tab @code{org-odt-pixels-per-inch}
+@item @code{:odt-styles-file}                @tab @code{org-odt-styles-file}
+@item @code{:odt-table-styles}               @tab @code{org-odt-table-styles}
+@item @code{:odt-use-date-fields}            @tab @code{org-odt-use-date-fields}
+@end multitable
+
+@subsubheading Texinfo specific properties
+
+@multitable {@code{:texinfo-link-with-unknown-path-format}} {@code{org-texinfo-link-with-unknown-path-format}}
+@item @code{:texinfo-active-timestamp-format}    @tab @code{org-texinfo-active-timestamp-format}
+@item @code{:texinfo-classes}                    @tab @code{org-texinfo-classes}
+@item @code{:texinfo-class}                      @tab @code{org-texinfo-default-class}
+@item @code{:texinfo-def-table-markup}           @tab @code{org-texinfo-def-table-markup}
+@item @code{:texinfo-diary-timestamp-format}     @tab @code{org-texinfo-diary-timestamp-format}
+@item @code{:texinfo-filename}                   @tab @code{org-texinfo-filename}
+@item @code{:texinfo-format-drawer-function}     @tab @code{org-texinfo-format-drawer-function}
+@item @code{:texinfo-format-headline-function}   @tab @code{org-texinfo-format-headline-function}
+@item @code{:texinfo-format-inlinetask-function} @tab @code{org-texinfo-format-inlinetask-function}
+@item @code{:texinfo-inactive-timestamp-format}  @tab @code{org-texinfo-inactive-timestamp-format}
+@item @code{:texinfo-link-with-unknown-path-format} @tab @code{org-texinfo-link-with-unknown-path-format}
+@item @code{:texinfo-node-description-column}    @tab @code{org-texinfo-node-description-column}
+@item @code{:texinfo-table-scientific-notation}  @tab @code{org-texinfo-table-scientific-notation}
+@item @code{:texinfo-tables-verbatim}            @tab @code{org-texinfo-tables-verbatim}
+@item @code{:texinfo-text-markup-alist}          @tab @code{org-texinfo-text-markup-alist}
+@end multitable
 
-@node Publishing links, Sitemap, Publishing options, Configuration
+@node Publishing links
 @subsection Links between published files
 @cindex links, publishing
 
 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}).  When published, this link becomes a link to
-@file{foo.html}.  You can thus interlink the pages of your "org web" project
-and the links will work as expected when you publish them to HTML@.  If you
-also publish the Org source file and want to link to it, 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.
+@samp{[[file:foo.org][The foo]]} or simply @samp{file:foo.org}
+(@pxref{External links}).  When published, this link becomes a link to
+@file{foo.html}.  You can thus interlink the pages of your ``org web''
+project and the links will work as expected when you publish them to HTML.
+If you also publish the Org source file and want to link to it, 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 careful
 with relative file names, and provided you have also configured Org to upload
 the related files, these links will work too.  See @ref{Complex example}, for
 an example of this usage.
 
-@node Sitemap, Generating an index, Publishing links, Configuration
+Eventually, links between published documents can contain some search options
+(@pxref{Search options}), which will be resolved to the appropriate location
+in the linked file.  For example, once published to HTML, the following links
+all point to a dedicated anchor in @file{foo.html}.
+
+@example
+[[file:foo.org::*heading]]
+[[file:foo.org::#custom-id]]
+[[file:foo.org::target]]
+@end example
+
+@node Sitemap
 @subsection Generating a sitemap
 @cindex sitemap, of published pages
 
@@ -13816,7 +14679,7 @@ Defaults to @code{nil}.
 
 @end multitable
 
-@node Generating an index,  , Sitemap, Configuration
+@node Generating an index
 @subsection Generating an index
 @cindex index, in a publishing project
 
@@ -13833,7 +14696,17 @@ The file will be created when first publishing a project with the
 "theindex.inc"}.  You can then build around this include statement by adding
 a title, style information, etc.
 
-@node Uploading files, Sample configuration, Configuration, Publishing
+@cindex #+INDEX
+Index entries are specified with @code{#+INDEX} keyword.  An entry that
+contains an exclamation mark will create a sub item.
+
+@example
+* Curriculum Vitae
+#+INDEX: CV
+#+INDEX: Application!CV
+@end example
+
+@node Uploading files
 @section Uploading files
 @cindex rsync
 @cindex unison
@@ -13866,7 +14739,7 @@ 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
+@node Sample configuration
 @section Sample configuration
 
 Below we provide two example configurations.  The first one is a simple
@@ -13878,7 +14751,7 @@ more complex, with a multi-component project.
 * Complex example::             A multi-component publishing example
 @end menu
 
-@node Simple example, Complex example, Sample configuration, Sample configuration
+@node Simple example
 @subsection Example: simple publishing configuration
 
 This example publishes a set of Org files to the @file{public_html}
@@ -13896,7 +14769,7 @@ directory on the local machine.
                     type=\"text/css\"/>")))
 @end lisp
 
-@node Complex example,  , Simple example, Sample configuration
+@node Complex example
 @subsection Example: complex publishing configuration
 
 This more complicated example publishes an entire website, including
@@ -13946,7 +14819,7 @@ right place on the web server, and publishing images to it.
          ("website" :components ("orgfiles" "images" "other"))))
 @end lisp
 
-@node Triggering publication,  , Sample configuration, Publishing
+@node Triggering publication
 @section Triggering publication
 
 Once properly configured, Org can publish with the following commands:
@@ -13970,17 +14843,20 @@ 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:}.
 
-@comment  node-name,  next,  previous,  up
-@comment Working With Source Code, Miscellaneous, Publishing, Top
 
-@node Working With Source Code, Miscellaneous, Publishing, Top
+@node Working with source code
 @chapter Working with source code
 @cindex Schulte, Eric
 @cindex Davison, Dan
 @cindex source code, working with
 
-Source code can be included in Org mode documents using a @samp{src} block,
-e.g.:
+Source code here refers to any code typed in Org mode documents.  Org can
+manage source code in any Org file once such code is tagged with begin and
+end markers.  Working with source code begins with tagging source code
+blocks.  Tagged @samp{src} code blocks are not restricted to the preamble or
+the end of an Org document; they can go anywhere---with a few exceptions,
+such as not inside comments and fixed width areas.  Here's a sample
+@samp{src} code block in emacs-lisp:
 
 @example
 #+BEGIN_SRC emacs-lisp
@@ -13990,14 +14866,57 @@ e.g.:
 #+END_SRC
 @end example
 
-Org mode provides a number of features for working with live source code,
-including editing of code blocks in their native major-mode, evaluation of
-code blocks, converting code blocks into source files (known as @dfn{tangling}
-in literate programming), and exporting code blocks and their
-results in several formats.  This functionality was contributed by Eric
-Schulte and Dan Davison, and was originally named Org-babel.
-
-The following sections describe Org mode's code block handling facilities.
+Org can take the code in the block between the @samp{#+BEGIN_SRC} and
+@samp{#+END_SRC} tags, and format, compile, execute, and show the results.
+Org can simplify many housekeeping tasks essential to modern code
+maintenance.  That's why these blocks in Org mode literature are sometimes
+referred to as @samp{live code} blocks (as compared to the static text and
+documentation around it).  Users can control how @samp{live} they want each
+block by tweaking the headers for compiling, execution, extraction.
+
+Org's @samp{src} code block type is one of many block types, such as quote,
+export, verse, latex, example, and verbatim.  This section pertains to
+@samp{src} code blocks between @samp{#+BEGIN_SRC} and @samp{#+END_SRC}
+
+For editing @samp{src} code blocks, Org provides native Emacs major-modes.
+That leverages the latest Emacs features for that source code language mode.
+
+For exporting, Org can then extract @samp{src} code blocks into compilable
+source files (in a conversion process known as @dfn{tangling} in literate
+programming terminology).
+
+For publishing, Org's back-ends can handle the @samp{src} code blocks and the
+text for output to a variety of formats with native syntax highlighting.
+
+For executing the source code in the @samp{src} code blocks, Org provides
+facilities that glue the tasks of compiling, collecting the results of the
+execution, and inserting them back to the Org file.  Besides text output,
+results may include links to other data types that Emacs can handle: audio,
+video, and graphics.
+
+An important feature of Org's execution of the @samp{src} code blocks is
+passing variables, functions, and results between @samp{src} blocks.  Such
+interoperability uses a common syntax even if these @samp{src} blocks are in
+different source code languages.  The integration extends to linking the
+debugger's error messages to the line in the @samp{src} code block in the Org
+file.  That should partly explain why this functionality by the original
+contributors, Eric Schulte and Dan Davison, was called @samp{Org Babel}.
+
+In literate programming, the main appeal is code and documentation
+co-existing in one file.  Org mode takes this several steps further.  First
+by enabling execution, and then by inserting results of that execution back
+into the Org file.  Along the way, Org provides extensive formatting
+features, including handling tables.  Org handles multiple source code
+languages in one file, and provides a common syntax for passing variables,
+functions, and results between @samp{src} code blocks.
+
+Org mode fulfills the promise of easy verification and maintenance of
+publishing reproducible research by keeping all these in the same file: text,
+data, code, configuration settings of the execution environment, the results
+of the execution, and associated narratives, claims, references, and internal
+and external links.
+
+Details of Org's facilities for working with source code are shown next.
 
 @menu
 * Structure of code blocks::    Code block syntax described
@@ -14014,19 +14933,18 @@ The following sections describe Org mode's code block handling facilities.
 * Batch execution::             Call functions from the command line
 @end menu
 
-@comment  node-name,  next,  previous,  up
-@comment  Structure of code blocks, Editing source code, Working With Source Code, Working With Source Code
 
-@node Structure of code blocks, Editing source code, Working With Source Code, Working With Source Code
+@node Structure of code blocks
 @section Structure of code blocks
 @cindex code block, structure
 @cindex source code, block structure
 @cindex #+NAME
 @cindex #+BEGIN_SRC
 
-Live code blocks can be specified with a @samp{src} block or
-inline.@footnote{Note that @samp{src} blocks may be inserted using Org mode's
-@ref{Easy Templates} system}  The structure of a @samp{src} block is
+Org offers two ways to structure source code in Org documents: in a
+@samp{src} block, and directly inline.  Both specifications are shown below.
+
+A @samp{src} block conforms to this structure:
 
 @example
 #+NAME: <name>
@@ -14035,12 +14953,15 @@ inline.@footnote{Note that @samp{src} blocks may be inserted using Org mode's
 #+END_SRC
 @end example
 
-The @code{#+NAME:} line is optional, and can be used to name the code
-block.  Live code blocks require that a language be specified on the
-@code{#+BEGIN_SRC} line.  Switches and header arguments are optional.
-@cindex source code, inline
+Org mode's templates system (@pxref{Easy templates}) speeds up creating
+@samp{src} code blocks with just three keystrokes.  Do not be put-off by
+having to remember the source block syntax.  Org also works with other
+completion systems in Emacs, some of which predate Org and have custom
+domain-specific languages for defining templates.  Regular use of templates
+reduces errors, increases accuracy, and maintains consistency.
 
-Live code blocks can also be specified inline using
+@cindex source code, inline
+An inline code block conforms to this structure:
 
 @example
 src_<language>@{<body>@}
@@ -14053,36 +14974,39 @@ src_<language>[<header arguments>]@{<body>@}
 @end example
 
 @table @code
-@item <#+NAME: name>
-This line associates a name with the code block.  This is similar to the
-@code{#+NAME: Name} lines that can be used to name tables in Org mode
-files.  Referencing the name of a code block makes it possible to evaluate
-the block from other places in the file, from other files, or from Org mode
-table formulas (see @ref{The spreadsheet}).  Names are assumed to be unique
-and the behavior of Org mode when two or more blocks share the same name is
-undefined.
+@item #+NAME: <name>
+Optional.  Names the @samp{src} block so it can be called, like a function,
+from other @samp{src} blocks or inline blocks to evaluate or to capture the
+results.  Code from other blocks, other files, and from table formulas
+(@pxref{The spreadsheet}) can use the name to reference a @samp{src} block.
+This naming serves the same purpose as naming Org tables.  Org mode requires
+unique names.  For duplicate names, Org mode's behavior is undefined.
 @cindex #+NAME
+@item #+BEGIN_SRC
+@item #+END_SRC
+Mandatory.  They mark the start and end of a block that Org requires.  The
+@code{#+BEGIN_SRC} line takes additional arguments, as described next.
+@cindex begin block, end block
 @item <language>
-The language of the code in the block (see @ref{Languages}).
+Mandatory for live code blocks.  It is the identifier of the source code
+language in the block.  @xref{Languages}, for identifiers of supported
+languages.
 @cindex source code, language
 @item <switches>
-Optional switches control code block export (see the discussion of switches in
-@ref{Literal examples})
+Optional.  Switches provide finer control of the code execution, export, and
+format (see the discussion of switches in @ref{Literal examples})
 @cindex source code, switches
 @item <header arguments>
-Optional header arguments control many aspects of evaluation, export and
-tangling of code blocks (see @ref{Header arguments}).
-Header arguments can also be set on a per-buffer or per-subtree
-basis using properties.
+Optional.  Heading arguments control many aspects of evaluation, export and
+tangling of code blocks (@pxref{Header arguments}).  Using Org's properties
+feature, header arguments can be selectively applied to the entire buffer or
+specific sub-trees of the Org document.
 @item source code, header arguments
 @item <body>
-Source code in the specified language.
+Source code in the dialect of the specified language identifier.
 @end table
 
-@comment  node-name,  next,  previous,  up
-@comment  Editing source code, Exporting code blocks, Structure of code blocks, Working With Source Code
-
-@node Editing source code, Exporting code blocks, Structure of code blocks, Working With Source Code
+@node Editing source code
 @section Editing source code
 @cindex code block, editing
 @cindex source code, editing
@@ -14090,116 +15014,150 @@ Source code in the specified language.
 @vindex org-edit-src-auto-save-idle-delay
 @vindex org-edit-src-turn-on-auto-save
 @kindex C-c '
-Use @kbd{C-c '} to edit the current code block.  This brings up a language
-major-mode edit buffer containing the body of the code block.  Manually
-saving this buffer with @key{C-x C-s} will write the contents back to the Org
-buffer.  You can also set @code{org-edit-src-auto-save-idle-delay} to save the
-base buffer after some idle delay, or @code{org-edit-src-turn-on-auto-save}
-to auto-save this buffer into a separate file using @code{auto-save-mode}.
-Use @kbd{C-c '} again to exit.
-
-The @code{org-src-mode} minor mode will be active in the edit buffer.  The
-following variables can be used to configure the behavior of the edit
-buffer.  See also the customization group @code{org-edit-structure} for
-further configuration options.
+@kbd{C-c '} for editing the current code block.  It opens a new major-mode
+edit buffer containing the body of the @samp{src} code block, ready for any
+edits.  @kbd{C-c '} again to close the buffer and return to the Org buffer.
+
+@key{C-x C-s} saves the buffer and updates the contents of the Org buffer.
+
+Set @code{org-edit-src-auto-save-idle-delay} to save the base buffer after
+a certain idle delay time.
+
+Set @code{org-edit-src-turn-on-auto-save} to auto-save this buffer into a
+separate file using @code{auto-save-mode}.
+
+@kbd{C-c '} to close the major-mode buffer and return back to the Org buffer.
+
+While editing the source code in the major-mode, the @code{org-src-mode}
+minor mode remains active.  It provides these customization variables as
+described below.  For even more variables, look in the customization
+group @code{org-edit-structure}.
 
 @table @code
 @item org-src-lang-modes
-If an Emacs major-mode named @code{<lang>-mode} exists, where
-@code{<lang>} is the language named in the header line of the code block,
-then the edit buffer will be placed in that major-mode.  This variable
-can be used to map arbitrary language names to existing major modes.
+If an Emacs major-mode named @code{<lang>-mode} exists, where @code{<lang>}
+is the language identifier from code block's header line, then the edit
+buffer uses that major-mode.  Use this variable to arbitrarily map language
+identifiers to major modes.
 @item org-src-window-setup
-Controls the way Emacs windows are rearranged when the edit buffer is created.
+For specifying Emacs window arrangement when the new edit buffer is created.
 @item org-src-preserve-indentation
-By default, the value is @code{nil}, which means that when code blocks are
-evaluated during export or tangled, they are re-inserted into the code block,
-which may replace sequences of spaces with tab characters.  When non-nil,
-whitespace in code blocks will be preserved during export or tangling,
-exactly as it appears.  This variable is especially useful for tangling
-languages such as Python, in which whitespace indentation in the output is
-critical.
+@cindex indentation, in source blocks
+Default is @code{nil}.  Source code is indented.  This indentation applies
+during export or tangling, and depending on the context, may alter leading
+spaces and tabs.  When non-@code{nil}, source code is aligned with the
+leftmost column.  No lines are modified during export or tangling, which is
+very useful for white-space sensitive languages, such as Python.
 @item org-src-ask-before-returning-to-edit-buffer
-By default, Org will ask before returning to an open edit buffer.  Set this
-variable to @code{nil} to switch without asking.
+When @code{nil}, Org returns to the edit buffer without further prompts.  The
+default prompts for a confirmation.
 @end table
 
-To turn on native code fontification in the @emph{Org} buffer, configure the
-variable @code{org-src-fontify-natively}.
+Set @code{org-src-fontify-natively} to non-@code{nil} to turn on native code
+fontification in the @emph{Org} buffer.  Fontification of @samp{src} code
+blocks can give visual separation of text and code on the display page.  To
+further customize the appearance of @code{org-block} for specific languages,
+customize @code{org-src-block-faces}.  The following example shades the
+background of regular blocks, and colors source blocks only for Python and
+Emacs-Lisp languages.
+@lisp
+(require 'color)
+(set-face-attribute 'org-block nil :background
+                    (color-darken-name
+                     (face-attribute 'default :background) 3))
 
-@comment  node-name,  next,  previous,  up
-@comment  Exporting code blocks, Extracting source code, Editing source code, Working With Source Code
+(setq org-src-block-faces '(("emacs-lisp" (:background "#EEE2FF"))
+                            ("python" (:background "#E5FFB8"))))
+@end lisp
 
-@node Exporting code blocks, Extracting source code, Editing source code, Working With Source Code
+@node Exporting code blocks
 @section Exporting code blocks
 @cindex code block, exporting
 @cindex source code, exporting
 
-It is possible to export the @emph{code} of code blocks, the @emph{results}
-of code block evaluation, @emph{both} the code and the results of code block
-evaluation, or @emph{none}.  For most languages, the default exports code.
-However, for some languages (e.g., @code{ditaa}) the default exports the
-results of code block evaluation.  For information on exporting code block
-bodies, see @ref{Literal examples}.
+Org can flexibly export just the @emph{code} from the code blocks, just the
+@emph{results} of evaluation of the code block, @emph{both} the code and the
+results of the code block evaluation, or @emph{none}.  Org defaults to
+exporting @emph{code} for most languages.  For some languages, such as
+@code{ditaa}, Org defaults to @emph{results}.  To export just the body of
+code blocks, @pxref{Literal examples}.  To selectively export sub-trees of
+an Org document, @pxref{Exporting}.
 
-The @code{:exports} header argument can be used to specify export
-behavior:
+The @code{:exports} header arguments control exporting code blocks only and
+not inline code:
 
 @subsubheading Header arguments:
 
 @table @code
+@cindex @code{:exports}, src header argument
 @item :exports code
-The default in most languages.  The body of the code block is exported, as
-described in @ref{Literal examples}.
+This is the default for most languages where the body of the code block is
+exported.  See @ref{Literal examples} for more.
 @item :exports results
-The code block will be evaluated and the results will be placed in the
-Org mode buffer for export, either updating previous results of the code
-block located anywhere in the buffer or, if no previous results exist,
-placing the results immediately after the code block.  The body of the code
-block will not be exported.
+On export, Org includes only the results and not the code block.  After each
+evaluation, Org inserts the results after the end of code block in the Org
+buffer.  By default, Org replaces any previous results.  Org can also append
+results.
 @item :exports both
-Both the code block and its results will be exported.
+Org exports both the code block and the results.
 @item :exports none
-Neither the code block nor its results will be exported.
+Org does not export the code block nor the results.
 @end table
 
-It is possible to inhibit the evaluation of code blocks during export.
-Setting the @code{org-export-babel-evaluate} variable to @code{nil} will
-ensure that no code blocks are evaluated as part of the export process.  This
-can be useful in situations where potentially untrusted Org mode files are
-exported in an automated fashion, for example when Org mode is used as the
-markup language for a wiki.  It is also possible to set this variable to
-@code{'inline-only}.  In that case, only inline code blocks will be
-evaluated, in order to insert their results.  Non-inline code blocks are
-assumed to have their results already inserted in the buffer by manual
-evaluation.  This setting is useful to avoid expensive recalculations during
-export, not to provide security.
-
-@comment  node-name,  next,  previous,  up
-@comment  Extracting source code, Evaluating code blocks, Exporting code blocks, Working With Source Code
-@node Extracting source code, Evaluating code blocks, Exporting code blocks, Working With Source Code
+@vindex org-export-babel-evaluate
+To stop Org from evaluating code blocks during export, set
+@code{org-export-babel-evaluate} variable to @code{nil}.
+
+Turning off evaluation comes in handy when batch processing.  For example,
+markup languages for wikis, which have a high risk of untrusted code.
+Stopping code block evaluation also stops evaluation of all header arguments
+of the code block.  This may not be desirable in some circumstances.  So
+during export, to allow evaluation of just the header arguments but not any
+code evaluation in the source block, set @code{:eval never-export}
+(@pxref{eval}).
+
+To evaluate just the inline code blocks, set @code{org-export-babel-evaluate}
+to @code{inline-only}.  Isolating the option to allow inline evaluations
+separate from @samp{src} code block evaluations during exports is not for
+security but for avoiding any delays due to recalculations, such as calls to
+a remote database.
+
+Org never evaluates code blocks in commented sub-trees when exporting
+(@pxref{Comment lines}).  On the other hand, Org does evaluate code blocks in
+sub-trees excluded from export (@pxref{Export settings}).
+
+@node Extracting source code
 @section Extracting source code
 @cindex tangling
 @cindex source code, extracting
 @cindex code block, extracting source code
 
-Creating pure source code files by extracting code from source blocks is
-referred to as ``tangling''---a term adopted from the literate programming
-community.  During ``tangling'' of code blocks their bodies are expanded
-using @code{org-babel-expand-src-block} which can expand both variable and
-``noweb'' style references  (see @ref{Noweb reference syntax}).
+Extracting source code from code blocks is a basic task in literate
+programming.  Org has features to make this easy.  In literate programming
+parlance, documents on creation are @emph{woven} with code and documentation,
+and on export, the code is @emph{tangled} for execution by a computer.  Org
+facilitates weaving and tangling for producing, maintaining, sharing, and
+exporting literate programming documents.  Org provides extensive
+customization options for extracting source code.
+
+When Org tangles @samp{src} code blocks, it expands, merges, and transforms
+them.  Then Org recomposes them into one or more separate files, as
+configured through the options.  During this @emph{tangling} process, Org
+expands variables in the source code, and resolves any ``noweb'' style
+references (@pxref{Noweb reference syntax}).
 
 @subsubheading Header arguments
 
 @table @code
+@cindex @code{:tangle}, src header argument
 @item :tangle no
-The default.  The code block is not included in the tangled output.
+By default, Org does not tangle the @samp{src} code block on export.
 @item :tangle yes
-Include the code block in the tangled output.  The output file name is the
-name of the org file with the extension @samp{.org} replaced by the extension
-for the block language.
+Org extracts the contents of the code block for the tangled output.  By
+default, the output file name is the same as the Org file but with a file
+extension derived from the language identifier of the @samp{src} code block.
 @item :tangle filename
-Include the code block in the tangled output to file @samp{filename}.
+Override the default file name with this one for the tangled output.
 @end table
 
 @kindex  C-c C-v t
@@ -14209,7 +15167,7 @@ Include the code block in the tangled output to file @samp{filename}.
 @item org-babel-tangle
 Tangle the current file.  Bound to @kbd{C-c C-v t}.
 
-With prefix argument only tangle the current code block.
+With prefix argument only tangle the current @samp{src} code block.
 @item org-babel-tangle-file
 Choose a file to tangle.  Bound to @kbd{C-c C-v f}.
 @end table
@@ -14218,72 +15176,67 @@ Choose a file to tangle.  Bound to @kbd{C-c C-v f}.
 
 @table @code
 @item org-babel-post-tangle-hook
-This hook is run from within code files tangled by @code{org-babel-tangle}.
-Example applications could include post-processing, compilation or evaluation
-of tangled code files.
+This hook runs from within code tangled by @code{org-babel-tangle}, making it
+suitable for post-processing, compilation, and evaluation of code in the
+tangled files.
 @end table
 
 @subsubheading Jumping between code and Org
 
-When tangling code from an Org-mode buffer to a source code file, you'll
-frequently find yourself viewing the file of tangled source code (e.g., many
-debuggers point to lines of the source code file).  It is useful to be able
-to navigate from the tangled source to the Org-mode buffer from which the
-code originated.
-
-The @code{org-babel-tangle-jump-to-org} function provides this jumping from
-code to Org-mode functionality.  Two header arguments are required for
-jumping to work, first the @code{padline} (@ref{padline}) option must be set
-to true (the default setting), second the @code{comments} (@ref{comments})
-header argument must be set to @code{links}, which will insert comments into
-the source code buffer which point back to the original Org-mode file.
+Debuggers normally link errors and messages back to the source code.  But for
+tangled files, we want to link back to the Org file, not to the tangled
+source file.  To make this extra jump, Org uses
+@code{org-babel-tangle-jump-to-org} function with two additional source code
+block header arguments: One, set @code{padline} (@pxref{padline}) to true
+(the default setting).  Two, set @code{comments} (@pxref{comments}) to
+@code{link}, which makes Org insert links to the Org file.
 
-@node Evaluating code blocks, Library of Babel, Extracting source code, Working With Source Code
+@node Evaluating code blocks
 @section Evaluating code blocks
 @cindex code block, evaluating
 @cindex source code, evaluating
 @cindex #+RESULTS
 
-Code blocks can be evaluated@footnote{Whenever code is evaluated there is a
-potential for that code to do harm.  Org mode provides safeguards to ensure
-that code is only evaluated after explicit confirmation from the user.  For
-information on these safeguards (and on how to disable them) see @ref{Code
-evaluation security}.} and the results of evaluation optionally placed in the
-Org mode buffer.  The results of evaluation are placed following a line that
-begins by default with @code{#+RESULTS} and optionally a cache identifier
-and/or the name of the evaluated code block.  The default value of
-@code{#+RESULTS} can be changed with the customizable variable
-@code{org-babel-results-keyword}.
-
-By default, the evaluation facility is only enabled for Lisp code blocks
-specified as @code{emacs-lisp}.  However, source code blocks in many languages
-can be evaluated within Org mode (see @ref{Languages} for a list of supported
-languages and @ref{Structure of code blocks} for information on the syntax
-used to define a code block).
+A note about security: With code evaluation comes the risk of harm.  Org
+safeguards by prompting for user's permission before executing any code in
+the source block.  To customize this safeguard (or disable it) see @ref{Code
+evaluation security}.
+
+Org captures the results of the @samp{src} code block evaluation and inserts
+them in the Org file, right after the @samp{src} code block.  The insertion
+point is after a newline and the @code{#+RESULTS} label.  Org creates the
+@code{#+RESULTS} label if one is not already there.
+
+By default, Org enables only @code{emacs-lisp} @samp{src} code blocks for
+execution.  See @ref{Languages} for identifiers to enable other languages.
 
 @kindex C-c C-c
-There are a number of ways to evaluate code blocks.  The simplest is to press
-@kbd{C-c C-c} or @kbd{C-c C-v e} with the point on a code block@footnote{The
-option @code{org-babel-no-eval-on-ctrl-c-ctrl-c} can be used to remove code
-evaluation from the @kbd{C-c C-c} key binding.}.  This will call the
-@code{org-babel-execute-src-block} function to evaluate the block and insert
-its results into the Org mode buffer.
-@cindex #+CALL
+Org provides many ways to execute @samp{src} code blocks.  @kbd{C-c C-c} or
+@kbd{C-c C-v e} with the point on a @samp{src} code block@footnote{The option
+@code{org-babel-no-eval-on-ctrl-c-ctrl-c} can be used to remove code
+evaluation from the @kbd{C-c C-c} key binding.} calls the
+@code{org-babel-execute-src-block} function, which executes the code in the
+block, collects the results, and inserts them in the buffer.
 
-It is also possible to evaluate named code blocks from anywhere in an Org
-mode buffer or an Org mode table.  Live code blocks located in the current
-Org mode buffer or in the ``Library of Babel'' (see @ref{Library of Babel})
-can be executed.  Named code blocks can be executed with a separate
-@code{#+CALL:} line or inline within a block of text.
+@cindex #+CALL
+By calling a named code block@footnote{Actually, the constructs call_<name>()
+and src_<lang>@{@} are not evaluated when they appear in a keyword line
+(i.e. lines starting with @code{#+KEYWORD:}, @pxref{In-buffer settings}).}
+from an Org mode buffer or a table.  Org can call the named @samp{src} code
+blocks from the current Org mode buffer or from the ``Library of Babel''
+(@pxref{Library of Babel}).  Whether inline syntax or the @code{#+CALL:}
+syntax is used, the result is wrapped based on the variable
+@code{org-babel-inline-result-wrap}, which by default is set to @code{"=%s="}
+to produce verbatim text suitable for markup.
 
-The syntax of the @code{#+CALL:} line is
+The syntax for @code{#+CALL:} is
 
 @example
 #+CALL: <name>(<arguments>)
 #+CALL: <name>[<inside header arguments>](<arguments>) <end header arguments>
 @end example
 
-The syntax for inline evaluation of named code blocks is
+The syntax for inline named code block is
 
 @example
 ... call_<name>(<arguments>) ...
@@ -14292,98 +15245,88 @@ The syntax for inline evaluation of named code blocks is
 
 @table @code
 @item <name>
-The name of the code block to be evaluated (see @ref{Structure of code blocks}).
+This is the name of the code block to be evaluated (@pxref{Structure of
+code blocks}).
 @item <arguments>
-Arguments specified in this section will be passed to the code block.  These
-arguments use standard function call syntax, rather than
-header argument syntax.  For example, a @code{#+CALL:} line that passes the
-number four to a code block named @code{double}, which declares the header
-argument @code{:var n=2}, would be written as @code{#+CALL: double(n=4)}.
+Org passes arguments to the code block using standard function call syntax.
+For example, a @code{#+CALL:} line that passes @samp{4} to a code block named
+@code{double}, which declares the header argument @code{:var n=2}, would be
+written as @code{#+CALL: double(n=4)}.  Note how this function call syntax is
+different from the header argument syntax.
 @item <inside header arguments>
-Inside header arguments are passed through and applied to the named code
-block.  These arguments use header argument syntax rather than standard
-function call syntax.  Inside header arguments affect how the code block is
-evaluated.  For example, @code{[:results output]} will collect the results of
-everything printed to @code{STDOUT} during execution of the code block.
+Org passes inside header arguments to the named @samp{src} code block using
+the header argument syntax.  Inside header arguments apply to code block
+evaluation.  For example, @code{[:results output]} collects results printed
+to @code{STDOUT} during code execution of that block.  Note how this header
+argument syntax is different from the function call syntax.
 @item <end header arguments>
-End header arguments are applied to the calling instance and do not affect
-evaluation of the named code block.  They affect how the results are
-incorporated into the Org mode buffer and how the call line is exported.  For
-example, @code{:results html} will insert the results of the call line
-evaluation in the Org buffer, wrapped in a @code{BEGIN_HTML:} block.
-
-For more examples of passing header arguments to @code{#+CALL:} lines see
-@ref{Header arguments in function calls}.
+End header arguments affect the results returned by the code block.  For
+example, @code{:results html} wraps the results in a @code{BEGIN_EXPORT html}
+block before inserting the results in the Org buffer.
+
+For more examples of header arguments for @code{#+CALL:} lines,
+@pxref{Arguments in function calls}.
 @end table
 
-@node Library of Babel, Languages, Evaluating code blocks, Working With Source Code
+@node Library of Babel
 @section Library of Babel
 @cindex babel, library of
 @cindex source code, library
 @cindex code block, library
 
-The ``Library of Babel'' consists of code blocks that can be called from any
-Org mode file.  Code blocks defined in the ``Library of Babel'' can be called
-remotely as if they were in the current Org mode buffer (see @ref{Evaluating
-code blocks} for information on the syntax of remote code block evaluation).
-
-
-The central repository of code blocks in the ``Library of Babel'' is housed
-in an Org mode file located in the @samp{contrib} directory of Org mode.
-
-Users can add code blocks they believe to be generally useful to their
-``Library of Babel.''  The code blocks can be stored in any Org mode file and
-then loaded into the library with @code{org-babel-lob-ingest}.
-
+The ``Library of Babel'' is a collection of code blocks.  Like a function
+library, these code blocks can be called from other Org files.  This
+collection is in a repository file in Org mode format in the @samp{doc}
+directory of Org mode installation.  For remote code block evaluation syntax,
+@pxref{Evaluating code blocks}.
 
 @kindex C-c C-v i
-Code blocks located in any Org mode file can be loaded into the ``Library of
-Babel'' with the @code{org-babel-lob-ingest} function, bound to @kbd{C-c C-v
-i}.
+For any user to add code to the library, first save the code in regular
+@samp{src} code blocks of an Org file, and then load the Org file with
+@code{org-babel-lob-ingest}, which is bound to @kbd{C-c C-v i}.
 
-@node Languages, Header arguments, Library of Babel, Working With Source Code
+@node Languages
 @section Languages
 @cindex babel, languages
 @cindex source code, languages
 @cindex code block, languages
 
-Code blocks in the following languages are supported.
+Org supports the following languages for the @samp{src} code blocks:
 
-@multitable @columnfractions 0.28 0.3 0.22 0.2
-@item @b{Language} @tab @b{Identifier} @tab @b{Language} @tab @b{Identifier}
+@multitable @columnfractions 0.25 0.25 0.25 0.25
+@headitem @b{Language} @tab @b{Identifier} @tab @b{Language} @tab @b{Identifier}
 @item Asymptote @tab asymptote @tab Awk @tab awk
-@item Emacs Calc @tab calc @tab C @tab C
-@item C++ @tab C++ @tab Clojure @tab clojure
-@item CSS @tab css @tab ditaa @tab ditaa
-@item Graphviz @tab dot @tab Emacs Lisp @tab emacs-lisp
+@item C @tab C @tab C++ @tab C++
+@item Clojure @tab clojure @tab CSS @tab css
+@item D @tab d @tab ditaa @tab ditaa
+@item Graphviz @tab dot @tab Emacs Calc @tab calc
+@item Emacs Lisp @tab emacs-lisp @tab Fortran @tab fortran
 @item gnuplot @tab gnuplot @tab Haskell @tab haskell
-@item Java @tab java @tab @tab
-@item Javascript @tab js @tab LaTeX @tab latex
-@item Ledger @tab ledger @tab Lisp @tab lisp
-@item Lilypond @tab lilypond @tab MATLAB @tab matlab
+@item Java @tab java @tab Javascript @tab js
+@item LaTeX @tab latex @tab Ledger @tab ledger
+@item Lisp @tab lisp @tab Lilypond @tab lilypond
+@item Lua @tab lua @tab MATLAB @tab matlab
 @item Mscgen @tab mscgen @tab Objective Caml @tab ocaml
 @item Octave @tab octave @tab Org mode @tab org
 @item Oz @tab oz @tab Perl @tab perl
-@item Plantuml @tab plantuml @tab Python @tab python
-@item R @tab R @tab Ruby @tab ruby
-@item Sass @tab sass @tab Scheme @tab scheme
-@item GNU Screen @tab screen @tab shell @tab sh
+@item Plantuml @tab plantuml @tab Processing.js @tab processing
+@item Python @tab python @tab R @tab R
+@item Ruby @tab ruby @tab Sass @tab sass
+@item Scheme @tab scheme @tab GNU Screen @tab screen
+@item Sed @tab sed @tab shell @tab sh
 @item SQL @tab sql @tab SQLite @tab sqlite
 @end multitable
 
-Language-specific documentation is available for some languages.  If
-available, it can be found at
+Additional documentation for some languages are at
 @uref{http://orgmode.org/worg/org-contrib/babel/languages.html}.
 
-The option @code{org-babel-load-languages} controls which languages are
-enabled for evaluation (by default only @code{emacs-lisp} is enabled).  This
-variable can be set using the customization interface or by adding code like
-the following to your emacs configuration.
+By default, only @code{emacs-lisp} is enabled for evaluation.  To enable or
+disable other languages, customize the @code{org-babel-load-languages}
+variable either through the Emacs customization interface, or by adding code
+to the init file as shown next:
 
-@quotation
-The following disables @code{emacs-lisp} evaluation and enables evaluation of
-@code{R} code blocks.
-@end quotation
+In this example, evaluation is disabled for @code{emacs-lisp}, and enabled
+for @code{R}.
 
 @lisp
 (org-babel-do-load-languages
@@ -14392,55 +15335,54 @@ The following disables @code{emacs-lisp} evaluation and enables evaluation of
    (R . t)))
 @end lisp
 
-It is also possible to enable support for a language by loading the related
-elisp file with @code{require}.
-
-@quotation
-The following adds support for evaluating @code{clojure} code blocks.
-@end quotation
+Note that this is not the only way to enable a language.  Org also enables
+languages when loaded with @code{require} statement.  For example, the
+following enables execution of @code{clojure} code blocks:
 
 @lisp
 (require 'ob-clojure)
 @end lisp
 
-@node Header arguments, Results of evaluation, Languages, Working With Source Code
+@node Header arguments
 @section Header arguments
 @cindex code block, header arguments
 @cindex source code, block header arguments
 
-Code block functionality can be configured with header arguments.  This
-section provides an overview of the use of header arguments, and then
-describes each header argument in detail.
+Details of configuring header arguments are shown here.
 
 @menu
 * Using header arguments::      Different ways to set header arguments
 * Specific header arguments::   List of header arguments
 @end menu
 
-@node Using header arguments, Specific header arguments, Header arguments, Header arguments
+@node Using header arguments
 @subsection Using header arguments
 
-The values of header arguments can be set in several way.  When the header
-arguments in each layer have been determined, they are combined in order from
-the first, least specific (having the lowest priority) up to the last, most
-specific (having the highest priority).  A header argument with a higher
-priority replaces the same header argument specified at lower priority.
+Since header arguments can be set in several ways, Org prioritizes them in
+case of overlaps or conflicts by giving local settings a higher priority.
+Header values in function calls, for example, override header values from
+global defaults.
 @menu
-* System-wide header arguments::  Set global default values
-* Language-specific header arguments::  Set default values by language
-* Header arguments in Org mode properties::  Set default values for a buffer or heading
-* Language-specific header arguments in Org mode properties::  Set language-specific default values for a buffer or heading
-* Code block specific header arguments::  The most common way to set values
-* Header arguments in function calls::  The most specific level
+* System-wide header arguments::  Set globally, language-specific
+* Language-specific header arguments::  Set in the Org file's headers
+* Header arguments in Org mode properties::  Set in the Org file
+* Language-specific mode properties::
+* Code block specific header arguments::  The most commonly used method
+* Arguments in function calls::  The most specific level, takes highest priority
 @end menu
 
 
-@node System-wide header arguments, Language-specific header arguments, Using header arguments, Using header arguments
+@node System-wide header arguments
 @subsubheading System-wide header arguments
 @vindex org-babel-default-header-args
 System-wide values of header arguments can be specified by adapting the
 @code{org-babel-default-header-args} variable:
 
+@cindex @code{:session}, src header argument
+@cindex @code{:results}, src header argument
+@cindex @code{:exports}, src header argument
+@cindex @code{:cache}, src header argument
+@cindex @code{:noweb}, src header argument
 @example
 :session    => "none"
 :results    => "replace"
@@ -14449,10 +15391,8 @@ System-wide values of header arguments can be specified by adapting the
 :noweb      => "no"
 @end example
 
-For example, the following example could be used to set the default value of
-@code{:noweb} header arguments to @code{yes}.  This would have the effect of
-expanding @code{:noweb} references by default when evaluating source code
-blocks.
+This example sets @code{:noweb} header arguments to @code{yes}, which makes
+Org expand @code{:noweb} references by default.
 
 @lisp
 (setq org-babel-default-header-args
@@ -14460,48 +15400,40 @@ blocks.
             (assq-delete-all :noweb org-babel-default-header-args)))
 @end lisp
 
-@node Language-specific header arguments, Header arguments in Org mode properties, System-wide header arguments, Using header arguments
+@node Language-specific header arguments
 @subsubheading Language-specific header arguments
-Each language can define its own set of default header arguments in variable
-@code{org-babel-default-header-args:<lang>}, where @code{<lang>} is the name
-of the language.  See the language-specific documentation available online at
-@uref{http://orgmode.org/worg/org-contrib/babel}.
+Each language can have separate default header arguments by customizing the
+variable @code{org-babel-default-header-args:<lang>}, where @code{<lang>} is
+the name of the language.  For details, see the language-specific online
+documentation at @uref{http://orgmode.org/worg/org-contrib/babel}.
 
-@node Header arguments in Org mode properties, Language-specific header arguments in Org mode properties, Language-specific header arguments, Using header arguments
+@node Header arguments in Org mode properties
 @subsubheading Header arguments in Org mode properties
 
-Buffer-wide header arguments may be specified as properties through the use
-of @code{#+PROPERTY:} lines placed anywhere in an Org mode file (see
-@ref{Property syntax}).
+For header arguments applicable to the buffer, use @code{#+PROPERTY:} lines
+anywhere in the Org mode file (@pxref{Property syntax}).
 
-For example the following would set @code{session} to @code{*R*} (only for R
-code blocks), and @code{results} to @code{silent} for every code block in the
-buffer, ensuring that all execution took place in the same session, and no
-results would be inserted into the buffer.
+The following example sets only for @samp{R} code blocks to @code{session},
+making all the @samp{R} code blocks execute in the same session.  Setting
+@code{results} to @code{silent} ignores the results of executions for all
+blocks, not just @samp{R} code blocks; no results inserted for any block.
 
 @example
 #+PROPERTY: header-args:R  :session *R*
 #+PROPERTY: header-args    :results silent
 @end example
 
-Header arguments read from Org mode properties can also be set on a
-per-subtree basis using property drawers (see @ref{Property syntax}).
 @vindex org-use-property-inheritance
-When properties are used to set default header arguments, they are always
-looked up with inheritance, regardless of the value of
-@code{org-use-property-inheritance}.  Properties are evaluated as seen by the
-outermost call or source block.@footnote{The deprecated syntax for default
-header argument properties, using the name of the header argument as a
-property name directly, evaluates the property as seen by the corresponding
-source block definition.  This behavior has been kept for backwards
-compatibility.}
+Header arguments set through Org's property drawers (@pxref{Property syntax})
+apply at the sub-tree level on down.  Since these property drawers can appear
+anywhere in the file hierarchy, Org uses outermost call or source block to
+resolve the values.  Org ignores @code{org-use-property-inheritance} setting.
 
-In the following example the value of
-the @code{:cache} header argument will default to @code{yes} in all code
-blocks in the subtree rooted at the following heading:
+In this example, @code{:cache} defaults to @code{yes} for all code blocks in
+the sub-tree starting with @samp{sample header}.
 
 @example
-* outline header
+* sample header
   :PROPERTIES:
   :header-args:    :cache yes
   :END:
@@ -14509,17 +15441,16 @@ blocks in the subtree rooted at the following heading:
 
 @kindex C-c C-x p
 @vindex org-babel-default-header-args
-Properties defined in this way override the properties set in
-@code{org-babel-default-header-args} and are applied for all activated
-languages.  It is convenient to use the @code{org-set-property} function
-bound to @kbd{C-c C-x p} to set properties in Org mode documents.
+Properties defined through @code{org-set-property} function, bound to
+@kbd{C-c C-x p}, apply to all active languages.  They override properties set
+in @code{org-babel-default-header-args}.
 
-@node Language-specific header arguments in Org mode properties, Code block specific header arguments, Header arguments in Org mode properties, Using header arguments
-@subsubheading Language-specific header arguments in Org mode properties
+@node Language-specific mode properties
+@subsubheading Language-specific mode properties
 
 Language-specific header arguments are also read from properties
-@code{header-args:<lang>} where @code{<lang>} is the name of the language
-targeted.  As an example
+@code{header-args:<lang>} where @code{<lang>} is the language identifier.
+For example,
 
 @example
 * Heading
@@ -14533,24 +15464,21 @@ targeted.  As an example
   :END:
 @end example
 
-would independently set a default session header argument for R and clojure
-for calls and source blocks under subtree ``Heading'' and change to a
-different clojure setting for evaluations under subtree ``Subheading'', while
-the R session is inherited from ``Heading'' and therefore unchanged.
+would force separate sessions for clojure blocks in Heading and Subheading,
+but use the same session for all @samp{R} blocks.  Blocks in Subheading
+inherit settings from Heading.
 
-@node Code block specific header arguments, Header arguments in function calls, Language-specific header arguments in Org mode properties, Using header arguments
+@node Code block specific header arguments
 @subsubheading Code block specific header arguments
 
-The most common way to assign values to header arguments is at the
-code block level.  This can be done by listing a sequence of header
-arguments and their values as part of the @code{#+BEGIN_SRC} line.
-Properties set in this way override both the values of
-@code{org-babel-default-header-args} and header arguments specified as
-properties.  In the following example, the @code{:results} header argument
-is set to @code{silent}, meaning the results of execution will not be
-inserted in the buffer, and the @code{:exports} header argument is set to
-@code{code}, meaning only the body of the code block will be
-preserved on export to HTML or @LaTeX{}.
+Header arguments are most commonly set at the @samp{src} code block level, on
+the @code{#+BEGIN_SRC} line.  Arguments set at this level take precedence
+over those set in the @code{org-babel-default-header-args} variable, and also
+those set as header properties.
+
+In the following example, setting @code{results} to @code{silent} makes it
+ignore results of the code execution.  Setting @code{:exports} to @code{code}
+exports only the body of the @samp{src} code block to HTML or @LaTeX{}.:
 
 @example
 #+NAME: factorial
@@ -14559,93 +15487,93 @@ fac 0 = 1
 fac n = n * fac (n-1)
 #+END_SRC
 @end example
-Similarly, it is possible to set header arguments for inline code blocks
+
+The same header arguments in an inline @samp{src} code block:
 
 @example
 src_haskell[:exports both]@{fac 5@}
 @end example
 
-Code block header arguments can span multiple lines using @code{#+HEADER:} or
-@code{#+HEADERS:} lines preceding a code block or nested between the
-@code{#+NAME:} line and the @code{#+BEGIN_SRC} line of a named code block.
+Code block header arguments can span multiple lines using @code{#+HEADER:} on
+each line.  Note that Org currently accepts the plural spelling of
+@code{#+HEADER:} only as a convenience for backward-compatibility.  It may be
+removed at some point.
+
 @cindex #+HEADER:
-@cindex #+HEADERS:
 
-Multi-line header arguments on an un-named code block:
+Multi-line header arguments on an unnamed @samp{src} code block:
 
 @example
- #+HEADERS: :var data1=1
- #+BEGIN_SRC emacs-lisp :var data2=2
+#+HEADER: :var data1=1
+#+BEGIN_SRC emacs-lisp :var data2=2
    (message "data1:%S, data2:%S" data1 data2)
- #+END_SRC
+#+END_SRC
 
- #+RESULTS:
- : data1:1, data2:2
+#+RESULTS:
+: data1:1, data2:2
 @end example
 
-Multi-line header arguments on a named code block:
+Multi-line header arguments on a named @samp{src} code block:
 
 @example
-   #+NAME: named-block
-   #+HEADER: :var data=2
-   #+BEGIN_SRC emacs-lisp
-     (message "data:%S" data)
-   #+END_SRC
+#+NAME: named-block
+#+HEADER: :var data=2
+#+BEGIN_SRC emacs-lisp
+  (message "data:%S" data)
+#+END_SRC
 
-   #+RESULTS: named-block
-   : data:2
+#+RESULTS: named-block
+  : data:2
 @end example
 
-@node Header arguments in function calls,  , Code block specific header arguments, Using header arguments
-@comment  node-name,  next,  previous,  up
-@subsubheading Header arguments in function calls
+@node Arguments in function calls
+@subsubheading Arguments in function calls
 
-At the most specific level, header arguments for ``Library of Babel'' or
-@code{#+CALL:} lines can be set as shown in the two examples below.  For more
-information on the structure of @code{#+CALL:} lines see @ref{Evaluating code
-blocks}.
+Header arguments in function calls are the most specific and override all
+other settings in case of an overlap.  They get the highest priority.  Two
+@code{#+CALL:} examples are shown below.  For the complete syntax of
+@code{#+CALL:} lines, see @ref{Evaluating code blocks}.
 
-The following will apply the @code{:exports results} header argument to the
+In this example, @code{:exports results} header argument is applied to the
 evaluation of the @code{#+CALL:} line.
 
 @example
 #+CALL: factorial(n=5) :exports results
 @end example
 
-The following will apply the @code{:session special} header argument to the
-evaluation of the @code{factorial} code block.
+In this example, @code{:session special} header argument is applied to the
+evaluation of @code{factorial} code block.
 
 @example
 #+CALL: factorial[:session special](n=5)
 @end example
 
-@node Specific header arguments,  , Using header arguments, Header arguments
+@node Specific header arguments
 @subsection Specific header arguments
-Header arguments consist of an initial colon followed by the name of the
-argument in lowercase letters.  The following header arguments are defined:
+Org comes with many header arguments common to all languages.  New header
+arguments are added for specific languages as they become available for use
+in @samp{src} code blocks.  A header argument is specified with an initial
+colon followed by the argument's name in lowercase.  Common header arguments
+are:
 
 @menu
-* var::                         Pass arguments to code blocks
-* results::                     Specify the type of results and how they will
-                                be collected and handled
-* file::                        Specify a path for file output
+* var::                         Pass arguments to @samp{src} code blocks
+* results::                     Specify results type; how to collect
+* file::                        Specify a path for output file
 * file-desc::                   Specify a description for file results
-* dir::                         Specify the default (possibly remote)
-                                directory for code block execution
-* exports::                     Export code and/or results
-* tangle::                      Toggle tangling and specify file name
-* mkdirp::                      Toggle creation of parent directories of target
-                                files during tangling
-* comments::                    Toggle insertion of comments in tangled
-                                code files
-* padline::                     Control insertion of padding lines in tangled
-                                code files
-* no-expand::                   Turn off variable assignment and noweb
-                                expansion during tangling
+* file-ext::                    Specify an extension for file output
+* output-dir::                  Specify a directory for output file
+* dir::                         Specify the default directory for code block execution
+* exports::                     Specify exporting code, results, both, none
+* tangle::                      Toggle tangling; or specify file name
+* mkdirp::                      Toggle for parent directory creation for target files during tangling
+* comments::                    Toggle insertion of comments in tangled code files
+* padline::                     Control insertion of padding lines in tangled code files
+* no-expand::                   Turn off variable assignment and noweb expansion during tangling
 * session::                     Preserve the state of code evaluation
 * noweb::                       Toggle expansion of noweb references
 * noweb-ref::                   Specify block's noweb reference resolution target
-* noweb-sep::                   String used to separate noweb references
+* noweb-sep::                   String to separate noweb references
 * cache::                       Avoid re-evaluating unchanged code blocks
 * sep::                         Delimiter for writing tabular results outside Org
 * hlines::                      Handle horizontal lines in tables
@@ -14655,45 +15583,46 @@ argument in lowercase letters.  The following header arguments are defined:
 * tangle-mode::                 Set permission of tangled files
 * eval::                        Limit evaluation of specific code blocks
 * wrap::                        Mark source block evaluation results
-* post::                        Post processing of code block results
-* prologue::                    Text to prepend to code block body
-* epilogue::                    Text to append to code block body
+* post::                        Post processing of results of code block evaluation
+* prologue::                    Text to prepend to body of code block
+* epilogue::                    Text to append to body of code block
 @end menu
 
-Additional header arguments are defined on a language-specific basis, see
-@ref{Languages}.
+For language-specific header arguments, see @ref{Languages}.
 
-@node var, results, Specific header arguments, Specific header arguments
+@node var
 @subsubsection @code{:var}
-The @code{:var} header argument is used to pass arguments to code blocks.
-The specifics of how arguments are included in a code block vary by language;
-these are addressed in the language-specific documentation.  However, the
-syntax used to specify arguments is the same across all languages.  In every
-case, variables require a default value when they are declared.
+@cindex @code{:var}, src header argument
+Use @code{:var} for passing arguments to @samp{src} code blocks.  The
+specifics of variables in @samp{src} code blocks vary by the source language
+and are covered in the language-specific documentation.  The syntax for
+@code{:var}, however, is the same for all languages.  This includes declaring
+a variable, and assigning a default value.
 
-The values passed to arguments can either be literal values, references, or
-Emacs Lisp code (see @ref{var, Emacs Lisp evaluation of variables}).
-References include anything in the Org mode file that takes a @code{#+NAME:}
-or @code{#+RESULTS:} line: tables, lists, @code{#+BEGIN_EXAMPLE} blocks,
-other code blocks and the results of other code blocks.
+Arguments can take values as literals, or as references, or even as Emacs
+Lisp code (@pxref{var, Emacs Lisp evaluation of variables}).  References are
+names from the Org file from the lines @code{#+NAME:} or @code{#+RESULTS:}.
+References can also refer to tables, lists, @code{#+BEGIN_EXAMPLE} blocks,
+other types of @samp{src} code blocks, or the results of execution of
+@samp{src} code blocks.
 
-Note: When a reference is made to another code block, the referenced block
-will be evaluated unless it has current cached results (see @ref{cache}).
+For better performance, Org can cache results of evaluations.  But caching
+comes with severe limitations (@pxref{cache}).
 
-Argument values can be indexed in a manner similar to arrays (see @ref{var,
-Indexable variable values}).
+Argument values are indexed like arrays (@pxref{var, Indexable variable
+values}).
 
-The following syntax is used to pass arguments to code blocks using the
-@code{:var} header argument.
+The following syntax is used to pass arguments to @samp{src} code blocks
+using the @code{:var} header argument.
 
 @example
 :var name=assign
 @end example
 
-The argument, @code{assign}, can either be a literal value, such as a string
-@samp{"string"} or a number @samp{9}, or a reference to a table, a list, a
-literal example, another code block (with or without arguments), or the
-results of evaluating another code block.
+The @code{assign} is a literal value, such as a string @samp{"string"}, a
+number @samp{9}, a reference to a table, a list, a literal example, another
+code block (with or without arguments), or the results from evaluating a code
+block.
 
 Here are examples of passing values by reference:
 
@@ -14719,8 +15648,8 @@ an Org mode table named with either a @code{#+NAME:} line
 @end example
 
 @item list
-a simple list named with a @code{#+NAME:} line (note that nesting is not
-carried through to the source code block)
+a simple list named with a @code{#+NAME:} line.  Note that only the top level
+list items are passed along.  Nested list items are ignored.
 
 @example
 #+NAME: example-list
@@ -14751,9 +15680,9 @@ optionally followed by parentheses
 @end example
 
 @item code block with arguments
-a code block name, as assigned by @code{#+NAME:}, followed by parentheses and
-optional arguments passed within the parentheses following the
-code block name using standard function call syntax
+a @samp{src} code block name, as assigned by @code{#+NAME:}, followed by
+parentheses and optional arguments passed within the parentheses following
+the @samp{src} code block name using standard function call syntax
 
 @example
 #+NAME: double
@@ -14765,7 +15694,7 @@ code block name using standard function call syntax
 : 16
 
 #+NAME: squared
-#+BEGIN_SRC emacs-lisp :var input=double(input=1)
+#+BEGIN_SRC emacs-lisp :var input=double(input=2)
 (* input input)
 #+END_SRC
 
@@ -14797,14 +15726,14 @@ on two lines
 @end table
 
 @subsubheading Indexable variable values
-It is possible to reference portions of variable values by ``indexing'' into
-the variables.  Indexes are 0 based with negative values counting back from
-the end.  If an index is separated by @code{,}s then each subsequent section
-will index into the next deepest nesting or dimension of the value.  Note
-that this indexing occurs @emph{before} other table related header arguments
-like @code{:hlines}, @code{:colnames} and @code{:rownames} are applied.  The
-following example assigns the last cell of the first row the table
-@code{example-table} to the variable @code{data}:
+Indexing variable values enables referencing portions of a variable.  Indexes
+are 0 based with negative values counting backwards from the end.  If an
+index is separated by @code{,}s then each subsequent section will index as
+the next dimension.  Note that this indexing occurs @emph{before} other
+table-related header arguments are applied, such as @code{:hlines},
+@code{:colnames} and @code{:rownames}.  The following example assigns the
+last cell of the first row the table @code{example-table} to the variable
+@code{data}:
 
 @example
 #+NAME: example-table
@@ -14844,10 +15773,9 @@ to @code{data}.
 | 4 | d |
 @end example
 
-Additionally, an empty index, or the single character @code{*}, are both
-interpreted to mean the entire range and as such are equivalent to
-@code{0:-1}, as shown in the following example in which the entire first
-column is referenced.
+To pick the entire range, use an empty index, or the single character
+@code{*}.  @code{0:-1} does the same thing.  Example below shows how to
+reference the first column only.
 
 @example
 #+NAME: example-table
@@ -14864,9 +15792,9 @@ column is referenced.
 | 1 | 2 | 3 | 4 |
 @end example
 
-It is possible to index into the results of code blocks as well as tables.
-Any number of dimensions can be indexed.  Dimensions are separated from one
-another by commas, as shown in the following example.
+Index referencing can be used for tables and code blocks.  Index referencing
+can handle any number of dimensions.  Commas delimit multiple dimensions, as
+shown below.
 
 @example
 #+NAME: 3D
@@ -14886,14 +15814,13 @@ another by commas, as shown in the following example.
 
 @subsubheading Emacs Lisp evaluation of variables
 
-Emacs lisp code can be used to initialize variable values.  When a variable
-value starts with @code{(}, @code{[}, @code{'} or @code{`} it will be
-evaluated as Emacs Lisp and the result of the evaluation will be assigned as
-the variable value.  The following example demonstrates use of this
-evaluation to reliably pass the file-name of the Org mode buffer to a code
-block---note that evaluation of header arguments is guaranteed to take place
-in the original Org mode file, while there is no such guarantee for
-evaluation of the code block body.
+Emacs lisp code can set the values for variables.  To differentiate a value
+from lisp code, Org interprets any value starting with @code{(}, @code{[},
+@code{'} or @code{`} as Emacs Lisp code.  The result of evaluating that code
+is then assigned to the value of that variable.  The following example shows
+how to reliably query and pass file name of the Org mode buffer to a code
+block using headers.  We need reliability here because the file's name could
+change once the code in the block starts executing.
 
 @example
 #+BEGIN_SRC sh :var filename=(buffer-file-name) :exports both
@@ -14901,14 +15828,14 @@ evaluation of the code block body.
 #+END_SRC
 @end example
 
-Note that values read from tables and lists will not be evaluated as
-Emacs Lisp, as shown in the following example.
+Note that values read from tables and lists will not be mistakenly evaluated
+as Emacs Lisp code, as illustrated in the following example.
 
 @example
 #+NAME: table
 | (a b c) |
 
-#+HEADERS: :var data=table[0,0]
+#+HEADER: :var data=table[0,0]
 #+BEGIN_SRC perl
   $data
 #+END_SRC
@@ -14917,167 +15844,171 @@ Emacs Lisp, as shown in the following example.
 : (a b c)
 @end example
 
-@node results, file, var, Specific header arguments
+@node results
 @subsubsection @code{:results}
+@cindex @code{:results}, src header argument
 
-There are four classes of @code{:results} header argument.  Only one option
-per class may be supplied per code block.
+There are four classes of @code{:results} header arguments.  Each @samp{src}
+code block can take only one option per class.
 
 @itemize @bullet
 @item
-@b{collection} header arguments specify how the results should be collected
-from the code block
+@b{collection} for how the results should be collected from the @samp{src}
+code block
 @item
-@b{type} header arguments specify what type of result the code block will
-return---which has implications for how they will be processed before
-insertion into the Org mode buffer
+@b{type} for which type of result the code block will return; affects how Org
+processes and inserts results in the Org buffer
 @item
-@b{format} header arguments specify what type of result the code block will
-return---which has implications for how they will be inserted into the
-Org mode buffer
+@b{format} for the result; affects how Org processes and inserts results in
+the Org buffer
 @item
-@b{handling} header arguments specify how the results of evaluating the code
-block should be handled.
+@b{handling} for processing results after evaluation of the @samp{src} code
+block
 @end itemize
 
 @subsubheading Collection
-The following options are mutually exclusive, and specify how the results
-should be collected from the code block.
+Collection options specify the results.  Choose one of the options; they are
+mutually exclusive.
 
 @itemize @bullet
 @item @code{value}
-This is the default.  The result is the value of the last statement in the
-code block.  This header argument places the evaluation in functional
-mode.  Note that in some languages, e.g., Python, use of this result type
-requires that a @code{return} statement be included in the body of the source
-code block.  E.g., @code{:results value}.
+Default.  Functional mode.  Result is the value returned by the last
+statement in the @samp{src} code block.  Languages like Python may require an
+explicit @code{return} statement in the @samp{src} code block.  Usage
+example: @code{:results value}.
 @item @code{output}
-The result is the collection of everything printed to STDOUT during the
-execution of the code block.  This header argument places the
-evaluation in scripting mode.  E.g., @code{:results output}.
+Scripting mode.  Result is collected from STDOUT during execution of the code
+in the @samp{src} code block.  Usage example: @code{:results output}.
 @end itemize
 
 @subsubheading Type
-
-The following options are mutually exclusive and specify what type of results
-the code block will return.  By default, results are inserted as either a
-table or scalar depending on their value.
+Type tells what result types to expect from the execution of the code
+block.  Choose one of the options; they are mutually exclusive.  The default
+behavior is to automatically determine the result type.
 
 @itemize @bullet
 @item @code{table}, @code{vector}
-The results should be interpreted as an Org mode table.  If a single value is
-returned, it will be converted into a table with one row and one column.
-E.g., @code{:results value table}.
+Interpret the results as an Org table.  If the result is a single value,
+create a table with one row and one column.  Usage example: @code{:results
+value table}.
 @item @code{list}
-The results should be interpreted as an Org mode list.  If a single scalar
-value is returned it will be converted into a list with only one element.
+Interpret the results as an Org list.  If the result is a single value,
+create a list of one element.
 @item @code{scalar}, @code{verbatim}
-The results should be interpreted literally---they will not be
-converted into a table.  The results will be inserted into the Org mode
-buffer as quoted text.  E.g., @code{:results value verbatim}.
+Interpret literally and insert as quoted text.  Do not create a table.  Usage
+example: @code{:results value verbatim}.
 @item @code{file}
-The results will be interpreted as the path to a file, and will be inserted
-into the Org mode buffer as a file link.  E.g., @code{:results value file}.
+Interpret as path to a file.  Inserts a link to the file.  Usage example:
+@code{:results value file}.
 @end itemize
 
 @subsubheading Format
-
-The following options are mutually exclusive and specify what type of results
-the code block will return.  By default, results are inserted according to the
-type as specified above.
+Format pertains to the type of the result returned by the @samp{src} code
+block.  Choose one of the options; they are mutually exclusive.  The default
+follows from the type specified above.
 
 @itemize @bullet
 @item @code{raw}
-The results are interpreted as raw Org mode code and are inserted directly
-into the buffer.  If the results look like a table they will be aligned as
-such by Org mode.  E.g., @code{:results value raw}.
+Interpreted as raw Org mode.  Inserted directly into the buffer.  Aligned if
+it is a table.  Usage example: @code{:results value raw}.
 @item @code{org}
-The results are will be enclosed in a @code{BEGIN_SRC org} block.
-They are not comma-escaped by default but they will be if you hit @kbd{TAB}
-in the block and/or if you export the file.  E.g., @code{:results value org}.
+Results enclosed in a @code{BEGIN_SRC org} block.  For comma-escape, either
+@kbd{TAB} in the block, or export the file.  Usage example: @code{:results
+value org}.
 @item @code{html}
-Results are assumed to be HTML and will be enclosed in a @code{BEGIN_HTML}
-block.  E.g., @code{:results value html}.
+Results enclosed in a @code{BEGIN_EXPORT html} block.  Usage example:
+@code{:results value html}.
 @item @code{latex}
-Results assumed to be @LaTeX{} and are enclosed in a @code{BEGIN_LaTeX} block.
-E.g., @code{:results value latex}.
+Results enclosed in a @code{BEGIN_EXPORT latex} block.  Usage example:
+@code{:results value latex}.
 @item @code{code}
-Result are assumed to be parsable code and are enclosed in a code block.
-E.g., @code{:results value code}.
+Result enclosed in a @samp{src} code block.  Useful for parsing.  Usage
+example: @code{:results value code}.
 @item @code{pp}
-The result is converted to pretty-printed code and is enclosed in a code
-block.  This option currently supports Emacs Lisp, Python, and Ruby.  E.g.,
+Result converted to pretty-print source code.  Enclosed in a @samp{src} code
+block.  Languages supported: Emacs Lisp, Python, and Ruby.  Usage example:
 @code{:results value pp}.
 @item @code{drawer}
-The result is wrapped in a RESULTS drawer.  This can be useful for
-inserting @code{raw} or @code{org} syntax results in such a way that their
-extent is known and they can be automatically removed or replaced.
+Result wrapped in a RESULTS drawer.  Useful for containing @code{raw} or
+@code{org} results for later scripting and automated processing.  Usage
+example: @code{:results value drawer}.
 @end itemize
 
 @subsubheading Handling
-The following results options indicate what happens with the
-results once they are collected.
+Handling options after collecting the results.
 
 @itemize @bullet
 @item @code{silent}
-The results will be echoed in the minibuffer but will not be inserted into
-the Org mode buffer.  E.g., @code{:results output silent}.
+Do not insert results in the Org mode buffer, but echo them in the
+minibuffer.  Usage example: @code{:results output silent}.
 @item @code{replace}
-The default value.  Any existing results will be removed, and the new results
-will be inserted into the Org mode buffer in their place.  E.g.,
-@code{:results output replace}.
+Default.  Insert results in the Org buffer.  Remove previous results.  Usage
+example: @code{:results output replace}.
 @item @code{append}
-If there are pre-existing results of the code block then the new results will
-be appended to the existing results.  Otherwise the new results will be
-inserted as with @code{replace}.
+Append results to the Org buffer.  Latest results are at the bottom.  Does
+not remove previous results.  Usage example: @code{:results output append}.
 @item @code{prepend}
-If there are pre-existing results of the code block then the new results will
-be prepended to the existing results.  Otherwise the new results will be
-inserted as with @code{replace}.
+Prepend results to the Org buffer.  Latest results are at the top.  Does not
+remove previous results.  Usage example: @code{:results output prepend}.
 @end itemize
 
-@node file, file-desc, results, Specific header arguments
+@node file
 @subsubsection @code{:file}
+@cindex @code{:file}, src header argument
+
+An external @code{:file} that saves the results of execution of the code
+block.  The @code{:file} is either a file name or two strings, where the
+first is the file name and the second is the description.  A link to the file
+is inserted.  It uses an Org mode style @code{[[file:]]} link (@pxref{Link
+format}).  Some languages, such as @samp{R}, @samp{dot}, @samp{ditaa}, and
+@samp{gnuplot}, automatically wrap the source code in additional boilerplate
+code.  Such code wrapping helps recreate the output, especially graphics
+output, by executing just the @code{:file} contents.
+
+@node file-desc
+@subsubsection @code{:file-desc}
 
-The header argument @code{:file} is used to specify an external file in which
-to save code block results.  After code block evaluation an Org mode style
-@code{[[file:]]} link (see @ref{Link format}) to the file will be inserted
-into the Org mode buffer.  Some languages including R, gnuplot, dot, and
-ditaa provide special handling of the @code{:file} header argument
-automatically wrapping the code block body in the boilerplate code required
-to save output to the specified file.  This is often useful for saving
-graphical output of a code block to the specified file.
+A description of the results file.  Org uses this description for the link
+(see @ref{Link format}) it inserts in the Org file.  If the @code{:file-desc}
+has no value, Org will use file name for both the ``link'' and the
+``description'' portion of the Org mode link.
 
-The argument to @code{:file} should be either a string specifying the path to
-a file, or a list of two strings in which case the first element of the list
-should be the path to a file and the second a description for the link.
+@node file-ext
+@subsubsection @code{:file-ext}
+@cindex @code{:file-ext}, src header argument
 
-@node file-desc, dir, file, Specific header arguments
-@subsubsection @code{:file-desc}
+File name extension for the output file.  Org generates the file's complete
+name, and extension by combining @code{:file-ext}, @code{#+NAME:} of the
+source block, and the @ref{output-dir} header argument.  To override this
+auto generated file name, use the @code{:file} header argument.
 
-The value of the @code{:file-desc} header argument is used to provide a
-description for file code block results which are inserted as Org mode links
-(see @ref{Link format}).  If the @code{:file-desc} header argument is given
-with no value the link path will be placed in both the ``link'' and the
-``description'' portion of the Org mode link.
+@node output-dir
+@subsubsection @code{:output-dir}
+@cindex @code{:output-dir}, src header argument
+
+Specifies the @code{:output-dir} for the results file.  Org accepts an
+absolute path (beginning with @code{/}) or a relative directory (without
+@code{/}).  The value can be combined with @code{#+NAME:} of the source block
+and @ref{file} or @ref{file-ext} header arguments.
 
-@node dir, exports, file-desc, Specific header arguments
+@node dir
 @subsubsection @code{:dir} and remote execution
+@cindex @code{:dir}, src header argument
 
 While the @code{:file} header argument can be used to specify the path to the
-output file, @code{:dir} specifies the default directory during code block
-execution.  If it is absent, then the directory associated with the current
-buffer is used.  In other words, supplying @code{:dir path} temporarily has
-the same effect as changing the current directory with @kbd{M-x cd path RET}, and
-then not supplying @code{:dir}.  Under the surface, @code{:dir} simply sets
-the value of the Emacs variable @code{default-directory}.
+output file, @code{:dir} specifies the default directory during @samp{src}
+code block execution.  If it is absent, then the directory associated with
+the current buffer is used.  In other words, supplying @code{:dir path}
+temporarily has the same effect as changing the current directory with
+@kbd{M-x cd path RET}, and then not supplying @code{:dir}.  Under the
+surface, @code{:dir} simply sets the value of the Emacs variable
+@code{default-directory}.
 
-When using @code{:dir}, you should supply a relative path for file output
-(e.g., @code{:file myfile.jpg} or @code{:file results/myfile.jpg}) in which
-case that path will be interpreted relative to the default directory.
+When using @code{:dir}, relative paths (for example, @code{:file myfile.jpg}
+or @code{:file results/myfile.jpg}) become relative to the default directory.
 
-In other words, if you want your plot to go into a folder called @file{Work}
-in your home directory, you could use
+For example, to save the plot file in the @samp{Work} folder of the home
+directory (notice tilde is expanded):
 
 @example
 #+BEGIN_SRC R :file myplot.png :dir ~/Work
@@ -15086,8 +16017,8 @@ matplot(matrix(rnorm(100), 10), type="l")
 @end example
 
 @subsubheading Remote execution
-A directory on a remote machine can be specified using tramp file syntax, in
-which case the code will be evaluated on the remote machine.  An example is
+To evaluate the @samp{src} code block on a remote machine, supply a remote s
+directory name using @samp{Tramp} syntax.  For example:
 
 @example
 #+BEGIN_SRC R :file plot.png :dir /scp:dand@@yakuba.princeton.edu:
@@ -15095,189 +16026,196 @@ plot(1:10, main=system("hostname", intern=TRUE))
 #+END_SRC
 @end example
 
-Text results will be returned to the local Org mode buffer as usual, and file
-output will be created on the remote machine with relative paths interpreted
-relative to the remote directory.  An Org mode link to the remote file will be
-created.
-
-So, in the above example a plot will be created on the remote machine,
-and a link of the following form will be inserted in the org buffer:
+Org first captures the text results as usual for insertion in the Org file.
+Then Org also inserts a link to the remote file, thanks to Emacs
+@samp{Tramp}.  Org constructs the remote path to the file name from
+@code{:dir} and @code{default-directory}, as illustrated here:
 
 @example
 [[file:/scp:dand@@yakuba.princeton.edu:/home/dand/plot.png][plot.png]]
 @end example
 
-Most of this functionality follows immediately from the fact that @code{:dir}
-sets the value of the Emacs variable @code{default-directory}, thanks to
-tramp.  Those using XEmacs, or GNU Emacs prior to version 23 may need to
-install tramp separately in order for these features to work correctly.
 
-@subsubheading Further points
+@subsubheading Some more warnings
 
 @itemize @bullet
 @item
-If @code{:dir} is used in conjunction with @code{:session}, although it will
-determine the starting directory for a new session as expected, no attempt is
-currently made to alter the directory associated with an existing session.
+When @code{:dir} is used with @code{:session}, Org sets the starting
+directory for a new session.  But Org will not alter the directory of an
+already existing session.
 @item
-@code{:dir} should typically not be used to create files during export with
-@code{:exports results} or @code{:exports both}.  The reason is that, in order
-to retain portability of exported material between machines, during export
-links inserted into the buffer will @emph{not} be expanded against @code{default
-directory}.  Therefore, if @code{default-directory} is altered using
-@code{:dir}, it is probable that the file will be created in a location to
-which the link does not point.
+Do not use @code{:dir} with @code{:exports results} or with @code{:exports
+both} to avoid Org inserting incorrect links to remote files.  That is because
+Org does not expand @code{default directory} to avoid some underlying
+portability issues.
 @end itemize
 
-@node exports, tangle, dir, Specific header arguments
+@node exports
 @subsubsection @code{:exports}
+@cindex @code{:exports}, src header argument
 
-The @code{:exports} header argument specifies what should be included in HTML
-or @LaTeX{} exports of the Org mode file.
+The @code{:exports} header argument is to specify if that part of the Org
+file is exported to, say, HTML or @LaTeX{} formats.  Note that
+@code{:exports} affects only @samp{src} code blocks and not inline code.
 
 @itemize @bullet
 @item @code{code}
-The default.  The body of code is included into the exported file.  E.g.,
+The default.  The body of code is included into the exported file.  Example:
 @code{:exports code}.
 @item @code{results}
-The result of evaluating the code is included in the exported file.  E.g.,
-@code{:exports results}.
+The results of evaluation of the code is included in the exported file.
+Example: @code{:exports results}.
 @item @code{both}
-Both the code and results are included in the exported file.  E.g.,
-@code{:exports both}.
+Both the code and results of evaluation are included in the exported file.
+Example: @code{:exports both}.
 @item @code{none}
-Nothing is included in the exported file.  E.g., @code{:exports none}.
+Neither the code nor the results of evaluation is included in the exported
+file.  Whether the code is evaluated at all depends on other
+options.  Example: @code{:exports none}.
 @end itemize
 
-@node tangle, mkdirp, exports, Specific header arguments
+@node tangle
 @subsubsection @code{:tangle}
+@cindex @code{:tangle}, src header argument
 
-The @code{:tangle} header argument specifies whether or not the code
-block should be included in tangled extraction of source code files.
+The @code{:tangle} header argument specifies if the @samp{src} code block is
+exported to source file(s).
 
 @itemize @bullet
 @item @code{tangle}
-The code block is exported to a source code file named after the full path
-(including the directory) and file name (w/o extension) of the Org mode file.
-E.g., @code{:tangle yes}.
+Export the @samp{src} code block to source file.  The file name for the
+source file is derived from the name of the Org file, and the file extension
+is derived from the source code language identifier.  Example: @code{:tangle
+yes}.
 @item @code{no}
-The default.  The code block is not exported to a source code file.
-E.g., @code{:tangle no}.
+The default.  Do not extract the code a source code file.  Example:
+@code{:tangle no}.
 @item other
-Any other string passed to the @code{:tangle} header argument is interpreted
-as a path (directory and file name relative to the directory of the Org mode
-file) to which the block will be exported.  E.g., @code{:tangle path}.
+Export the @samp{src} code block to source file whose file name is derived
+from any string passed to the @code{:tangle} header argument.  Org derives
+the file name as being relative to the directory of the Org file's location.
+Example: @code{:tangle path}.
 @end itemize
 
-@node mkdirp, comments, tangle, Specific header arguments
+@node mkdirp
 @subsubsection @code{:mkdirp}
+@cindex @code{:mkdirp}, src header argument
 
-The @code{:mkdirp} header argument can be used to create parent directories
-of tangled files when missing.  This can be set to @code{yes} to enable
-directory creation or to @code{no} to inhibit directory creation.
+The @code{:mkdirp} header argument creates parent directories for tangled
+files if the directory does not exist.  @code{yes} enables directory creation
+and @code{no} inhibits directory creation.
 
-@node comments, padline, mkdirp, Specific header arguments
+@node comments
 @subsubsection @code{:comments}
-By default code blocks are tangled to source-code files without any insertion
-of comments beyond those which may already exist in the body of the code
-block.  The @code{:comments} header argument can be set as follows to control
-the insertion of extra comments into the tangled code file.
+@cindex @code{:comments}, src header argument
+Controls inserting comments into tangled files.  These are above and beyond
+whatever comments may already exist in the @samp{src} code block.
 
 @itemize @bullet
 @item @code{no}
-The default.  No extra comments are inserted during tangling.
+The default.  Do not insert any extra comments during tangling.
 @item @code{link}
-The code block is wrapped in comments which contain pointers back to the
-original Org file from which the code was tangled.
+Wrap the @samp{src} code block in comments.  Include links pointing back to
+the place in the Org file from where the code was tangled.
 @item @code{yes}
-A synonym for ``link'' to maintain backwards compatibility.
+Kept for backward compatibility; same as ``link''.
 @item @code{org}
-Include text from the Org mode file as a comment.
-The text is picked from the leading context of the tangled code and is
-limited by the nearest headline or source block as the case may be.
+Nearest headline text from Org file is inserted as comment.  The exact text
+that is inserted is picked from the leading context of the source block.
 @item @code{both}
-Turns on both the ``link'' and ``org'' comment options.
+Includes both ``link'' and ``org'' comment options.
 @item @code{noweb}
-Turns on the ``link'' comment option, and additionally wraps expanded noweb
-references in the code block body in link comments.
+Includes ``link'' comment option, expands noweb references, and wraps them in
+link comments inside the body of the @samp{src} code block.
 @end itemize
 
-@node padline, no-expand, comments, Specific header arguments
+@node padline
 @subsubsection @code{:padline}
-Control in insertion of padding lines around code block bodies in tangled
-code files.  The default value is @code{yes} which results in insertion of
-newlines before and after each tangled code block.  The following arguments
-are accepted.
-
+@cindex @code{:padline}, src header argument
+Control insertion of newlines to pad @samp{src} code blocks in the tangled
+file.
 @itemize @bullet
 @item @code{yes}
-Insert newlines before and after each code block body in tangled code files.
+Default.  Insert a newline before and after each @samp{src} code block in the
+tangled file.
 @item @code{no}
-Do not insert any newline padding in tangled output.
+Do not insert newlines to pad the tangled @samp{src} code blocks.
 @end itemize
 
-@node no-expand, session, padline, Specific header arguments
+@node no-expand
 @subsubsection @code{:no-expand}
-
-By default, code blocks are expanded with @code{org-babel-expand-src-block}
-during tangling.  This has the effect of assigning values to variables
-specified with @code{:var} (see @ref{var}), and of replacing ``noweb''
-references (see @ref{Noweb reference syntax}) with their targets.  The
-@code{:no-expand} header argument can be used to turn off this behavior.
-
-@node session, noweb, no-expand, Specific header arguments
+@cindex @code{:no-expand}, src header argument
+
+By default Org expands @samp{src} code blocks during tangling.  The
+@code{:no-expand} header argument turns off such expansions.  Note that one
+side-effect of expansion by @code{org-babel-expand-src-block} also assigns
+values to @code{:var} (@pxref{var}) variables.  Expansions also replace
+``noweb'' references with their targets (@pxref{Noweb reference syntax}).
+Some of these expansions may cause premature assignment, hence this option.
+This option makes a difference only for tangling.  It has no effect when
+exporting since @samp{src} code blocks for execution have to be expanded
+anyway.
+
+@node session
 @subsubsection @code{:session}
+@cindex @code{:session}, src header argument
 
-The @code{:session} header argument starts a session for an interpreted
-language where state is preserved.
-
-By default, a session is not started.
+The @code{:session} header argument is for running multiple source code
+blocks under one session.  Org runs @samp{src} code blocks with the same
+session name in the same interpreter process.
 
-A string passed to the @code{:session} header argument will give the session
-a name.  This makes it possible to run concurrent sessions for each
-interpreted language.
+@itemize @bullet
+@item @code{none}
+Default.  Each @samp{src} code block gets a new interpreter process to
+execute.  The process terminates once the block is evaluated.
+@item @code{other}
+Any string besides @code{none} turns that string into the name of that
+session.  For example, @code{:session mysession} names it @samp{mysession}.
+If @code{:session} has no argument, then the session name is derived from the
+source language identifier.  Subsequent blocks with the same source code
+language use the same session.  Depending on the language, state variables,
+code from other blocks, and the overall interpreted environment may be
+shared.  Some interpreted languages support concurrent sessions when
+subsequent source code language blocks change session names.
+@end itemize
 
-@node noweb, noweb-ref, session, Specific header arguments
+@node noweb
 @subsubsection @code{:noweb}
+@cindex @code{:noweb}, src header argument
 
 The @code{:noweb} header argument controls expansion of ``noweb'' syntax
-references (see @ref{Noweb reference syntax}) when the code block is
-evaluated, tangled, or exported.  The @code{:noweb} header argument can have
-one of the five values: @code{no}, @code{yes}, @code{tangle}, or
-@code{no-export} @code{strip-export}.
+references (@pxref{Noweb reference syntax}).  Expansions occur when source
+code blocks are evaluated, tangled, or exported.
 
 @itemize @bullet
 @item @code{no}
-The default.  ``Noweb'' syntax references in the body of the code block will
-not be expanded before the code block is evaluated, tangled or exported.
+Default.  No expansion of ``Noweb'' syntax references in the body of the code
+when evaluating, tangling, or exporting.
 @item @code{yes}
-``Noweb'' syntax references in the body of the code block will be
-expanded before the code block is evaluated, tangled or exported.
+Expansion of ``Noweb'' syntax references in the body of the @samp{src} code
+block when evaluating, tangling, or exporting.
 @item @code{tangle}
-``Noweb'' syntax references in the body of the code block will be expanded
-before the code block is tangled.  However, ``noweb'' syntax references will
-not be expanded when the code block is evaluated or exported.
+Expansion of ``Noweb'' syntax references in the body of the @samp{src} code
+block when tangling.  No expansion when evaluating or exporting.
 @item @code{no-export}
-``Noweb'' syntax references in the body of the code block will be expanded
-before the block is evaluated or tangled.  However, ``noweb'' syntax
-references will not be expanded when the code block is exported.
+Expansion of ``Noweb'' syntax references in the body of the @samp{src} code
+block when evaluating or tangling.  No expansion when exporting.
 @item @code{strip-export}
-``Noweb'' syntax references in the body of the code block will be expanded
-before the block is evaluated or tangled.  However, ``noweb'' syntax
-references will be removed when the code block is exported.
+Expansion of ``Noweb'' syntax references in the body of the @samp{src} code
+block when expanding prior to evaluating or tangling.  Removes ``noweb''
+syntax references when exporting.
 @item @code{eval}
-``Noweb'' syntax references in the body of the code block will only be
-expanded before the block is evaluated.
+Expansion of ``Noweb'' syntax references in the body of the @samp{src} code
+block only before evaluating.
 @end itemize
 
 @subsubheading Noweb prefix lines
-Noweb insertions are now placed behind the line prefix of the
-@code{<<reference>>}.
-This behavior is illustrated in the following example.  Because the
-@code{<<example>>} noweb reference appears behind the SQL comment syntax,
-each line of the expanded noweb reference will be commented.
+Noweb insertions now honor prefix characters that appear before
+@code{<<reference>>}.  This behavior is illustrated in the following example.
+Because the @code{<<example>>} noweb reference appears behind the SQL comment
+syntax, each line of the expanded noweb reference will be commented.
 
-This code block:
+This @samp{src} code block:
 
 @example
 -- <<example>>
@@ -15290,23 +16228,20 @@ expands to:
 -- multi-line body of example
 @end example
 
-Note that noweb replacement text that does not contain any newlines will not
-be affected by this change, so it is still possible to use inline noweb
-references.
+Since this change will not affect noweb replacement text without newlines in
+them, inline noweb references are acceptable.
 
-@node noweb-ref, noweb-sep, noweb, Specific header arguments
+@node noweb-ref
 @subsubsection @code{:noweb-ref}
-When expanding ``noweb'' style references the bodies of all code block with
-@emph{either} a block name matching the reference name @emph{or} a
-@code{:noweb-ref} header argument matching the reference name will be
-concatenated together to form the replacement text.
+@cindex @code{:noweb-ref}, src header argument
 
-By setting this header argument at the sub-tree or file level, simple code
-block concatenation may be achieved.  For example, when tangling the
-following Org mode file, the bodies of code blocks will be concatenated into
-the resulting pure code file@footnote{(The example needs property inheritance
-to be turned on for the @code{noweb-ref} property, see @ref{Property
-inheritance}).}.
+When expanding ``noweb'' style references, Org concatenates @samp{src} code
+blocks by matching the reference name to either the block name or the
+@code{:noweb-ref} header argument.
+
+For simple concatenation, set this @code{:noweb-ref} header argument at the
+sub-tree or file level.  In the example Org file shown next, the body of the
+source code in each block is extracted for concatenation to a pure code file.
 
 @example
  #+BEGIN_SRC sh :tangle yes :noweb yes :shebang #!/bin/sh
@@ -15314,7 +16249,7 @@ inheritance}).}.
  #+END_SRC
  * the mount point of the fullest disk
    :PROPERTIES:
-   :noweb-ref: fullest-disk
+   :header-args: :noweb-ref fullest-disk
    :END:
 
  ** query all mounted disks
@@ -15333,45 +16268,60 @@ inheritance}).}.
  #+END_SRC
 @end example
 
-The @code{:noweb-sep} (see @ref{noweb-sep}) header argument holds the string
-used to separate accumulate noweb references like those above.  By default a
-newline is used.
-
-@node noweb-sep, cache, noweb-ref, Specific header arguments
+@node noweb-sep
 @subsubsection @code{:noweb-sep}
+@cindex @code{:noweb-sep}, src header argument
 
-The @code{:noweb-sep} header argument holds the string used to separate
-accumulate noweb references (see @ref{noweb-ref}).  By default a newline is
-used.
+By default a newline separates each noweb reference concatenation.  To change
+this newline separator, edit the @code{:noweb-sep} (@pxref{noweb-sep}) header
+argument.
 
-@node cache, sep, noweb-sep, Specific header arguments
+@node cache
 @subsubsection @code{:cache}
-
-The @code{:cache} header argument controls the use of in-buffer caching of
-the results of evaluating code blocks.  It can be used to avoid re-evaluating
-unchanged code blocks.  Note that the @code{:cache} header argument will not
-attempt to cache results when the @code{:session} header argument is used,
-because the results of the code block execution may be stored in the session
-outside of the Org mode buffer.  The @code{:cache} header argument can have
-one of two values: @code{yes} or @code{no}.
+@cindex @code{:cache}, src header argument
+
+The @code{:cache} header argument is for caching results of evaluating code
+blocks.  Caching results can avoid re-evaluating @samp{src} code blocks that
+have not changed since the previous run.  To benefit from the cache and avoid
+redundant evaluations, the source block must have a result already present in
+the buffer, and neither the header arguments (including the value of
+@code{:var} references) nor the text of the block itself has changed since
+the result was last computed.  This feature greatly helps avoid long-running
+calculations.  For some edge cases, however, the cached results may not be
+reliable.
+
+The caching feature is best for when @samp{src} blocks are pure functions,
+that is functions that return the same value for the same input arguments
+(@pxref{var}), and that do not have side effects, and do not rely on external
+variables other than the input arguments.  Functions that depend on a timer,
+file system objects, and random number generators are clearly unsuitable for
+caching.
+
+A note of warning: when @code{:cache} is used for a @code{:session}, caching
+may cause unexpected results.
+
+When the caching mechanism tests for any source code changes, it will not
+expand ``noweb'' style references (@pxref{Noweb reference syntax}).  For
+reasons why, see @uref{http://thread.gmane.org/gmane.emacs.orgmode/79046}.
+
+The @code{:cache} header argument can have one of two values: @code{yes} or
+@code{no}.
 
 @itemize @bullet
 @item @code{no}
-The default.  No caching takes place, and the code block will be evaluated
-every time it is called.
+Default.  No caching of results; @samp{src} code block evaluated every time.
 @item @code{yes}
-Every time the code block is run a SHA1 hash of the code and arguments
-passed to the block will be generated.  This hash is packed into the
-@code{#+RESULTS:} line and will be checked on subsequent
-executions of the code block.  If the code block has not
-changed since the last time it was evaluated, it will not be re-evaluated.
+Whether to run the code or return the cached results is determined by
+comparing the SHA1 hash value of the combined @samp{src} code block and
+arguments passed to it.  This hash value is packed on the @code{#+RESULTS:}
+line from previous evaluation.  When hash values match, Org does not evaluate
+the @samp{src} code block.  When hash values mismatch, Org evaluates the
+@samp{src} code block, inserts the results, recalculates the hash value, and
+updates @code{#+RESULTS:} line.
 @end itemize
 
-Code block caches notice if the value of a variable argument
-to the code block has changed.  If this is the case, the cache is
-invalidated and the code block is re-run.  In the following example,
-@code{caller} will not be re-run unless the results of @code{random} have
-changed since it was last run.
+In this example, both functions are cached.  But @code{caller} runs only if
+the result from @code{random} has changed since the last run.
 
 @example
  #+NAME: random
@@ -15391,32 +16341,31 @@ changed since it was last run.
  0.254227238707244
 @end example
 
-@node sep, hlines, cache, Specific header arguments
+@node sep
 @subsubsection @code{:sep}
+@cindex @code{:sep}, src header argument
 
-The @code{:sep} header argument can be used to control the delimiter used
-when writing tabular results out to files external to Org mode.  This is used
-either when opening tabular results of a code block by calling the
-@code{org-open-at-point} function bound to @kbd{C-c C-o} on the code block,
-or when writing code block results to an external file (see @ref{file})
-header argument.
+The @code{:sep} header argument is the delimiter for saving results as tables
+to files (@pxref{file}) external to Org mode.  Org defaults to tab delimited
+output.  The function, @code{org-open-at-point}, which is bound to @kbd{C-c
+C-o}, also uses @code{:sep} for opening tabular results.
 
-By default, when @code{:sep} is not specified output tables are tab
-delimited.
-
-@node hlines, colnames, sep, Specific header arguments
+@node hlines
 @subsubsection @code{:hlines}
+@cindex @code{:hlines}, src header argument
 
-Tables are frequently represented with one or more horizontal lines, or
-hlines.  The @code{:hlines} argument to a code block accepts the
-values @code{yes} or @code{no}, with a default value of @code{no}.
+In-between each table row or below the table headings, sometimes results have
+horizontal lines, which are also known as hlines.  The @code{:hlines}
+argument with the value @code{yes} accepts such lines.  The default is
+@code{no}.
 
 @itemize @bullet
 @item @code{no}
-Strips horizontal lines from the input table.  In most languages this is the
-desired effect because an @code{hline} symbol is interpreted as an unbound
-variable and raises an error.  Setting @code{:hlines no} or relying on the
-default value yields the following results.
+Strips horizontal lines from the input table.  For most code, this is
+desirable, or else those @code{hline} symbols raise unbound variable errors.
+
+The default is @code{:hlines no}.  The example shows hlines removed from the
+input table.
 
 @example
 #+NAME: many-cols
@@ -15438,7 +16387,7 @@ default value yields the following results.
 @end example
 
 @item @code{yes}
-Leaves hlines in the table.  Setting @code{:hlines yes} has this effect.
+For @code{:hlines yes}, the example shows hlines unchanged.
 
 @example
 #+NAME: many-cols
@@ -15462,20 +16411,20 @@ Leaves hlines in the table.  Setting @code{:hlines yes} has this effect.
 @end example
 @end itemize
 
-@node colnames, rownames, hlines, Specific header arguments
+@node colnames
 @subsubsection @code{:colnames}
+@cindex @code{:colnames}, src header argument
 
-The @code{:colnames} header argument accepts the values @code{yes},
-@code{no}, or @code{nil} for unassigned.  The default value is @code{nil}.
-Note that the behavior of the @code{:colnames} header argument may differ
-across languages.
+The @code{:colnames} header argument accepts @code{yes}, @code{no}, or
+@code{nil} values.  The default value is @code{nil}, which is unassigned.
+But this header argument behaves differently depending on the source code
+language.
 
 @itemize @bullet
 @item @code{nil}
-If an input table looks like it has column names
-(because its second row is an hline), then the column
-names will be removed from the table before
-processing, then reapplied to the results.
+If an input table has column names (because the second row is an hline), then
+Org removes the column names, processes the table, puts back the column
+names, and then writes the table to the results block.
 
 @example
 #+NAME: less-cols
@@ -15496,33 +16445,36 @@ processing, then reapplied to the results.
 | c* |
 @end example
 
-Please note that column names are not removed before the table is indexed
-using variable indexing @xref{var, Indexable variable values}.
+Note that column names have to accounted for when using variable indexing
+(@pxref{var, Indexable variable values}) because column names are not removed
+for indexing.
 
 @item @code{no}
-No column name pre-processing takes place
+Do not pre-process column names.
 
 @item @code{yes}
-Column names are removed and reapplied as with @code{nil} even if the table
-does not ``look like'' it has column names (i.e., the second row is not an
-hline)
+For an input table that has no hlines, process it like the @code{nil}
+value.  That is, Org removes the column names, processes the table, puts back
+the column names, and then writes the table to the results block.
 @end itemize
 
-@node rownames, shebang, colnames, Specific header arguments
+@node rownames
 @subsubsection @code{:rownames}
+@cindex @code{:rownames}, src header argument
 
-The @code{:rownames} header argument can take on the values @code{yes} or
-@code{no}, with a default value of @code{no}.  Note that Emacs Lisp code
-blocks ignore the @code{:rownames} header argument entirely given the ease
-with which tables with row names may be handled directly in Emacs Lisp.
+The @code{:rownames} header argument can take on values @code{yes} or
+@code{no} values.  The default is @code{no}.  Note that @code{emacs-lisp}
+code blocks ignore @code{:rownames} header argument because of the ease of
+table-handling in Emacs.
 
 @itemize @bullet
 @item @code{no}
-No row name pre-processing will take place.
+Org will not pre-process row names.
 
 @item @code{yes}
-The first column of the table is removed from the table before processing,
-and is then reapplied to the results.
+If an input table has row names, then Org removes the row names, processes
+the table, puts back the row names, and then writes the table to the results
+block.
 
 @example
 #+NAME: with-rownames
@@ -15539,82 +16491,88 @@ and is then reapplied to the results.
 | two | 16 | 17 | 18 | 19 | 20 |
 @end example
 
-Please note that row names are not removed before the table is indexed using
-variable indexing @xref{var, Indexable variable values}.
+Note that row names have to accounted for when using variable indexing
+(@pxref{var, Indexable variable values}) because row names are not removed
+for indexing.
 
 @end itemize
 
-@node shebang, tangle-mode, rownames, Specific header arguments
+@node shebang
 @subsubsection @code{:shebang}
+@cindex @code{:shebang}, src header argument
 
-Setting the @code{:shebang} header argument to a string value
-(e.g., @code{:shebang "#!/bin/bash"}) causes the string to be inserted as the
-first line of any tangled file holding the code block, and the file
-permissions of the tangled file are set to make it executable.
-
+This header argument can turn results into executable script files.  By
+setting the @code{:shebang} header argument to a string value (for example,
+@code{:shebang "#!/bin/bash"}), Org inserts that string as the first line of
+the tangled file that the @samp{src} code block is extracted to.  Org then
+turns on the tangled file's executable permission.
 
-@node tangle-mode, eval, shebang, Specific header arguments
+@node tangle-mode
 @subsubsection @code{:tangle-mode}
+@cindex @code{:tangle-mode}, src header argument
+
+The @code{tangle-mode} header argument specifies what permissions to set for
+tangled files by @code{set-file-modes}.  For example, to make read-only
+tangled file, use @code{:tangle-mode (identity #o444)}.  To make it
+executable, use @code{:tangle-mode (identity #o755)}.
+
+On @samp{src} code blocks with @code{shebang} (@pxref{shebang}) header
+argument, Org will automatically set the tangled file to executable
+permissions.  But this can be overridden with custom permissions using
+@code{tangle-mode} header argument.
 
-The @code{tangle-mode} header argument controls the permission set on tangled
-files.  The value of this header argument will be passed to
-@code{set-file-modes}.  For example, to set a tangled file as read only use
-@code{:tangle-mode (identity #o444)}, or to set a tangled file as executable
-use @code{:tangle-mode (identity #o755)}.  Blocks with @code{shebang}
-(@ref{shebang}) header arguments will automatically be made executable unless
-the @code{tangle-mode} header argument is also used.  The behavior is
-undefined if multiple code blocks with different values for the
-@code{tangle-mode} header argument are tangled to the same file.
-
-@node eval, wrap, tangle-mode, Specific header arguments
+When multiple @samp{src} code blocks tangle to a single file with different
+and conflicting @code{tangle-mode} header arguments, Org's behavior is
+undefined.
+
+@node eval
 @subsubsection @code{:eval}
-The @code{:eval} header argument can be used to limit the evaluation of
-specific code blocks.  The @code{:eval} header argument can be useful for
-protecting against the evaluation of dangerous code blocks or to ensure that
-evaluation will require a query regardless of the value of the
-@code{org-confirm-babel-evaluate} variable.  The possible values of
-@code{:eval} and their effects are shown below.
+@cindex @code{:eval}, src header argument
+The @code{:eval} header argument can limit evaluation of specific code
+blocks.  It is useful for protection against evaluating untrusted @samp{src}
+code blocks by prompting for a confirmation.  This protection is independent
+of the @code{org-confirm-babel-evaluate} setting.
 
 @table @code
 @item never or no
-The code block will not be evaluated under any circumstances.
+Org will never evaluate this @samp{src} code block.
 @item query
-Evaluation of the code block will require a query.
+Org prompts the user for permission to evaluate this @samp{src} code block.
 @item never-export or no-export
-The code block will not be evaluated during export but may still be called
-interactively.
+Org will not evaluate this @samp{src} code block when exporting, yet the user
+can evaluate this source block interactively.
 @item query-export
-Evaluation of the code block during export will require a query.
+Org prompts the user for permission to export this @samp{src} code block.
 @end table
 
-If this header argument is not set then evaluation is determined by the value
-of the @code{org-confirm-babel-evaluate} variable see @ref{Code evaluation
-security}.
+If @code{:eval} header argument is not set for a source block, then Org
+determines whether to evaluate from the @code{org-confirm-babel-evaluate}
+variable (@pxref{Code evaluation security}).
 
-@node wrap, post, eval, Specific header arguments
+@node wrap
 @subsubsection @code{:wrap}
-The @code{:wrap} header argument is used to mark the results of source block
-evaluation.  The header argument can be passed a string that will be appended
-to @code{#+BEGIN_} and @code{#+END_}, which will then be used to wrap the
-results.  If not string is specified then the results will be wrapped in a
-@code{#+BEGIN/END_RESULTS} block.
+@cindex @code{:wrap}, src header argument
+The @code{:wrap} header argument marks the results block by appending strings
+to @code{#+BEGIN_} and @code{#+END_}.  If no string is specified, Org wraps
+the results in a @code{#+BEGIN/END_RESULTS} block.
 
-@node post, prologue, wrap, Specific header arguments
+@node post
 @subsubsection @code{:post}
-The @code{:post} header argument is used to post-process the results of a
-code block execution.  When a post argument is given, the results of the code
-block will temporarily be bound to the @code{*this*} variable.  This variable
-may then be included in header argument forms such as those used in @ref{var}
-header argument specifications allowing passing of results to other code
-blocks, or direct execution via Emacs Lisp.
-
-The following example illustrates the usage of the @code{:post} header
-argument.
+@cindex @code{:post}, src header argument
+The @code{:post} header argument is for post-processing results from
+@samp{src} block evaluation.  When @code{:post} has any value, Org binds the
+results to @code{*this*} variable for easy passing to @ref{var} header
+argument specifications.  That makes results available to other @samp{src}
+code blocks, or for even direct Emacs Lisp code execution.
+
+The following two examples illustrate @code{:post} header argument in action.
+The first one shows how to attach @code{#+ATTR_LATEX:} line using
+@code{:post}.
 
 @example
 #+name: attr_wrap
 #+begin_src sh :var data="" :var width="\\textwidth" :results output
-  echo "#+ATTR_LATEX :width $width"
+  echo "#+ATTR_LATEX: :width $width"
   echo "$data"
 #+end_src
 
@@ -15634,33 +16592,65 @@ argument.
 :END:
 @end example
 
-@node prologue, epilogue, post, Specific header arguments
+The second example shows use of @code{:colnames} in @code{:post} to pass
+data between @samp{src} code blocks.
+
+@example
+#+name: round-tbl
+#+begin_src emacs-lisp :var tbl="" fmt="%.3f"
+  (mapcar (lambda (row)
+            (mapcar (lambda (cell)
+                      (if (numberp cell)
+                          (format fmt cell)
+                        cell))
+                    row))
+          tbl)
+#+end_src
+
+#+begin_src R :colnames yes :post round-tbl[:colnames yes](*this*)
+set.seed(42)
+data.frame(foo=rnorm(1))
+#+end_src
+
+#+RESULTS:
+|   foo |
+|-------|
+| 1.371 |
+@end example
+
+@node prologue
 @subsubsection @code{:prologue}
-The value of the @code{prologue} header argument will be prepended to the
-code block body before execution.  For example, @code{:prologue "reset"} may
-be used to reset a gnuplot session before execution of a particular code
-block, or the following configuration may be used to do this for all gnuplot
-code blocks.  Also see @ref{epilogue}.
+@cindex @code{:prologue}, src header argument
+The @code{prologue} header argument is for appending to the top of the code
+block for execution.  For example, a clear or reset code at the start of new
+execution of a @samp{src} code block.  A @code{reset} for @samp{gnuplot}:
+@code{:prologue "reset"}.  See also @ref{epilogue}.
 
 @lisp
 (add-to-list 'org-babel-default-header-args:gnuplot
              '((:prologue . "reset")))
 @end lisp
 
-@node epilogue, , prologue, Specific header arguments
+@node epilogue
 @subsubsection @code{:epilogue}
-The value of the @code{epilogue} header argument will be appended to the code
-block body before execution.  Also see @ref{prologue}.
+@cindex @code{:epilogue}, src header argument
+The value of the @code{epilogue} header argument is for appending to the end
+of the code block for execution.  See also @ref{prologue}.
 
-@node Results of evaluation, Noweb reference syntax, Header arguments, Working With Source Code
+@node Results of evaluation
 @section Results of evaluation
 @cindex code block, results of evaluation
 @cindex source code, results of evaluation
 
-The way in which results are handled depends on whether a session is invoked,
-as well as on whether @code{:results value} or @code{:results output} is
-used.  The following table shows the table possibilities.  For a full listing
-of the possible results header arguments see @ref{results}.
+How Org handles results of a code block execution depends on many header
+arguments working together.  Here is only a summary of these.  For an
+enumeration of all the header arguments that affect results, see
+@ref{results}.
+
+The primary determinant is the execution context.  Is it in a @code{:session}
+or not?  Orthogonal to that is if the expected result is a @code{:results
+value} or @code{:results output}, which is a concatenation of output from
+start to finish of the @samp{src} code block's evaluation.
 
 @multitable @columnfractions 0.26 0.33 0.41
 @item @tab @b{Non-session} @tab @b{Session}
@@ -15668,51 +16658,54 @@ of the possible results header arguments see @ref{results}.
 @item @code{:results output} @tab contents of STDOUT @tab concatenation of interpreter output
 @end multitable
 
-Note: With @code{:results value}, the result in both @code{:session} and
-non-session is returned to Org mode as a table (a one- or two-dimensional
-vector of strings or numbers) when appropriate.
+For @code{:session} and non-session, the @code{:results value} turns the
+results into an Org mode table format.  Single values are wrapped in a one
+dimensional vector.  Rows and columns of a table are wrapped in a
+two-dimensional vector.
 
 @subsection Non-session
 @subsubsection @code{:results value}
-This is the default.  Internally, the value is obtained by wrapping the code
-in a function definition in the external language, and evaluating that
-function.  Therefore, code should be written as if it were the body of such a
-function.  In particular, note that Python does not automatically return a
-value from a function unless a @code{return} statement is present, and so a
-@samp{return} statement will usually be required in Python.
+@cindex @code{:results}, src header argument
+Default.  Org gets the value by wrapping the code in a function definition in
+the language of the @samp{src} block.  That is why when using @code{:results
+value}, code should execute like a function and return a value.  For
+languages like Python, an explicit @code{return} statement is mandatory when
+using @code{:results value}.
 
-This is the only one of the four evaluation contexts in which the code is
-automatically wrapped in a function definition.
+This is one of four evaluation contexts where Org automatically wraps the
+code in a function definition.
 
 @subsubsection @code{:results output}
-The code is passed to the interpreter as an external process, and the
-contents of the standard output stream are returned as text.  (In certain
-languages this also contains the error output stream; this is an area for
-future work.)
+@cindex @code{:results}, src header argument
+For @code{:results output}, the code is passed to an external process running
+the interpreter.  Org returns the contents of the standard output stream as
+as text results.
 
 @subsection Session
 @subsubsection @code{:results value}
-The code is passed to an interpreter running as an interactive Emacs inferior
-process.  Only languages which provide tools for interactive evaluation of
-code have session support, so some language (e.g., C and ditaa) do not
-support the @code{:session} header argument, and in other languages (e.g.,
-Python and Haskell) which have limitations on the code which may be entered
-into interactive sessions, those limitations apply to the code in code blocks
-using the @code{:session} header argument as well.
-
-Unless the @code{:results output} option is supplied (see below) the result
-returned is the result of the last evaluation performed by the
-interpreter.  (This is obtained in a language-specific manner: the value of
-the variable @code{_} in Python and Ruby, and the value of @code{.Last.value}
-in R).
+@cindex @code{:results}, src header argument
+For @code{:results value} from a @code{:session}, Org passes the code to an
+interpreter running as an interactive Emacs inferior process.  So only
+languages that provide interactive evaluation can have session support.  Not
+all languages provide this support, such as @samp{C} and @samp{ditaa}.  Even
+those that do support, such as @samp{Python} and @samp{Haskell}, they impose
+limitations on allowable language constructs that can run interactively.  Org
+inherits those limitations for those @samp{src} code blocks running in a
+@code{:session}.
+
+Org gets the value from the source code interpreter's last statement
+output.  Org has to use language-specific methods to obtain the value.  For
+example, from the variable @code{_} in @samp{Python} and @samp{Ruby}, and the
+value of @code{.Last.value} in @samp{R}).
 
 @subsubsection @code{:results output}
-The code is passed to the interpreter running as an interactive Emacs
-inferior process.  The result returned is the concatenation of the sequence of
-(text) output from the interactive interpreter.  Notice that this is not
-necessarily the same as what would be sent to @code{STDOUT} if the same code
-were passed to a non-interactive interpreter running as an external
-process.  For example, compare the following two blocks:
+@cindex @code{:results}, src header argument
+For @code{:results output}, Org passes the code to the interpreter running as
+an interactive Emacs inferior process.  Org concatenates whatever text output
+emitted by the interpreter to return the collection as a result.  Note that
+this collection is not the same as collected from @code{STDOUT} of a
+non-interactive interpreter running as an external process.  Compare for
+example these two blocks:
 
 @example
 #+BEGIN_SRC python :results output
@@ -15726,7 +16719,8 @@ process.  For example, compare the following two blocks:
 : bye
 @end example
 
-In non-session mode, the ``2'' is not printed and does not appear.
+In the above non-session mode, the ``2'' is not printed; so does not appear
+in results.
 
 @example
 #+BEGIN_SRC python :results output :session
@@ -15741,60 +16735,61 @@ In non-session mode, the ``2'' is not printed and does not appear.
 : bye
 @end example
 
-But in @code{:session} mode, the interactive interpreter receives input ``2''
-and prints out its value, ``2''.  (Indeed, the other print statements are
-unnecessary here).
+In the above @code{:session} mode, the interactive interpreter receives and
+prints ``2''.  Results show that.
 
-@node Noweb reference syntax, Key bindings and useful functions, Results of evaluation, Working With Source Code
+@node Noweb reference syntax
 @section Noweb reference syntax
 @cindex code block, noweb reference
 @cindex syntax, noweb
 @cindex source code, noweb reference
 
-The ``noweb'' (see @uref{http://www.cs.tufts.edu/~nr/noweb/}) Literate
-Programming system allows named blocks of code to be referenced by using the
-familiar Noweb syntax:
+Org supports named blocks in ``noweb'' style syntax.  For ``noweb'' literate
+programming details, see @uref{http://www.cs.tufts.edu/~nr/noweb/}).
 
 @example
 <<code-block-name>>
 @end example
 
-When a code block is tangled or evaluated, whether or not ``noweb''
-references are expanded depends upon the value of the @code{:noweb} header
-argument.  If @code{:noweb yes}, then a Noweb reference is expanded before
-evaluation.  If @code{:noweb no}, the default, then the reference is not
-expanded before evaluation.  See the @ref{noweb-ref} header argument for
-a more flexible way to resolve noweb references.
+For the header argument @code{:noweb yes}, Org expands ``noweb'' style
+references in the @samp{src} code block before evaluation.
+
+For the header argument @code{:noweb no}, Org does not expand ``noweb'' style
+references in the @samp{src} code block before evaluation.
+
+The default is @code{:noweb no}.
+
+Org offers a more flexible way to resolve ``noweb'' style references
+(@pxref{noweb-ref}).
+
+Org can handle naming of @emph{results} block, rather than the body of the
+@samp{src} code block, using ``noweb'' style references.
 
-It is possible to include the @emph{results} of a code block rather than the
-body.  This is done by appending parenthesis to the code block name which may
-optionally contain arguments to the code block as shown below.
+For ``noweb'' style reference, append parenthesis to the code block name for
+arguments, as shown in this example:
 
 @example
 <<code-block-name(optional arguments)>>
 @end example
 
-Note: the default value, @code{:noweb no}, was chosen to ensure that
-correct code is not broken in a language, such as Ruby, where
-@code{<<arg>>} is a syntactically valid construct.  If @code{<<arg>>} is not
-syntactically valid in languages that you use, then please consider setting
-the default value.
+Note: Org defaults to @code{:noweb no} so as not to cause errors in languages
+such as @samp{Ruby} where ``noweb'' syntax is equally valid characters.  For
+example, @code{<<arg>>}.  Change Org's default to @code{:noweb yes} for
+languages where there is no risk of confusion.
 
-Note: if noweb tangling is slow in large Org mode files consider setting the
+For faster tangling of large Org mode files, set
 @code{org-babel-use-quick-and-dirty-noweb-expansion} variable to @code{t}.
-This will result in faster noweb reference resolution at the expense of not
-correctly resolving inherited values of the @code{:noweb-ref} header
-argument.
+The speedup comes at the expense of not correctly resolving inherited values
+of the @code{:noweb-ref} header argument.
+
 
-@node Key bindings and useful functions, Batch execution, Noweb reference syntax, Working With Source Code
+@node Key bindings and useful functions
 @section Key bindings and useful functions
 @cindex code block, key bindings
 
-Many common Org mode key sequences are re-bound depending on
-the context.
+Many common Org mode key sequences are re-bound depending on the context.
 
-Within a code block, the following key bindings
-are active:
+Active key bindings in code blocks:
 
 @multitable @columnfractions 0.25 0.75
 @kindex C-c C-c
@@ -15807,9 +16802,9 @@ are active:
 @item @kbd{M-@key{down}}  @tab @code{org-babel-switch-to-session}
 @end multitable
 
-In an Org mode buffer, the following key bindings are active:
+Active key bindings in Org mode buffer:
 
-@multitable @columnfractions 0.45 0.55
+@multitable @columnfractions 0.5 0.5
 @kindex C-c C-v p
 @kindex C-c C-v C-p
 @item @kbd{C-c C-v p} @ @ @r{or} @ @ @kbd{C-c C-v C-p} @tab @code{org-babel-previous-src-block}
@@ -15878,8 +16873,7 @@ In an Org mode buffer, the following key bindings are active:
 @item @kbd{C-c C-v x} @ @ @r{or} @ @ @kbd{C-c C-v C-x} @tab @code{org-babel-do-key-sequence-in-edit-buffer}
 @end multitable
 
-@c When possible these keybindings were extended to work when the control key is
-@c kept pressed, resulting in the following additional keybindings.
+@c Extended key bindings when control key is kept pressed:
 
 @c @multitable @columnfractions 0.25 0.75
 @c @item @kbd{C-c C-v C-a} @tab @code{org-babel-sha1-hash}
@@ -15892,15 +16886,18 @@ In an Org mode buffer, the following key bindings are active:
 @c @item @kbd{C-c C-v C-z} @tab @code{org-babel-switch-to-session}
 @c @end multitable
 
-@node Batch execution,  , Key bindings and useful functions, Working With Source Code
+@node Batch execution
 @section Batch execution
 @cindex code block, batch execution
 @cindex source code, batch execution
 
-It is possible to call functions from the command line.  This shell
-script calls @code{org-babel-tangle} on every one of its arguments.
+Org mode features, including working with source code facilities can be
+invoked from the command line.  This enables building shell scripts for batch
+processing, running automated system tasks, and expanding Org mode's
+usefulness.
 
-Be sure to adjust the paths to fit your system.
+The sample script shows batch processing of multiple files using
+@code{org-babel-tangle}.
 
 @example
 #!/bin/sh
@@ -15917,35 +16914,33 @@ for i in $@@; do
 done
 
 emacs -Q --batch \
---eval "(progn
-(add-to-list 'load-path (expand-file-name \"~/src/org/lisp/\"))
-(add-to-list 'load-path (expand-file-name \"~/src/org/contrib/lisp/\" t))
-(require 'org)(require 'org-exp)(require 'ob)(require 'ob-tangle)
-(mapc (lambda (file)
-       (find-file (expand-file-name file \"$DIR\"))
-       (org-babel-tangle)
-       (kill-buffer)) '($FILES)))" 2>&1 |grep tangled
+     --eval "(progn
+     (require 'org)(require 'ob)(require 'ob-tangle)
+     (mapc (lambda (file)
+            (find-file (expand-file-name file \"$DIR\"))
+            (org-babel-tangle)
+            (kill-buffer)) '($FILES)))" 2>&1 |grep -i tangled
 @end example
 
-@node Miscellaneous, Hacking, Working With Source Code, Top
+@node Miscellaneous
 @chapter Miscellaneous
 
 @menu
-* Completion::                  M-TAB knows what you need
-* Easy Templates::              Quick insertion of structural elements
+* Completion::                  M-TAB guesses completions
+* Easy templates::              Quick insertion of structural elements
 * Speed keys::                  Electric commands at the beginning of a headline
 * Code evaluation security::    Org mode files evaluate inline code
-* Customization::               Adapting Org to your taste
+* Customization::               Adapting Org to changing tastes
 * In-buffer settings::          Overview of the #+KEYWORDS
 * The very busy C-c C-c key::   When in doubt, press C-c C-c
 * Clean view::                  Getting rid of leading stars in the outline
 * TTY keys::                    Using Org on a tty
-* Interaction::                 Other Emacs packages
+* Interaction::                 With other Emacs packages
 * org-crypt::                   Encrypting Org files
 @end menu
 
 
-@node Completion, Easy Templates, Miscellaneous, Miscellaneous
+@node Completion
 @section Completion
 @cindex completion, of @TeX{} symbols
 @cindex completion, of TODO keywords
@@ -15961,15 +16956,13 @@ emacs -Q --batch \
 @cindex tag completion
 @cindex link abbreviations, completion of
 
-Emacs would not be Emacs without completion, and Org mode uses it whenever it
-makes sense.  If you prefer an @i{iswitchb}- or @i{ido}-like interface for
-some of the completion prompts, you can specify your preference by setting at
-most one of the variables @code{org-completion-use-iswitchb}
-@code{org-completion-use-ido}.
-
-Org supports in-buffer completion.  This type of completion does
-not make use of the minibuffer.  You simply type a few letters into
-the buffer and use the key to complete text right there.
+Org has in-buffer completions.  Unlike minibuffer completions, which are
+useful for quick command interactions, Org's in-buffer completions are more
+suitable for content creation in Org documents.  Type one or more letters and
+invoke the hot key to complete the text in-place.  Depending on the context
+and the keys, Org will offer different types of completions.  No minibuffer
+is involved.  Such mode-specific hot keys have become an integral part of
+Emacs and Org provides several shortcuts.
 
 @table @kbd
 @kindex M-@key{TAB}
@@ -15996,112 +16989,123 @@ buffer.
 After @samp{[}, complete link abbreviations (@pxref{Link abbreviations}).
 @item
 After @samp{#+}, complete the special keywords like @samp{TYP_TODO} or
-@samp{OPTIONS} which set file-specific options for Org mode.  When the
-option keyword is already complete, pressing @kbd{M-@key{TAB}} again
-will insert example settings for this keyword.
+file-specific @samp{OPTIONS}.  After option keyword is complete, pressing
+@kbd{M-@key{TAB}} again will insert example settings for that option.
 @item
-In the line after @samp{#+STARTUP: }, complete startup keywords,
-i.e., valid keys for this line.
+After @samp{#+STARTUP: }, complete startup keywords.
 @item
-Elsewhere, complete dictionary words using Ispell.
+When the point is anywhere else, complete dictionary words using Ispell.
 @end itemize
+@kindex C-M-i
+If your desktop intercepts the combo @kbd{M-@key{TAB}} to switch windows, use
+@kbd{C-M-i} or @kbd{@key{ESC} @key{TAB}} as an alternative or customize your
+environment.
 @end table
 
-@node Easy Templates, Speed keys, Completion, Miscellaneous
-@section Easy Templates
+@node Easy templates
+@section Easy templates
 @cindex template insertion
 @cindex insertion, of templates
 
-Org mode supports insertion of empty structural elements (like
-@code{#+BEGIN_SRC} and @code{#+END_SRC} pairs) with just a few key
-strokes.  This is achieved through a native template expansion mechanism.
-Note that Emacs has several other template mechanisms which could be used in
-a similar way, for example @file{yasnippet}.
+With just a few keystrokes, Org's easy templates inserts empty pairs of
+structural elements, such as @code{#+BEGIN_SRC} and @code{#+END_SRC}.  Easy
+templates use an expansion mechanism, which is native to Org, in a process
+similar to @file{yasnippet} and other Emacs template expansion packages.
 
-To insert a structural element, type a @samp{<}, followed by a template
-selector and @kbd{@key{TAB}}.  Completion takes effect only when the above
-keystrokes are typed on a line by itself.
+@kbd{@key{<}} @kbd{@key{s}} @kbd{@key{TAB}} completes the @samp{src} code
+block.
 
-The following template selectors are currently supported.
+@kbd{<} @kbd{l} @kbd{@key{TAB}}
+
+expands to:
+
+#+BEGIN_EXPORT latex
+
+#+END_EXPORT
+
+Org comes with these pre-defined easy templates:
 
 @multitable @columnfractions 0.1 0.9
-@item @kbd{s} @tab @code{#+BEGIN_SRC     ... #+END_SRC}
+@item @kbd{s} @tab @code{#+BEGIN_SRC ... #+END_SRC}
 @item @kbd{e} @tab @code{#+BEGIN_EXAMPLE ... #+END_EXAMPLE}
-@item @kbd{q} @tab @code{#+BEGIN_QUOTE   ... #+END_QUOTE}
-@item @kbd{v} @tab @code{#+BEGIN_VERSE   ... #+END_VERSE}
-@item @kbd{c} @tab @code{#+BEGIN_CENTER  ... #+END_CENTER}
-@item @kbd{l} @tab @code{#+BEGIN_LaTeX   ... #+END_LaTeX}
-@item @kbd{L} @tab @code{#+LaTeX:}
-@item @kbd{h} @tab @code{#+BEGIN_HTML    ... #+END_HTML}
+@item @kbd{q} @tab @code{#+BEGIN_QUOTE ... #+END_QUOTE}
+@item @kbd{v} @tab @code{#+BEGIN_VERSE ... #+END_VERSE}
+@item @kbd{c} @tab @code{#+BEGIN_CENTER ... #+END_CENTER}
+@item @kbd{l} @tab @code{#+BEGIN_EXPORT latex ... #+END_EXPORT}
+@item @kbd{L} @tab @code{#+LATEX:}
+@item @kbd{h} @tab @code{#+BEGIN_EXPORT html ... #+END_EXPORT}
 @item @kbd{H} @tab @code{#+HTML:}
-@item @kbd{a} @tab @code{#+BEGIN_ASCII   ... #+END_ASCII}
+@item @kbd{a} @tab @code{#+BEGIN_EXPORT ascii ... #+END_EXPORT}
 @item @kbd{A} @tab @code{#+ASCII:}
 @item @kbd{i} @tab @code{#+INDEX:} line
 @item @kbd{I} @tab @code{#+INCLUDE:} line
 @end multitable
 
-For example, on an empty line, typing "<e" and then pressing TAB, will expand
-into a complete EXAMPLE template.
+More templates can added by customizing the variable
+@code{org-structure-template-alist}, whose docstring has additional details.
 
-You can install additional templates by customizing the variable
-@code{org-structure-template-alist}.  See the docstring of the variable for
-additional details.
-
-@node Speed keys, Code evaluation security, Easy Templates, Miscellaneous
+@node Speed keys
 @section Speed keys
 @cindex speed keys
+
+Single keystrokes can execute custom commands in an Org file when the cursor
+is on a headline.  Without the extra burden of a meta or modifier key, Speed
+Keys can speed navigation or execute custom commands.  Besides faster
+navigation, Speed Keys may come in handy on small mobile devices that do not
+have full keyboards.  Speed Keys may also work on TTY devices known for their
+problems when entering Emacs keychords.
+
 @vindex org-use-speed-commands
-@vindex org-speed-commands-user
+By default, Org has Speed Keys disabled.  To activate Speed Keys, set the
+variable @code{org-use-speed-commands} to a non-@code{nil} value.  To trigger
+a Speed Key, the cursor must be at the beginning of an Org headline, before
+any of the stars.
 
-Single keys can be made to execute commands when the cursor is at the
-beginning of a headline, i.e., before the first star.  Configure the variable
-@code{org-use-speed-commands} to activate this feature.  There is a
-pre-defined list of commands, and you can add more such commands using the
-variable @code{org-speed-commands-user}.  Speed keys do not only speed up
-navigation and other commands, but they also provide an alternative way to
-execute commands bound to keys that are not or not easily available on a TTY,
-or on a small mobile device with a limited keyboard.
+@vindex org-speed-commands-user
+@findex org-speed-command-help
+Org comes with a pre-defined list of Speed Keys.  To add or modify Speed
+Keys, customize the variable, @code{org-speed-commands-user}.  For more
+details, see the variable's docstring.  With Speed Keys activated, @kbd{M-x
+org-speed-command-help}, or @kbd{?} when cursor is at the beginning of an Org
+headline, shows currently active Speed Keys, including the user-defined ones.
 
-To see which commands are available, activate the feature and press @kbd{?}
-with the cursor at the beginning of a headline.
 
-@node Code evaluation security, Customization, Speed keys, Miscellaneous
+@node Code evaluation security
 @section Code evaluation and security issues
 
-Org provides tools to work with the code snippets, including evaluating them.
-
-Running code on your machine always comes with a security risk.  Badly
-written or malicious code can be executed on purpose or by accident.  Org has
-default settings which will only evaluate such code if you give explicit
-permission to do so, and as a casual user of these features you should leave
-these precautions intact.
+Unlike plain text, running code comes with risk.  Each @samp{src} code block,
+in terms of risk, is equivalent to an executable file.  Org therefore puts a
+few confirmation prompts by default.  This is to alert the casual user from
+accidentally running untrusted code.
 
-For people who regularly work with such code, the confirmation prompts can
-become annoying, and you might want to turn them off.  This can be done, but
-you must be aware of the risks that are involved.
+For users who do not run code blocks or write code regularly, Org's default
+settings should suffice.  However, some users may want to tweak the prompts
+for fewer interruptions.  To weigh the risks of automatic execution of code
+blocks, here are some details about code evaluation.
 
-Code evaluation can happen under the following circumstances:
+Org evaluates code in the following circumstances:
 
 @table @i
 @item Source code blocks
-Source code blocks can be evaluated during export, or when pressing @kbd{C-c
-C-c} in the block.  The most important thing to realize here is that Org mode
-files which contain code snippets are, in a certain sense, like executable
-files.  So you should accept them and load them into Emacs only from trusted
-sources---just like you would do with a program you install on your computer.
-
-Make sure you know what you are doing before customizing the variables
-which take off the default security brakes.
+Org evaluates @samp{src} code blocks in an Org file during export.  Org also
+evaluates a @samp{src} code block with the @kbd{C-c C-c} key chord.  Users
+exporting or running code blocks must load files only from trusted sources.
+Be weary of customizing variables that remove or alter default security
+measures.
 
 @defopt org-confirm-babel-evaluate
-When t (the default), the user is asked before every code block evaluation.
-When @code{nil}, the user is not asked.  When set to a function, it is called with
-two arguments (language and body of the code block) and should return t to
-ask and @code{nil} not to ask.
+When @code{t}, Org prompts the user for confirmation before executing each
+code block.  When @code{nil}, Org executes code blocks without prompting the
+user for confirmation.  When this option is set to a custom function, Org
+invokes the function with these two arguments: the source code language and
+the body of the code block.  The custom function must return either a
+@code{t} or @code{nil}, which determines if the user is prompted.  Each
+source code language can be handled separately through this function
+argument.
 @end defopt
 
-For example, here is how to execute "ditaa" code (which is considered safe)
-without asking:
+For example, this function enables execution of @samp{ditaa} code +blocks
+without prompting:
 
 @lisp
 (defun my-org-confirm-babel-evaluate (lang body)
@@ -16110,86 +17114,73 @@ without asking:
 @end lisp
 
 @item Following @code{shell} and @code{elisp} links
-Org has two link types that can directly evaluate code (@pxref{External
-links}).  These links can be problematic because the code to be evaluated is
-not visible.
+Org has two link types that can also directly evaluate code (@pxref{External
+links}).  Because such code is not visible, these links have a potential
+risk.  Org therefore prompts the user when it encounters such links.  The
+customization variables are:
 
 @defopt org-confirm-shell-link-function
-Function to queries user about shell link execution.
+Function that prompts the user before executing a shell link.
 @end defopt
 @defopt org-confirm-elisp-link-function
-Functions to query user for Emacs Lisp link execution.
+Function that prompts the user before executing an Emacs Lisp link.
 @end defopt
 
 @item Formulas in tables
-Formulas in tables (@pxref{The spreadsheet}) are code that is evaluated
-either by the @i{calc} interpreter, or by the @i{Emacs Lisp} interpreter.
+Org executes formulas in tables (@pxref{The spreadsheet}) either through the
+@emph{calc} or the @emph{Emacs Lisp} interpreters.
 @end table
 
-@node Customization, In-buffer settings, Code evaluation security, Miscellaneous
+@node Customization
 @section Customization
 @cindex customization
 @cindex options, for customization
 @cindex variables, for customization
 
-There are more than 500 variables that can be used to customize
-Org.  For the sake of compactness of the manual, I am not
-describing the variables here.  A structured overview of customization
-variables is available with @kbd{M-x org-customize RET}.  Or select
-@code{Browse Org Group} from the @code{Org->Customization} menu.  Many
-settings can also be activated on a per-file basis, by putting special
-lines into the buffer (@pxref{In-buffer settings}).
+Org has more than 500 variables for customization.  They can be accessed
+through the usual @kbd{M-x org-customize RET} command.  Or through the Org
+menu, @code{Org->Customization->Browse Org Group}.  Org also has per-file
+settings for some variables (@pxref{In-buffer settings}).
 
-@node In-buffer settings, The very busy C-c C-c key, Customization, Miscellaneous
+@node In-buffer settings
 @section Summary of in-buffer settings
 @cindex in-buffer settings
 @cindex special keywords
+In-buffer settings start with @samp{#+}, followed by a keyword, a colon, and
+then a word for each setting.  Org accepts multiple settings on the same
+line.  Org also accepts multiple lines for a keyword.  This manual describes
+these settings throughout.  A summary follows here.
 
-Org mode uses special lines in the buffer to define settings on a
-per-file basis.  These lines start with a @samp{#+} followed by a
-keyword, a colon, and then individual words defining a setting.  Several
-setting words can be in the same line, but you can also have multiple
-lines for the keyword.  While these settings are described throughout
-the manual, here is a summary.  After changing any of those lines in the
-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.
+@kbd{C-c C-c} activates any changes to the in-buffer settings.  Closing and
+reopening the Org file in Emacs also activates the changes.
 
 @vindex org-archive-location
 @table @kbd
 @item #+ARCHIVE: %s_done::
-This line sets the archive location for the agenda file.  It applies for
-all subsequent lines until the next @samp{#+ARCHIVE} line, or the end
-of the file.  The first such line also applies to any entries before it.
+Sets the archive location of the agenda file.  This location applies to the
+lines until the next @samp{#+ARCHIVE} line, if any, in the Org file.  The
+first archive location in the Org file also applies to any entries before it.
 The corresponding variable is @code{org-archive-location}.
 @item #+CATEGORY:
-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.
+Sets the category of the agenda file, which applies to the entire document.
 @item #+COLUMNS: %25ITEM ...
 @cindex property, COLUMNS
-Set the default format for columns view.  This format applies when
-columns view is invoked in locations where no @code{COLUMNS} property
-applies.
+Sets the default format for columns view.  Org uses this format for column
+views where there is no @code{COLUMNS} property.
 @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 sets the local variable @code{org-table-formula-constants-local}.
-The global version of this variable is
-@code{org-table-formula-constants}.
+Set file-local values for constants that table formulas can use.  This line
+sets the local variable @code{org-table-formula-constants-local}.  The global
+version of this variable is @code{org-table-formula-constants}.
 @item #+FILETAGS: :tag1:tag2:tag3:
-Set tags that can be inherited by any entry in the file, including the
+Set tags that all entries in the file will inherit from here, including the
 top-level entries.
-@item #+DRAWERS: NAME1 ...
-@vindex org-drawers
-Set the file-local set of additional 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}.
+Each line specifies one abbreviation for one link.  Use multiple
+@code{#+LINK:} lines for more, @pxref{Link abbreviations}.  The corresponding
+variable is @code{org-link-abbrev-alist}.
 @item #+PRIORITIES: highest lowest default
 @vindex org-highest-priority
 @vindex org-lowest-priority
@@ -16202,22 +17193,22 @@ 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
-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 '}.
+The setup file is for additional in-buffer settings.  Org loads this file and
+parses it for any settings in it only when Org opens the main file.  @kbd{C-c
+C-c} on the settings line will also parse and load.  Org also parses and
+loads the file during normal exporting process.  Org parses the contents of
+this file as if it was included in the buffer.  It can be another Org file.
+To visit the file, @kbd{C-c '} while the cursor is on the line with the file
+name.
 @item #+STARTUP:
 @cindex #+STARTUP
-This line sets options to be used at startup of Org mode, when an
-Org file is being visited.
+Startup options Org uses when first visiting a file.
 
 The first set of options deals with the initial visibility of the outline
 tree.  The corresponding variable for global default settings is
-@code{org-startup-folded}, with a default value @code{t}, which means
-@code{overview}.
+@code{org-startup-folded} with a default value of @code{t}, which is the same
+as @code{overview}.
+
 @vindex org-startup-folded
 @cindex @code{overview}, STARTUP keyword
 @cindex @code{content}, STARTUP keyword
@@ -16234,17 +17225,17 @@ showeverything   @r{show even drawer contents}
 @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}
+@code{org-startup-indented}
 @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
-@code{nil}.
+Aligns tables consistently upon visiting a file; useful for restoring
+narrowed table columns.  The corresponding variable is
+@code{org-startup-align-all-tables} with @code{nil} as default value.
+
 @cindex @code{align}, STARTUP keyword
 @cindex @code{noalign}, STARTUP keyword
 @example
@@ -16253,9 +17244,9 @@ noalign    @r{don't align tables on startup}
 @end example
 
 @vindex org-startup-with-inline-images
-When visiting a file, inline images can be automatically displayed.  The
-corresponding variable is @code{org-startup-with-inline-images}, with a
-default value @code{nil} to avoid delays when visiting a file.
+Whether Org should automatically display inline images.  The corresponding
+variable is @code{org-startup-with-inline-images}, with a default value
+@code{nil} to avoid delays when visiting a file.
 @cindex @code{inlineimages}, STARTUP keyword
 @cindex @code{noinlineimages}, STARTUP keyword
 @example
@@ -16264,10 +17255,9 @@ noinlineimages @r{don't show inline images on startup}
 @end example
 
 @vindex org-startup-with-latex-preview
-When visiting a file, @LaTeX{} fragments can be converted to images
-automatically.  The variable @code{org-startup-with-latex-preview} which
-controls this behavior, is set to @code{nil} by default to avoid delays on
-startup.
+Whether Org should automatically convert @LaTeX{} fragments to images.  The
+variable @code{org-startup-with-latex-preview}, which controls this setting,
+is set to @code{nil} by default to avoid startup delays.
 @cindex @code{latexpreview}, STARTUP keyword
 @cindex @code{nolatexpreview}, STARTUP keyword
 @example
@@ -16328,21 +17318,21 @@ nologstatesreversed @r{do not reverse the order of states notes}
 
 @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
-default setting @code{nil} (meaning @code{showstars} and @code{oddeven}).
+These options hide leading stars in outline headings, and indent outlines.
+The corresponding variables are @code{org-hide-leading-stars} and
+@code{org-odd-levels-only}, both with a default setting of @code{nil}
+(meaning @code{showstars} and @code{oddeven}).
 @cindex @code{hidestars}, STARTUP keyword
 @cindex @code{showstars}, STARTUP keyword
 @cindex @code{odd}, STARTUP keyword
 @cindex @code{even}, STARTUP keyword
 @example
-hidestars  @r{make all but one of the stars starting a headline invisible.}
-showstars  @r{show all stars starting a headline}
-indent     @r{virtual indentation according to outline level}
-noindent   @r{no virtual indentation according to outline level}
-odd        @r{allow only odd outline levels (1,3,...)}
-oddeven    @r{allow all outline levels}
+hidestars  @r{hide all stars on the headline except one.}
+showstars  @r{show all stars on the headline}
+indent     @r{virtual indents according to the outline level}
+noindent   @r{no virtual indents}
+odd        @r{show odd outline levels only (1,3,...)}
+oddeven    @r{show all outline levels}
 @end example
 
 @vindex org-put-time-stamp-overlays
@@ -16368,8 +17358,8 @@ constSI    @r{@file{constants.el} should use the SI unit system}
 @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},
+For footnote settings, use the following keywords.  The corresponding
+variables are @code{org-footnote-define-inline},
 @code{org-footnote-auto-label}, and @code{org-footnote-auto-adjust}.
 @cindex @code{fninline}, STARTUP keyword
 @cindex @code{nofninline}, STARTUP keyword
@@ -16414,67 +17404,57 @@ entitiesplain   @r{Leave entities plain}
 
 @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}.
+These lines specify valid tags for this file.  Org accepts multiple tags
+lines.  Tags could correspond to the @emph{fast tag selection} keys.  The
+corresponding variable is @code{org-tag-alist}.
 @cindex #+TBLFM
 @item #+TBLFM:
-This line contains the formulas for the table directly above the line.
-
-Table can have multiple lines containing @samp{#+TBLFM:}.  Note
-that only the first line of @samp{#+TBLFM:} will be applied when
-you recalculate the table.  For more details see @ref{Using
-multiple #+TBLFM lines} in @ref{Editing and debugging formulas}.
-
+This line is for formulas for the table directly above.  A table can have
+multiple @samp{#+TBLFM:} lines.  On table recalculation, Org applies only the
+first @samp{#+TBLFM:} line.  For details see @ref{Using multiple #+TBLFM
+lines} in @ref{Editing and debugging formulas}.
 @item #+TITLE:, #+AUTHOR:, #+EMAIL:, #+LANGUAGE:, #+DATE:,
 @itemx #+OPTIONS:, #+BIND:,
-@itemx #+DESCRIPTION:, #+KEYWORDS:,
-@itemx #+LaTeX_HEADER:, #+LaTeX_HEADER_EXTRA:,
-@itemx #+HTML_HEAD:, #+HTML_HEAD_EXTRA:, #+HTML_LINK_UP:, #+HTML_LINK_HOME:,
 @itemx #+SELECT_TAGS:, #+EXCLUDE_TAGS:
 These lines provide settings for exporting files.  For more details see
 @ref{Export settings}.
 @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 variable is @code{org-todo-keywords}.
+These lines set the TODO keywords and their significance to the current file.
+The corresponding variable is @code{org-todo-keywords}.
 @end table
 
-@node The very busy C-c C-c key, Clean view, In-buffer settings, Miscellaneous
+@node The very busy C-c C-c key
 @section The very busy C-c C-c key
 @kindex C-c C-c
 @cindex C-c C-c, overview
 
-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
-here and update according to what you see here''}.  Here is a summary of
-what this means in different contexts.
+The @kbd{C-c C-c} key in Org serves many purposes depending on the context.
+It is probably the most over-worked, multi-purpose key combination in Org.
+Its uses are well-documented through out this manual, but here is a
+consolidated list for easy reference.
 
 @itemize @minus
 @item
-If there are highlights in the buffer from the creation of a sparse
-tree, or from clock display, remove these highlights.
+If any highlights shown in the buffer from the creation of a sparse tree, or
+from clock display, remove such highlights.
 @item
-If the cursor is in one of the special @code{#+KEYWORD} lines, this
-triggers scanning the buffer for these lines and updating the
-information.
+If the cursor is in one of the special @code{#+KEYWORD} lines, scan the
+buffer for these lines and update the information.
 @item
-If the cursor is inside a table, realign the table.  This command
-works even if the automatic table editor has been turned off.
+If the cursor is inside a table, realign the table.  The table realigns even
+if automatic table editor is turned off.
 @item
 If the cursor is on a @code{#+TBLFM} line, re-apply the formulas to
 the entire table.
 @item
-If the current buffer is a capture buffer, close the note and file it.
-With a prefix argument, file it, without further interaction, to the
-default location.
+If the current buffer is a capture buffer, close the note and file it.  With
+a prefix argument, also jump to the target location after saving the note.
 @item
 If the cursor is on a @code{<<<target>>>}, update radio targets and
 corresponding links in this buffer.
 @item
-If the cursor is in a property line or at the start or end of a property
+If the cursor is on a property line or at the start or end of a property
 drawer, offer property commands.
 @item
 If the cursor is at a footnote reference, go to the corresponding
@@ -16494,18 +17474,18 @@ block is updated.
 If the cursor is at a timestamp, fix the day name in the timestamp.
 @end itemize
 
-@node Clean view, TTY keys, The very busy C-c C-c key, Miscellaneous
+@node Clean view
 @section A cleaner outline view
 @cindex hiding leading stars
 @cindex dynamic indentation
 @cindex odd-levels-only outlines
 @cindex clean outline view
 
-Some people find it noisy and distracting that the Org headlines start with a
-potentially large number of stars, and that text below the headlines is not
-indented.  While this is no problem when writing a @emph{book-like} document
-where the outline headings are really section headings, in a more
-@emph{list-oriented} outline, indented structure is a lot cleaner:
+Org's default outline with stars and no indents can become too cluttered for
+short documents.  For @emph{book-like} long documents, the effect is not as
+noticeable.  Org provides an alternate stars and indentation scheme, as shown
+on the right in the following table.  It uses only one star and indents text
+to line with the heading:
 
 @example
 @group
@@ -16521,38 +17501,40 @@ more text                        |          more text
 
 @noindent
 
-If you are using at least Emacs 23.2@footnote{Emacs 23.1 can actually crash
-with @code{org-indent-mode}} and version 6.29 of Org, this kind of view 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@footnote{@code{org-indent-mode} also sets the @code{wrap-prefix}
-property, such that @code{visual-line-mode} (or purely setting
-@code{word-wrap}) wraps long lines (including headlines) correctly indented.
-}.  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
+To turn this mode on, use the minor mode, @code{org-indent-mode}.  Text lines
+that are not headlines are prefixed with spaces to vertically align with the
+headline text@footnote{The @code{org-indent-mode} also sets the
+@code{wrap-prefix} correctly for indenting and wrapping long lines of
+headlines or text.  This minor mode handles @code{visual-line-mode} and
+directly applied settings through @code{word-wrap}.}.
+
+To make more horizontal space, the headlines are shifted by two stars.  This
+can be configured by the @code{org-indent-indentation-per-level} variable.
+Only one star on each headline is visible, the rest are masked with the same
+font color as the background.  This font face can be configured with the
+@code{org-hide} variable.
+
+Note that 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
+@code{nil}; @samp{2.} below shows how this works.
+
+To globally turn on @code{org-indent-mode} for all files, customize the
+variable @code{org-startup-indented}.
+
+To turn on indenting for individual files, use @code{#+STARTUP} option as
+follows:
 
 @example
 #+STARTUP: indent
 @end example
 
-If you want a similar effect in an 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:
+Indent on startup makes Org use hard spaces to align text with headings as
+shown in examples below.
 
 @enumerate
 @item
 @emph{Indentation of text below headlines}@*
-You may indent text below each headline to make the left boundary line up
-with the headline, like
+Indent text to align with the headline.
 
 @example
 *** 3rd level
@@ -16560,23 +17542,21 @@ with the headline, like
 @end example
 
 @vindex org-adapt-indentation
-Org supports this with paragraph filling, line wrapping, and structure
-editing@footnote{See also the variable @code{org-adapt-indentation}.},
-preserving or adapting the indentation as appropriate.
+Org adapts indentations with paragraph filling, line wrapping, and structure
+editing@footnote{Also see the variable @code{org-adapt-indentation}.}.
 
 @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
-with
+@emph{Hiding leading stars}@* Org can make leading stars invisible.  For
+global preference, configure the variable @code{org-hide-leading-stars}.  For
+per-file preference, use these file @code{#+STARTUP} options:
 
 @example
 #+STARTUP: hidestars
 #+STARTUP: showstars
 @end example
 
-With hidden stars, the tree becomes:
+With stars hidden, the tree is shown as:
 
 @example
 @group
@@ -16589,50 +17569,39 @@ With hidden stars, the tree becomes:
 
 @noindent
 @vindex org-hide @r{(face)}
-The leading stars are not truly replaced by whitespace, they are only
-fontified with the face @code{org-hide} that uses the background color as
-font color.  If you are not using either white or black background, you may
-have to customize this face to get the wanted effect.  Another possibility is
-to set this font such that the extra stars are @i{almost} invisible, for
-example using the color @code{grey90} on a white background.
+Because Org makes the font color same as the background color to hide to
+stars, sometimes @code{org-hide} face may need tweaking to get the effect
+right.  For some black and white combinations, @code{grey90} on a white
+background might mask the stars better.
 
 @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@footnote{When you need to specify a level for a property search
-or refile targets, @samp{LEVEL=2} will correspond to 3 stars, etc.}.  In this
-way we get the outline view shown at the beginning of this section.  In order
-to make the structure editing and export commands handle this convention
-correctly, configure the variable @code{org-odd-levels-only}, or set this on
-a per-file basis with one of the following lines:
+Using stars for only odd levels, 1, 3, 5, @dots{}, can also clean up the
+clutter.  This removes two stars from each level@footnote{Because
+@samp{LEVEL=2} has 3 stars, @samp{LEVEL=3} has 4 stars, and so on}.  For Org
+to properly handle this cleaner structure during edits and exports, configure
+the variable @code{org-odd-levels-only}.  To set this per-file, use either
+one of the following lines:
 
 @example
 #+STARTUP: odd
 #+STARTUP: oddeven
 @end example
 
-You can convert an Org file from single-star-per-level to the
-double-star-per-level convention with @kbd{M-x org-convert-to-odd-levels
-RET} in that file.  The reverse operation is @kbd{M-x
-org-convert-to-oddeven-levels}.
+To switch between single and double stars layouts, use @kbd{M-x
+org-convert-to-odd-levels RET} and @kbd{M-x org-convert-to-oddeven-levels}.
 @end enumerate
 
-@node TTY keys, Interaction, Clean view, Miscellaneous
+@node TTY keys
 @section Using Org on a tty
 @cindex tty key bindings
 
-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
-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 workaround suits you better.  For example, changing a timestamp
-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.
+Org provides alternative key bindings for TTY and modern mobile devices that
+cannot handle cursor keys and complex modifier key chords.  Some of these
+workarounds may be more cumbersome than necessary.  Users should look into
+customizing these further based on their usage needs.  For example, the
+normal @kbd{S-@key{cursor}} for editing timestamp might be better with
+@kbd{C-c .} chord.
 
 @multitable @columnfractions 0.15 0.2 0.1 0.2
 @item @b{Default} @tab @b{Alternative 1} @tab @b{Speed key} @tab @b{Alternative 2}
@@ -16657,74 +17626,62 @@ tty you would rather use @kbd{C-c .} to re-insert the timestamp.
 @end multitable
 
 
-@node Interaction, org-crypt, TTY keys, Miscellaneous
+@node Interaction
 @section Interaction with other packages
 @cindex packages, interaction with other
-Org lives in the world of GNU Emacs and interacts in various ways
-with other code out there.
+Org's compatibility and the level of interaction with other Emacs packages
+are documented here.
+
 
 @menu
 * Cooperation::                 Packages Org cooperates with
 * Conflicts::                   Packages that lead to conflicts
 @end menu
 
-@node Cooperation, Conflicts, Interaction, Interaction
+@node Cooperation
 @subsection Packages that Org cooperates with
 
 @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 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}.
+Org uses the Calc package for tables to implement spreadsheet functionality
+(@pxref{The spreadsheet}).  Org also uses Calc for embedded calculations.
+@xref{Embedded Mode, , Embedded Mode, calc, GNU Emacs Calc Manual}.
 @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
-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}.
+Org can use names for constants in formulas in tables.  Org can also use
+calculation suffixes for units, such as @samp{M} for @samp{Mega}.  For a
+standard collection of such constants, install the @file{constants} package.
+Install version 2.0 of this package, available at
+@url{http://www.astro.uva.nl/~dominik/Tools}.  Org checks if the function
+@code{constants-get} has been autoloaded.  Installation instructions are in
+the file, @file{constants.el}.
 @item @file{cdlatex.el} by Carsten Dominik
 @cindex @file{cdlatex.el}
 @cindex Dominik, Carsten
-Org mode can make use of the CD@LaTeX{} package to efficiently enter
-@LaTeX{} fragments into Org files.  See @ref{CDLaTeX mode}.
+Org mode can use CD@LaTeX{} package to efficiently enter @LaTeX{} fragments
+into Org files (@pxref{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:
+Imenu creates dynamic menus based on an index of items in a file.  Org mode
+supports Imenu menus.  Enable it with a mode hook as follows:
 @lisp
 (add-hook 'org-mode-hook
           (lambda () (imenu-add-to-menubar "Imenu")))
 @end lisp
 @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 used to use this package for capture, but no longer does.
+By default the Imenu index is two levels deep.  Change the index depth using
+thes variable, @code{org-imenu-depth}.
 @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 you to
-restrict the scope of agenda commands to a file or a subtree by using
-the command @kbd{<} in the Speedbar frame.
+Speedbar package creates a special Emacs frame for displaying files and index
+items in files.  Org mode supports Speedbar; users can drill into Org files
+directly from the Speedbar.  The @kbd{<} in the Speedbar frame tweeks the
+agenda commands to that file or to a subtree.
 @cindex @file{table.el}
 @item @file{table.el} by Takaaki Ota
 @kindex C-c C-c
@@ -16733,13 +17690,11 @@ the command @kbd{<} in the Speedbar frame.
 @cindex Ota, Takaaki
 
 Complex ASCII tables with automatic line wrapping, column- and row-spanning,
-and alignment can be created using the Emacs table package by Takaaki Ota
-(@uref{http://sourceforge.net/projects/table}, and also part of Emacs 22).
-Org mode will recognize these tables and export them properly.  Because of
-interference with other Org mode functionality, you unfortunately cannot edit
-these tables directly in the buffer.  Instead, you need to use the command
-@kbd{C-c '} to edit them, similar to source code snippets.
-
+and alignment can be created using the Emacs table package by Takaaki Ota.
+Org mode recognizes such tables and export them properly.  @kbd{C-c '} to
+edit these tables in a special buffer, much like Org's @samp{src} code
+blocks.  Because of interference with other Org mode functionality, Takaaki
+Ota tables cannot be edited directly in the Org buffer.
 @table @kbd
 @orgcmd{C-c ',org-edit-special}
 Edit a @file{table.el} table.  Works when the cursor is in a table.el table.
@@ -16747,50 +17702,37 @@ Edit a @file{table.el} table.  Works when the cursor is in a table.el table.
 @orgcmd{C-c ~,org-table-create-with-table.el}
 Insert a @file{table.el} table.  If there is already a table at point, this
 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.
+format.  See the documentation string of the command @code{org-convert-table}
+for details.
 @end table
-@file{table.el} is part of Emacs since Emacs 22.
-@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}),
-which makes using @file{footnote.el} unnecessary.
 @end table
 
-@node Conflicts,  , Cooperation, Interaction
-@subsection Packages that lead to conflicts with Org mode
+@node Conflicts
+@subsection Packages that conflict with Org mode
 
 @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
-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.
+In Emacs, @code{shift-selection-mode} combines cursor motions with shift key
+to enlarge regions.  Emacs sets this mode by default.  This conflicts with
+Org's use of @kbd{S-@key{cursor}} commands to change timestamps, TODO
+keywords, priorities, and item bullet types, etc.  Since @kbd{S-@key{cursor}}
+commands outside of specific contexts don't do anything, Org offers the
+variable @code{org-support-shift-select} for customization.  Org mode
+accommodates shift selection by (i) making it available outside of the
+special contexts where special commands apply, and (ii) extending an
+existing active region even if the cursor moves across a special context.
 
 @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 @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,
-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 will move the following key bindings in Org files, and in the agenda
-buffer (but not during date selection).
+Org key bindings conflict with @kbd{S-<cursor>} keys used by CUA mode.  For
+Org to relinquish these bindings to CUA mode, configure the variable
+@code{org-replace-disputed-keys}.  When set, Org moves the following key
+bindings in Org files, and in the agenda buffer (but not during date
+selection).
 
 @example
 S-UP      @result{}  M-p             S-DOWN     @result{}  M-n
@@ -16799,9 +17741,8 @@ C-S-LEFT  @result{}  M-S--           C-S-RIGHT  @result{}  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}.
+Yes, these are unfortunately more difficult to remember.  To define a
+different replacement keys, look at the variable @code{org-disputed-keys}.
 
 @item @file{ecomplete.el} by Lars Magne Ingebrigtsen @email{larsi@@gnus.org}
 @cindex @file{ecomplete.el}
@@ -16819,9 +17760,8 @@ manually when needed in the messages body.
 @cindex @file{filladapt.el}
 
 Org mode tries to do the right thing when filling paragraphs, list items and
-other elements.  Many users reported they had problems using both
-@file{filladapt.el} and Org mode, so a safe thing to do is to disable it like
-this:
+other elements.  Many users reported problems using both @file{filladapt.el}
+and Org mode, so a safe thing to do is to disable filladapt like this:
 
 @lisp
 (add-hook 'org-mode-hook 'turn-off-filladapt-mode)
@@ -16836,20 +17776,19 @@ fixed this problem:
 @lisp
 (add-hook 'org-mode-hook
           (lambda ()
-            (org-set-local 'yas/trigger-key [tab])
+            (setq-local yas/trigger-key [tab])
             (define-key yas/keymap [tab] 'yas/next-field-or-maybe-expand)))
 @end lisp
 
 The latest version of yasnippet doesn't play well with Org mode.  If the
-above code does not fix the conflict, start by defining the following
-function:
+above code does not fix the conflict, first define the following function:
 
 @lisp
 (defun yas/org-very-safe-expand ()
   (let ((yas/fallback-behavior 'return-nil)) (yas/expand)))
 @end lisp
 
-Then, tell Org mode what to do with the new function:
+Then tell Org mode to use that function:
 
 @lisp
 (add-hook 'org-mode-hook
@@ -16892,21 +17831,19 @@ another key for this command, or override the key in
 
 @end table
 
-@node org-crypt,  , Interaction, Miscellaneous
+@node org-crypt
 @section org-crypt.el
 @cindex @file{org-crypt.el}
 @cindex @code{org-decrypt-entry}
 
-Org-crypt will encrypt the text of an entry, but not the headline, or
-properties.  Org-crypt uses the Emacs EasyPG library to encrypt and decrypt
-files.
+Org crypt encrypts the text of an Org entry, but not the headline, or
+properties.  Org crypt uses the Emacs EasyPG library to encrypt and decrypt.
 
 Any text below a headline that has a @samp{:crypt:} tag will be automatically
-be encrypted when the file is saved.  If you want to use a different tag just
-customize the @code{org-crypt-tag-matcher} setting.
+be encrypted when the file is saved.  To use a different tag, customize the
+@code{org-crypt-tag-matcher} variable.
 
-To use org-crypt it is suggested that you have the following in your
-@file{.emacs}:
+Suggested Org crypt settings in Emacs init file:
 
 @lisp
 (require 'org-crypt)
@@ -16928,14 +17865,14 @@ To use org-crypt it is suggested that you have the following in your
   ;; # -*- buffer-auto-save-file-name: nil; -*-
 @end lisp
 
-Excluding the crypt tag from inheritance prevents already encrypted text
-being encrypted again.
+Excluding the crypt tag from inheritance prevents encrypting previously
+encrypted text.
 
-@node Hacking, MobileOrg, Miscellaneous, Top
+@node Hacking
 @appendix Hacking
 @cindex hacking
 
-This appendix covers some aspects where users can extend the functionality of
+This appendix covers some areas where users can extend the functionality of
 Org.
 
 @menu
@@ -16953,38 +17890,35 @@ Org.
 * Using the mapping API::       Mapping over all or selected entries
 @end menu
 
-@node Hooks, Add-on packages, Hacking, Hacking
+@node Hooks
 @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}.
+Org has a large number of hook variables for adding functionality.  This
+appendix illustrates using a few.  A complete list of hooks with
+documentation is maintained by the Worg project at
+@uref{http://orgmode.org/worg/doc.html#hooks}.
 
-@node Add-on packages, Adding hyperlink types, Hooks, Hacking
+@node Add-on packages
 @section Add-on packages
 @cindex add-on packages
 
-A large number of add-on packages have been written by various authors.
+Various authors wrote a large number of add-on packages for Org.
 
 These packages are not part of Emacs, but they are distributed as contributed
 packages with the separate release available at @uref{http://orgmode.org}.
 See the @file{contrib/README} file in the source code directory for a list of
-contributed files.  You may also find some more information on the Worg page:
+contributed files.  Worg page with more information is at:
 @uref{http://orgmode.org/worg/org-contrib/}.
 
-@node Adding hyperlink types, Adding export back-ends, Add-on packages, Hacking
+@node Adding hyperlink types
 @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, Org
-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
-@samp{[[man:printf][The printf manpage]]} to show Unix manual pages inside
-Emacs:
+Org has many built-in hyperlink types (@pxref{Hyperlinks}), and an interface
+for adding new link types.  The example file, @file{org-man.el}, shows the
+process of adding Org links to Unix man pages, which look like this:
+@samp{[[man:printf][The printf manpage]]}:
 
 @lisp
 ;;; org-man.el - Support for links to manpages in Org
@@ -17029,149 +17963,118 @@ PATH should be a topic that can be thrown at the man command."
 @end lisp
 
 @noindent
-You would activate this new link type in @file{.emacs} with
+To activate links to man pages in Org, enter this in the init file:
 
 @lisp
 (require 'org-man)
 @end lisp
 
 @noindent
-Let's go through the file and see what it does.
+A review of @file{org-man.el}:
 @enumerate
 @item
-It does @code{(require 'org)} to make sure that @file{org.el} has been
-loaded.
+First, @code{(require 'org)} ensures @file{org.el} is loaded.
 @item
-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.
+The @code{org-add-link-type} defines a new link type with @samp{man} prefix.
+The call contains the function to call that follows the link type.
 @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.
+The next line adds a function to @code{org-store-link-functions} that records
+a useful link with the command @kbd{C-c l} 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
-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
-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}, 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
-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
-@samp{man:}.  Then it must call the command @code{org-store-link-props}
-and set the @code{:type} and @code{:link} properties.  Optionally you
-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}.
-
-When it makes sense for your new link type, you may also define a function
-@code{org-PREFIX-complete-link} that implements special (e.g., 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 Adding export back-ends, Context-sensitive commands, Adding hyperlink types, Hacking
+The rest of the file defines necessary variables and functions.  First is the
+customization variable @code{org-man-command}.  It has two options,
+@code{man} and @code{woman}.  Next is a function whose argument is the link
+path, which for man pages is the topic of the man command.  To follow the
+link, the function calls the @code{org-man-command} to display the man page.
+
+
+@kbd{C-c l} constructs and stores the link.
+
+@kbd{C-c l} calls the function @code{org-man-store-link}, which first checks
+if the @code{major-mode} is appropriate.  If check fails, the function
+returns @code{nil}.  Otherwise the function makes a link string by combining
+the @samp{man:} prefix with the man topic.  The function then calls
+@code{org-store-link-props} with @code{:type} and @code{:link} properties.  A
+@code{:description} property is an optional string that is displayed when the
+function inserts the link in the Org buffer.
+
+@kbd{C-c C-l} inserts the stored link.
+
+To define new link types, define a function that implements completion
+support with @kbd{C-c C-l}.  This function should not accept any arguments
+but return the appropriate prefix and complete link string.
+
+@node Adding export back-ends
 @section Adding export back-ends
 @cindex Export, writing back-ends
 
-Org 8.0 comes with a completely rewritten export engine which makes it easy
-to write new export back-ends, either from scratch, or from deriving them
-from existing ones.
-
-Your two entry points are respectively @code{org-export-define-backend} and
-@code{org-export-define-derived-backend}.  To grok these functions, you
-should first have a look at @file{ox-latex.el} (for how to define a new
-back-end from scratch) and @file{ox-beamer.el} (for how to derive a new
-back-end from an existing one.
-
-When creating a new back-end from scratch, the basic idea is to set the name
-of the back-end (as a symbol) and an an alist of elements and export
-functions.  On top of this, you will need to set additional keywords like
-@code{:menu-entry} (to display the back-end in the export dispatcher),
-@code{:export-block} (to specify what blocks should not be exported by this
-back-end), and @code{:options-alist} (to let the user set export options that
-are specific to this back-end.)
-
-Deriving a new back-end is similar, except that you need to set
-@code{:translate-alist} to an alist of export functions that should be used
-instead of the parent back-end functions.
-
-For a complete reference documentation, see
+Org's export engine makes it easy for writing new back-ends.  The framework
+on which the engine was built makes it easy to derive new back-ends from
+existing ones.
+
+The two main entry points to the export engine are:
+@code{org-export-define-backend} and
+@code{org-export-define-derived-backend}.  To grok these functions, see
+@file{ox-latex.el} for an example of defining a new back-end from scratch,
+and @file{ox-beamer.el} for an example of deriving from an existing engine.
+
+For creating a new back-end from scratch, first set its name as a symbol in
+an alist consisting of elements and export functions.  To make the back-end
+visible to the export dispatcher, set @code{:menu-entry} keyword.  For export
+options specific to this back-end, set the @code{:options-alist}.
+
+For creating a new back-end from an existing one, set @code{:translate-alist}
+to an alist of export functions.  This alist replaces the parent back-end
+functions.
+
+For complete documentation, see
 @url{http://orgmode.org/worg/dev/org-export-reference.html, the Org Export
 Reference on Worg}.
 
-@node Context-sensitive commands, Tables in arbitrary syntax, Adding export back-ends, Hacking
+@node Context-sensitive commands
 @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 is 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.
+Org has facilities for building context sensitive commands.  Authors of Org
+add-ons can tap into this functionality.
 
-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
-@footnote{@file{org-R.el} has been replaced by the Org mode functionality
-described in @ref{Working With Source Code} and is now obsolete.}.  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.
+Some Org commands change depending on the context.  The most important
+example of this behavior is the @kbd{C-c C-c} (@pxref{The very busy C-c C-c
+key}).  Other examples are @kbd{M-cursor} and @kbd{M-S-cursor}.
 
+These context sensitive commands work by providing a function that detects
+special context for that add-on and executes functionality appropriate for
+that context.
 
-@node Tables in arbitrary syntax, Dynamic blocks, Context-sensitive commands, Hacking
+@node Tables in arbitrary syntax
 @section Tables and lists in arbitrary syntax
 @cindex tables, in other modes
 @cindex lists, in other modes
 @cindex Orgtbl mode
 
-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 @LaTeX{}.  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
-editor.
-
-This appendix describes a different approach.  We keep the Orgtbl mode
-table in its native format (the @i{source table}), and use a custom
-function to @i{translate} the table to the correct syntax, and to
-@i{install} it in the right location (the @i{target table}).  This puts
-the burden of writing conversion functions on the user, but it allows
-for a very flexible system.
-
-Bastien added the ability to do the same with lists, in Orgstruct mode.  You
-can use Org's facilities to edit and structure lists by turning
-@code{orgstruct-mode} on, then locally exporting such lists in another format
-(HTML, @LaTeX{} or Texinfo.)
-
+Because of Org's success in handling tables with Orgtbl, a frequently asked
+feature is to Org's usability functions to other table formats native to
+other modem's, such as @LaTeX{}.  This would be hard to do in a general way
+without complicated customization nightmares.  Moreover, that would take Org
+away from its simplicity roots that Orgtbl has proven.  There is, however, an
+alternate approach to accomplishing the same.
+
+This approach involves implementing a custom @emph{translate} function that
+operates on a native Org @emph{source table} to produce a table in another
+format.  This strategy would keep the excellently working Orgtbl simple and
+isolate complications, if any, confined to the translate function.  To add
+more alien table formats, we just add more translate functions.  Also the
+burden of developing custom translate functions for new table formats will be
+in the hands of those who know those formats best.
+
+For an example of how this strategy works, see Orgstruct mode.  In that mode,
+Bastien added the ability to use Org's facilities to edit and re-structure
+lists.  He did by turning @code{orgstruct-mode} on, and then exporting the
+list locally to another format, such as HTML, @LaTeX{} or Texinfo.
 
 @menu
 * Radio tables::                Sending and receiving radio tables
@@ -17180,15 +18083,17 @@ can use Org's facilities to edit and structure lists by turning
 * Radio lists::                 Sending and receiving lists
 @end menu
 
-@node Radio tables, A @LaTeX{} example, Tables in arbitrary syntax, Tables in arbitrary syntax
+@node Radio tables
 @subsection Radio tables
 @cindex radio tables
 
-To define the location of the target table, you first need to create two
-lines that are comments in the current mode, but contain magic words
-@code{BEGIN/END RECEIVE ORGTBL} for Orgtbl mode to find.  Orgtbl mode will
-insert the translated table between these lines, replacing whatever was there
-before.  For example in C mode where comments are between @code{/* ... */}:
+Radio tables are target locations for translated tables that are not near
+their source.  Org finds the target location and inserts the translated
+table.
+
+The key to finding the target location are the magic words @code{BEGIN/END
+RECEIVE ORGTBL}.  They have to appear as comments in the current mode.  If
+the mode is C, then:
 
 @example
 /* BEGIN RECEIVE ORGTBL table_name */
@@ -17196,8 +18101,8 @@ before.  For example in C mode where comments are between @code{/* ... */}:
 @end example
 
 @noindent
-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
+At the location of source, Org needs a special line to direct Orgtbl to
+translate and to find the target for inserting the translated table.  For
 example:
 @cindex #+ORGTBL
 @example
@@ -17205,67 +18110,53 @@ example:
 @end example
 
 @noindent
-@code{table_name} is the reference name for the table that is also used
-in the receiver lines.  @code{translation_function} is the Lisp function
-that does the translation.  Furthermore, the line can contain a list of
-arguments (alternating key and value) at the end.  The arguments will be
-passed as a property list to the translation function for
-interpretation.  A few standard parameters are already recognized and
-acted upon before the translation function is called:
+@code{table_name} is the table's reference name, which is also used in the
+receiver lines, and the @code{translation_function} is the Lisp function that
+translates.  This line, in addition, may also contain alternating key and
+value arguments at the end.  The translation function gets these values as a
+property list.  A few standard parameters are already recognized and acted
+upon before the translation function is called:
 
 @table @code
 @item :skip N
-Skip the first N lines of the table.  Hlines do count as separate lines for
-this parameter!
+Skip the first N lines of the table.  Hlines do count; include them if they
+are to be skipped.
 
 @item :skipcols (n1 n2 ...)
-List of columns that should be skipped.  If the table has a column with
-calculation marks, that column is automatically discarded as well.
-Please note that the translator function sees the table @emph{after} the
-removal of these columns, the function never knows that there have been
-additional columns.
-
-@item :no-escape t
-When non-@code{nil}, do not escape special characters @code{&%#_^} when exporting
-the table.  The default value is @code{nil}.
+List of columns to be skipped.  First Org automatically discards columns with
+calculation marks and then sends the table to the translator function, which
+then skips columns as specified in @samp{skipcols}.
 @end table
 
 @noindent
-The one problem remaining is how to keep the source table in the buffer
-without disturbing the normal workings of the file, for example during
-compilation of a C file or processing of a @LaTeX{} file.  There are a
-number of different solutions:
+To keep the source table intact in the buffer without being disturbed when
+the source file is compiled or otherwise being worked on, use one of these
+strategies:
 
 @itemize @bullet
 @item
-The table could be placed in a block comment if that is supported by the
-language.  For example, in C mode you could wrap the table between
-@samp{/*} and @samp{*/} lines.
+Place the table in a block comment.  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@}}
-in @LaTeX{}.
+Put the table after an @samp{END} statement.  For example @samp{\bye} in
+@TeX{} and @samp{\end@{document@}} in @LaTeX{}.
 @item
-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 RET}
-makes this comment-toggling very easy, in particular if you bind it to a
-key.
+Comment and uncomment each line of the table during edits.  The @kbd{M-x
+orgtbl-toggle-comment RET} command makes toggling easy.
 @end itemize
 
-@node A @LaTeX{} example, Translator functions, Radio tables, Tables in arbitrary syntax
+@node A @LaTeX{} example
 @subsection A @LaTeX{} example of radio tables
 @cindex @LaTeX{}, and Orgtbl mode
 
-The best way to wrap the source table in @LaTeX{} is to use the
-@code{comment} environment provided by @file{comment.sty}.  It has to be
-activated by placing @code{\usepackage@{comment@}} into the document
-header.  Orgtbl mode can insert a radio table skeleton@footnote{By
-default this works only for @LaTeX{}, HTML, and Texinfo.  Configure the
-variable @code{orgtbl-radio-table-templates} to install templates for other
-modes.}  with the command @kbd{M-x orgtbl-insert-radio-table RET}.  You will
-be prompted for a table name, let's say we use @samp{salesfigures}.  You
-will then get the following template:
+To wrap a source table in @LaTeX{}, use the @code{comment} environment
+provided by @file{comment.sty}.  To activate it, put
+@code{\usepackage@{comment@}} in the document header.  Orgtbl mode inserts a
+radio table skeleton@footnote{By default this works only for @LaTeX{}, HTML,
+and Texinfo.  Configure the variable @code{orgtbl-radio-table-templates} to
+install templates for other export formats.}  with the command @kbd{M-x
+orgtbl-insert-radio-table RET}, which prompts for a table name.  For example,
+if @samp{salesfigures} is the name, the template inserts:
 
 @cindex #+ORGTBL, SEND
 @example
@@ -17279,17 +18170,17 @@ will then get the following template:
 
 @noindent
 @vindex @LaTeX{}-verbatim-environments
-The @code{#+ORGTBL: SEND} line tells Orgtbl mode to use the function
-@code{orgtbl-to-latex} to convert the table into @LaTeX{} 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
-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 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}.}:
+The line @code{#+ORGTBL: SEND} tells Orgtbl mode to use the function
+@code{orgtbl-to-latex} to convert the table to @LaTeX{} format, then insert
+the table at the target (receive) location named @code{salesfigures}.  Now
+the table is ready for data entry.  It can even use 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 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 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}.}:
 
 @example
 % BEGIN RECEIVE ORGTBL salesfigures
@@ -17307,14 +18198,12 @@ variable @code{LaTeX-verbatim-environments}.}:
 @end example
 
 @noindent
-When you are done, press @kbd{C-c C-c} in the table to get the converted
-table inserted between the two marker lines.
+After editing, @kbd{C-c C-c} inserts translated table at the target location,
+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
-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
-header and footer commands of the target table:
+For hand-made custom tables, note that the translator needs to skip the first
+two lines of the source table.  Also the command has to @emph{splice} out the
+target table without the header and footer.
 
 @example
 \begin@{tabular@}@{lrrr@}
@@ -17335,135 +18224,109 @@ Month & \multicolumn@{1@}@{c@}@{Days@} & Nr.\ sold & per day\\
 @end example
 
 The @LaTeX{} 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 @pxref{Translator functions}):
+Orgtbl mode and uses @code{tabular} environment by default to typeset the
+table and mark the horizontal lines with @code{\hline}.  For additional
+parameters to control output, @pxref{Translator functions}:
 
 @table @code
 @item :splice nil/t
-When set to t, return only table body lines, don't wrap them into a
-tabular environment.  Default is @code{nil}.
+When non-@code{nil}, returns only table body lines; not wrapped in tabular
+environment.  Default is @code{nil}.
 
 @item :fmt fmt
-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
+Format to warp each field.  It should contain @code{%s} for the original
+field value.  For example, to wrap each field value in dollar symbol, you
+could use @code{:fmt "$%s$"}.  Format can also wrap a property list with
 column numbers and formats, for example @code{:fmt (2 "$%s$" 4 "%s\\%%")}.
-A function of one argument can be used in place of the strings; the
-function must return a formatted string.
+In place of a string, a function of one argument can be used; the function
+must return a formatted string.
 
 @item :efmt efmt
-Use this format to print numbers with exponentials.  The format should
-have @code{%s} twice for inserting mantissa and exponent, for example
-@code{"%s\\times10^@{%s@}"}.  The default is @code{"%s\\,(%s)"}.  This
-may also be a property list with column numbers and formats, for example
+Format numbers as exponentials.  The spec should have @code{%s} twice for
+inserting mantissa and exponent, for example @code{"%s\\times10^@{%s@}"}.
+This may also be a property list with column numbers and formats, for example
 @code{:efmt (2 "$%s\\times10^@{%s@}$" 4 "$%s\\cdot10^@{%s@}$")}.  After
-@code{efmt} has been applied to a value, @code{fmt} will also be
-applied.  Similar to @code{fmt}, functions of two arguments can be
-supplied instead of strings.
+@code{efmt} has been applied to a value, @code{fmt} will also be applied.
+Functions with two arguments can be supplied instead of strings.  By default,
+no special formatting is applied.
 @end table
 
-@node Translator functions, Radio lists, A @LaTeX{} example, Tables in arbitrary syntax
+@node Translator functions
 @subsection Translator functions
 @cindex HTML, and Orgtbl mode
 @cindex translator function
 
-Orgtbl mode has several translator functions built-in: @code{orgtbl-to-csv}
-(comma-separated values), @code{orgtbl-to-tsv} (TAB-separated values)
-@code{orgtbl-to-latex}, @code{orgtbl-to-html}, and @code{orgtbl-to-texinfo}.
-Except for @code{orgtbl-to-html}@footnote{The HTML translator uses the same
-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 processing over to the generic translator.  Here is the entire code:
+Orgtbl mode has built-in translator functions: @code{orgtbl-to-csv}
+(comma-separated values), @code{orgtbl-to-tsv} (TAB-separated values),
+@code{orgtbl-to-latex}, @code{orgtbl-to-html}, @code{orgtbl-to-texinfo},
+@code{orgtbl-to-unicode} and @code{orgtbl-to-orgtbl}.  They use the generic
+translator, @code{orgtbl-to-generic}, which delegates translations to various
+export back-ends.
 
-@lisp
-@group
-(defun orgtbl-to-latex (table params)
-  "Convert the Orgtbl mode TABLE to LaTeX."
-  (let* ((alignment (mapconcat (lambda (x) (if x "r" "l"))
-                               org-table-last-alignment ""))
-         (params2
-          (list
-           :tstart (concat "\\begin@{tabular@}@{" alignment "@}")
-           :tend "\\end@{tabular@}"
-           :lstart "" :lend " \\\\" :sep " & "
-           :efmt "%s\\,(%s)" :hline "\\hline")))
-    (orgtbl-to-generic table (org-combine-plists params2 params))))
-@end group
-@end lisp
-
-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
-ones set by the @samp{ORGTBL SEND} line) take precedence.  So if you
-would like to use the @LaTeX{} translator, but wanted the line endings to
-be @samp{\\[2mm]} instead of the default @samp{\\}, you could just
-overrule the default with
+Properties passed to the function through the @samp{ORGTBL SEND} line take
+precedence over properties defined inside the function.  For example, this
+overrides the default @LaTeX{} line endings, @samp{\\}, with @samp{\\[2mm]}:
 
 @example
 #+ORGTBL: SEND test orgtbl-to-latex :lend " \\\\[2mm]"
 @end example
 
-For a new language, you can either write your own converter function in
-analogy with the @LaTeX{} 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
-separator is a TAB, you could call the generic translator like this (on
-a single line!):
+For a new language translator, define a converter function.  It can be a
+generic function, such as shown in this example.  It marks a beginning and
+ending of a table with @samp{!BTBL!} and @samp{!ETBL!}; a beginning and
+ending of lines with @samp{!BL!} and @samp{!EL!}; and uses a TAB for a field
+separator:
 
-@example
-#+ORGTBL: SEND test orgtbl-to-generic :tstart "!BTBL!" :tend "!ETBL!"
-                              :lstart "!BL! " :lend " !EL!" :sep "\t"
-@end example
+@lisp
+(defun orgtbl-to-language (table params)
+  "Convert the orgtbl-mode TABLE to language."
+  (orgtbl-to-generic
+   table
+   (org-combine-plists
+    '(:tstart "!BTBL!" :tend "!ETBL!" :lstart "!BL!" :lend "!EL!" :sep "\t")
+    params)))
+@end lisp
 
 @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
+The documentation for the @code{orgtbl-to-generic} function shows a complete
+list of parameters, each of which can be passed through to
 @code{orgtbl-to-latex}, @code{orgtbl-to-texinfo}, and any other function
-using the generic function.
-
-Of course you can also write a completely new function doing complicated
-things the generic translator cannot do.  A translator function takes
-two arguments.  The first argument is the table, a list of lines, each
-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 @email{emacs-orgmode@@gnu.org} so that
-others can benefit from your work.
-
-@node Radio lists,  , Translator functions, Tables in arbitrary syntax
+using that generic function.
+
+For complicated translations the generic translator function could be
+replaced by a custom translator function.  Such a custom function must take
+two arguments and return a single string containing the formatted table.  The
+first argument is the table whose lines are a list of fields or the symbol
+@code{hline}.  The second argument is the property list consisting of
+parameters specified in the @samp{#+ORGTBL: SEND} line.  Please share your
+translator functions by posting them to the Org users mailing list,
+@email{emacs-orgmode@@gnu.org}.
+
+@node Radio lists
 @subsection Radio lists
 @cindex radio lists
 @cindex org-list-insert-radio-list
 
-Sending and receiving radio lists works exactly the same way as sending and
-receiving radio tables (@pxref{Radio tables}).  As for radio tables, you can
-insert radio list templates in HTML, @LaTeX{} and Texinfo modes by calling
-@code{org-list-insert-radio-list}.
-
-Here are the differences with radio tables:
+Call the @code{org-list-insert-radio-list} function to insert a radio list
+template in HTML, @LaTeX{}, and Texinfo mode documents.  Sending and
+receiving radio lists works is the same as for radio tables (@pxref{Radio
+tables}) except for these differences:
 
+@cindex #+ORGLST
 @itemize @minus
 @item
 Orgstruct mode must be active.
 @item
-Use the @code{ORGLST} keyword instead of @code{ORGTBL}.
+Use @code{ORGLST} keyword instead of @code{ORGTBL}.
 @item
-The available translation functions for radio lists don't take
-parameters.
-@item
-@kbd{C-c C-c} will work when pressed on the first item of the list.
+@kbd{C-c C-c} works only on the first list item.
 @end itemize
 
-Here is a @LaTeX{} example.  Let's say that you have this in your
-@LaTeX{} file:
+Built-in translators functions are: @code{org-list-to-latex},
+@code{org-list-to-html} and @code{org-list-to-texinfo}.  They use the
+@code{org-list-to-generic} translator function.  See its documentation for
+parameters for accurate customizations of lists.  Here is a @LaTeX{} example:
 
-@cindex #+ORGLST
 @example
 % BEGIN RECEIVE ORGLST to-buy
 % END RECEIVE ORGLST to-buy
@@ -17477,21 +18340,21 @@ Here is a @LaTeX{} example.  Let's say that you have this in your
 \end@{comment@}
 @end example
 
-Pressing @kbd{C-c C-c} on @code{a new house} and will insert the converted
-@LaTeX{} list between the two marker lines.
+@kbd{C-c C-c} on @samp{a new house} inserts the translated @LaTeX{} list
+in-between the BEGIN and END marker lines.
 
-@node Dynamic blocks, Special agenda views, Tables in arbitrary syntax, Hacking
+@node Dynamic blocks
 @section Dynamic blocks
 @cindex dynamic blocks
 
-Org documents can contain @emph{dynamic blocks}.  These are
-specially marked regions that are updated by some user-written function.
-A good example for such a block is the clock table inserted by the
-command @kbd{C-c C-x C-r} (@pxref{Clocking work time}).
+Org supports @emph{dynamic blocks} in Org documents.  They are inserted with
+begin and end markers like any other @samp{src} code block, but the contents
+are updated automatically by a user function.  For example, @kbd{C-c C-x C-r}
+inserts a dynamic table that updates the work time (@pxref{Clocking work
+time}).
 
-Dynamic blocks are enclosed by a BEGIN-END structure that assigns a name
-to the block and can also specify parameters for the function producing
-the content of the block.
+Dynamic blocks can have names and function parameters.  The syntax is similar
+to @samp{src} code block specifications:
 
 @cindex #+BEGIN:dynamic block
 @example
@@ -17500,7 +18363,7 @@ the content of the block.
 #+END:
 @end example
 
-Dynamic blocks are updated with the following commands
+These command update dynamic blocks:
 
 @table @kbd
 @orgcmd{C-c C-x C-u,org-dblock-update}
@@ -17509,17 +18372,16 @@ Update dynamic block at point.
 Update all dynamic blocks in the current file.
 @end table
 
-Updating a dynamic block means to remove all the text between BEGIN and
-END, parse the BEGIN line for parameters and then call the specific
-writer function for this block to insert the new content.  If you want
-to use the original content in the writer function, you can use the
-extra parameter @code{:content}.
+Before updating a dynamic block, Org removes content between the BEGIN and
+END markers.  Org then reads the parameters on the BEGIN line for passing to
+the writer function.  If the function expects to access the removed content,
+then Org expects an extra parameter, @code{:content}, on the BEGIN line.
 
-For a block with name @code{myblock}, the writer function is
-@code{org-dblock-write:myblock} with as only parameter a property list
-with the parameters given in the begin line.  Here is a trivial example
-of a block that keeps track of when the block update function was last
-run:
+To syntax for calling a writer function with a named block, @code{myblock}
+is: @code{org-dblock-write:myblock}.  Parameters come from the BEGIN line.
+
+The following is an example of a dynamic block and a block writer function
+that updates the time when the function was last run:
 
 @example
 #+BEGIN: block-update-time :format "on %m/%d/%Y at %H:%M"
@@ -17528,7 +18390,7 @@ run:
 @end example
 
 @noindent
-The corresponding block writer function could look like this:
+The dynamic block's writer function:
 
 @lisp
 (defun org-dblock-write:block-update-time (params)
@@ -17537,47 +18399,40 @@ The corresponding block writer function could look like this:
             (format-time-string fmt))))
 @end lisp
 
-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 such that it does nothing in buffers that are not in
-@code{org-mode}.
+To keep dynamic blocks up-to-date in an Org file, use the function,
+@code{org-update-all-dblocks} in hook, such as @code{before-save-hook}.  The
+@code{org-update-all-dblocks} function does not run if the file is not in
+Org mode.
 
-You can narrow the current buffer to the current dynamic block (like any
-other block) with @code{org-narrow-to-block}.
+Dynamic blocks, like any other block, can be narrowed with
+@code{org-narrow-to-block}.
 
-@node Special agenda views, Speeding up your agendas, Dynamic blocks, Hacking
+@node Special agenda views
 @section Special agenda views
 @cindex agenda views, user-defined
 
 @vindex org-agenda-skip-function
 @vindex org-agenda-skip-function-global
-Org provides a special hook that can be used to narrow down the selection
-made by these agenda views: @code{agenda}, @code{agenda*}@footnote{The
-@code{agenda*} view is the same than @code{agenda} except that it only
-considers @emph{appointments}, i.e., scheduled and deadline items that have a
-time specification @code{[h]h:mm} in their time-stamps.}, @code{todo},
-@code{alltodo}, @code{tags}, @code{tags-todo}, @code{tags-tree}.  You may
-specify a function that is used at each match to verify if the match should
-indeed be part of the agenda view, and if not, how much should be skipped.
-You can specify a global condition that will be applied to all agenda views,
-this condition would be stored in the variable
-@code{org-agenda-skip-function-global}.  More commonly, such a definition is
-applied only to specific custom searches, using
-@code{org-agenda-skip-function}.
-
-Let's say you want to produce a list of projects that contain a WAITING
-tag anywhere in the project tree.  Let's further assume that you have
-marked all tree headings that define a project with the TODO keyword
-PROJECT@.  In this case you would run a TODO search for the keyword
-PROJECT, but skip the match unless there is a WAITING tag anywhere in
-the subtree belonging to the project line.
-
-To achieve this, you must write a function that searches the subtree for
-the tag.  If the tag is found, the function must return @code{nil} to
-indicate that this match should not be skipped.  If there is no such
-tag, return the location of the end of the subtree, to indicate that
-search should continue from there.
+Org provides a special hook to further limit items in agenda views:
+@code{agenda}, @code{agenda*}@footnote{The @code{agenda*} view is the same as
+@code{agenda} except that it only considers @emph{appointments}, i.e.,
+scheduled and deadline items that have a time specification @samp{[h]h:mm} in
+their time-stamps.}, @code{todo}, @code{alltodo}, @code{tags},
+@code{tags-todo}, @code{tags-tree}.  Specify a custom function that tests
+inclusion of every matched item in the view.  This function can also
+skip as much as is needed.
+
+For a global condition applicable to agenda views, use the
+@code{org-agenda-skip-function-global} variable.  Org uses a global condition
+with @code{org-agenda-skip-function} for custom searching.
+
+This example defines a function for a custom view showing TODO items with
+WAITING status.  Manually this is a multi step search process, but with a
+custom view, this can be automated as follows:
+
+The custom function searches the subtree for the WAITING tag and returns
+@code{nil} on match.  Otherwise it gives the location from where the search
+continues.
 
 @lisp
 (defun my-skip-unless-waiting ()
@@ -17588,8 +18443,7 @@ search should continue from there.
       subtree-end))) ; tag not found, continue after end of subtree
 @end lisp
 
-Now you may use this function in an agenda custom command, for example
-like this:
+To use this custom function in a custom agenda command:
 
 @lisp
 (org-add-agenda-custom-command
@@ -17599,22 +18453,20 @@ like this:
 @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.
+Note that this also binds @code{org-agenda-overriding-header} to a more
+meaningful string suitable for 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}@footnote{Note that, when using @code{org-odd-levels-only}, a
-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}
-and @code{org-agenda-skip-subtree-if} in this form, for example:
+
+Search for entries with a limit set on levels for the custom search.  This is
+a general appraoch to creating custom searches in Org.  To include all
+levels, use @samp{LEVEL>0}@footnote{Note that, for
+@code{org-odd-levels-only}, a level number corresponds to order in the
+hierarchy, not to the number of stars.}.  Then to selectively pick the
+matched entries, use @code{org-agenda-skip-function}, which also accepts Lisp
+forms, such as @code{org-agenda-skip-entry-if} and
+@code{org-agenda-skip-subtree-if}.  For example:
 
 @table @code
 @item (org-agenda-skip-entry-if 'scheduled)
@@ -17640,8 +18492,8 @@ Skip current entry unless the regular expression matches.
 Same as above, but check and skip the entire subtree.
 @end table
 
-Therefore we could also have written the search for WAITING projects
-like this, even without defining a special function:
+The following is an example of a search for @samp{WAITING} without the
+special function:
 
 @lisp
 (org-add-agenda-custom-command
@@ -17651,72 +18503,71 @@ like this, even without defining a special function:
     (org-agenda-overriding-header "Projects waiting for something: "))))
 @end lisp
 
-@node Speeding up your agendas, Extracting agenda information, Special agenda views, Hacking
+@node Speeding up your agendas
 @section Speeding up your agendas
 @cindex agenda views, optimization
 
-When your Org files grow in both number and size, agenda commands may start
-to become slow.  Below are some tips on how to speed up the agenda commands.
+Some agenda commands slow down when the Org files grow in size or number.
+Here are tips to speed up:
 
 @enumerate
 @item
-Reduce the number of Org agenda files: this will reduce the slowness caused
-by accessing a hard drive.
+Reduce the number of Org agenda files to avoid slowdowns due to hard drive
+accesses.
 @item
-Reduce the number of DONE and archived headlines: this way the agenda does
-not need to skip them.
+Reduce the number of @samp{DONE} and archived headlines so agenda operations
+that skip over these can finish faster.
 @item
 @vindex org-agenda-dim-blocked-tasks
-Inhibit the dimming of blocked tasks:
+Do not dim blocked tasks:
 @lisp
 (setq org-agenda-dim-blocked-tasks nil)
 @end lisp
 @item
 @vindex org-startup-folded
 @vindex org-agenda-inhibit-startup
-Inhibit agenda files startup options:
+Stop preparing agenda buffers on startup:
 @lisp
 (setq org-agenda-inhibit-startup nil)
 @end lisp
 @item
 @vindex org-agenda-show-inherited-tags
 @vindex org-agenda-use-tag-inheritance
-Disable tag inheritance in agenda:
+Disable tag inheritance for agendas:
 @lisp
 (setq org-agenda-use-tag-inheritance nil)
 @end lisp
 @end enumerate
 
-You can set these options for specific agenda views only.  See the docstrings
-of these variables for details on why they affect the agenda generation, and
-this @uref{http://orgmode.org/worg/agenda-optimization.html, dedicated Worg
-page} for further explanations.
+These options can be applied to selected agenda views.  For more details
+about generation of agenda views, see the docstrings for the relevant
+variables, and this @uref{http://orgmode.org/worg/agenda-optimization.html,
+dedicated Worg page} for agenda optimization.
 
-@node Extracting agenda information, Using the property API, Speeding up your agendas, Hacking
+@node Extracting agenda information
 @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
+Org provides commands to access agendas through Emacs batch mode.  Through
+this command-line interface, agendas are automated for further processing or
+printing.
+
+@code{org-batch-agenda} creates an agenda view in ASCII and outputs to
+STDOUT.  This command takes one string parameter.  When string length=1, Org
+uses it as a key to @code{org-agenda-custom-commands}.  These are the same
+ones available through @kbd{C-c a}.
+
+This example command line directly prints the TODO list to the printer:
 
 @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
+When the string parameter length is two or more characters, Org matches it
+with tags/TODO strings.  For example, this example command line prints items
+tagged with @samp{shop}, but excludes items tagged with @samp{NewYork}:
 
 @example
 emacs -batch -l ~/.emacs                                      \
@@ -17724,7 +18575,7 @@ emacs -batch -l ~/.emacs                                      \
 @end example
 
 @noindent
-You may also modify parameters on the fly like this:
+An example showing on-the-fly parameter modifications:
 
 @example
 emacs -batch -l ~/.emacs                                      \
@@ -17736,14 +18587,11 @@ emacs -batch -l ~/.emacs                                      \
 @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.
+which will produce an agenda for the next 30 days from just the
+@file{~/org/projects.org} file.
 
-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:
+For structured processing of agenda output, use @code{org-batch-agenda-csv}
+with the following fields:
 
 @example
 category     @r{The category of the item}
@@ -17769,12 +18617,15 @@ 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.
+If the selection of the agenda item was based on a timestamp, including those
+items with @samp{DEADLINE} and @samp{SCHEDULED} keywords, then Org includes
+date and time in the output.
 
-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:
+If the selection of the agenda item was based on a timestamp  (or
+deadline/scheduled), then Org includes date and time in the output.
+
+Here is an example of a post-processing script in Perl.  It takes the CSV
+output from Emacs and prints with a checkbox:
 
 @example
 #!/usr/bin/perl
@@ -17795,13 +18646,12 @@ foreach $line (split(/\n/,$agenda)) @{
 @}
 @end example
 
-@node Using the property API, Using the mapping API, Extracting agenda information, Hacking
+@node Using the property API
 @section Using the property API
 @cindex API, for properties
 @cindex properties, API
 
-Here is a description of the functions that can be used to work with
-properties.
+Functions for working with properties.
 
 @defun org-entry-properties &optional pom which
 Get all properties of the entry at point-or-marker POM.@*
@@ -17813,14 +18663,15 @@ POM may also be @code{nil}, in which case the current entry is used.
 If WHICH is @code{nil} or @code{all}, get all properties.  If WHICH is
 @code{special} or @code{standard}, only get that subclass.
 @end defun
+
 @vindex org-use-property-inheritance
 @findex org-insert-property-drawer
 @defun org-entry-get pom property &optional inherit
-Get value of @code{PROPERTY} for entry at point-or-marker @code{POM}@.  By default,
-this only looks at properties defined locally in the entry.  If @code{INHERIT}
-is non-@code{nil} and the entry does not have the property, then also check
-higher levels of the hierarchy.  If @code{INHERIT} is the symbol
-@code{selective}, use inheritance if and only if the setting of
+Get value of @code{PROPERTY} for entry at point-or-marker @code{POM}@.  By
+default, this only looks at properties defined locally in the entry.  If
+@code{INHERIT} is non-@code{nil} and the entry does not have the property,
+then also check higher levels of the hierarchy.  If @code{INHERIT} is the
+symbol @code{selective}, use inheritance if and only if the setting of
 @code{org-use-property-inheritance} selects @code{PROPERTY} for inheritance.
 @end defun
 
@@ -17837,7 +18688,7 @@ Get all property keys in the current buffer.
 @end defun
 
 @defun org-insert-property-drawer
-Insert a property drawer for the current entry.  Also
+Insert a property drawer for the current entry.
 @end defun
 
 @defun org-entry-put-multivalued-property pom property &rest values
@@ -17875,41 +18726,37 @@ to be entered.  The functions must return @code{nil} if they are not
 responsible for this property.
 @end defopt
 
-@node Using the mapping API,  , Using the property API, Hacking
+@node Using the mapping API
 @section Using the mapping API
 @cindex API, for mapping
 @cindex mapping entries, API
 
-Org has sophisticated mapping capabilities to find all entries satisfying
-certain criteria.  Internally, this functionality is used to produce agenda
-views, but there is also an API that can be used to execute arbitrary
-functions for each or selected entries.  The main entry point for this API
-is:
+Org has sophisticated mapping capabilities for finding entries.  Org uses
+this functionality internally for generating agenda views.  Org also exposes
+an API for executing arbitrary functions for each selected entry.  The API's
+main entry point is:
 
 @defun org-map-entries func &optional match scope &rest skip
-Call @code{FUNC} at each headline selected by @code{MATCH} in @code{SCOPE}.
+Call @samp{FUNC} at each headline selected by @code{MATCH} in @code{SCOPE}.
 
-@code{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.
+@samp{FUNC} is a function or a Lisp form.  With the cursor positioned at the
+beginning of the headline, call the function without arguments.  Org returns
+an alist of return values of calls to the function.
 
-The call to @code{FUNC} will be wrapped into a save-excursion form, so
-@code{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
-(e.g., 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 @code{FUNC} set the variable
-@code{org-map-continue-from} to the desired buffer position.
+To avoid preserving point, Org wraps the call to @code{FUNC} in
+save-excursion form.  After evaluation, Org moves the cursor to the end of
+the line that was just processed.  Search continues from that point forward.
+This may not always work as expected under some conditions, such as if the
+current sub-tree was removed by a previous archiving operation.  In such rare
+circumstances, Org skips the next entry entirely when it should not.  To stop
+Org from such skips, make @samp{FUNC} set the variable
+@code{org-map-continue-from} to a specific buffer position.
 
-@code{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 @code{MATCH} is @code{nil} or @code{t}, all
-headlines will be visited by the iteration.
+@samp{MATCH} is a tags/property/TODO match.  Org iterates only matched
+headlines.  Org iterates over all headlines when @code{MATCH} is @code{nil}
+or @code{t}.
 
-@code{SCOPE} determines the scope of this command.  It can be any of:
+@samp{SCOPE} determines the scope of this command.  It can be any of:
 
 @example
 nil     @r{the current buffer, respecting the restriction if any}
@@ -17925,8 +18772,8 @@ agenda-with-archives
         @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:
+The remaining args are treated as settings for the scanner's skipping
+facilities.  Valid args are:
 
 @vindex org-agenda-skip-function
 @example
@@ -17940,10 +18787,9 @@ function or Lisp form
 @end example
 @end defun
 
-The function given to that mapping routine can really do anything you like.
-It can use the property API (@pxref{Using the property API}) to gather more
-information about the entry, or in order to change metadata in the entry.
-Here are a couple of functions that might be handy:
+The mapping routine can call any arbitrary function, even functions that
+change meta data or query the property API (@pxref{Using the property API}).
+Here are some handy functions:
 
 @defun org-todo &optional arg
 Change the TODO state of the entry.  See the docstring of the functions for
@@ -17969,9 +18815,9 @@ Promote the current entry.
 Demote the current entry.
 @end defun
 
-Here is a simple example that will turn all entries in the current file with
-a tag @code{TOMORROW} into TODO entries with the keyword @code{UPCOMING}.
-Entries in comment trees and in archive trees will be ignored.
+This example turns all entries tagged with @code{TOMORROW} into TODO entries
+with keyword @code{UPCOMING}.  Org ignores entries in comment trees and
+archive trees.
 
 @lisp
 (org-map-entries
@@ -17986,105 +18832,103 @@ The following example counts the number of entries with TODO keyword
 (length (org-map-entries t "/+WAITING" 'agenda))
 @end lisp
 
-@node MobileOrg, History and Acknowledgments, Hacking, Top
+@node MobileOrg
 @appendix MobileOrg
 @cindex iPhone
 @cindex MobileOrg
 
-@i{MobileOrg} is the name of the mobile companion app for Org mode, currently
-available for iOS and for Android.  @i{MobileOrg} offers offline viewing and
-capture support for an Org mode system rooted on a ``real'' computer.  It
-does also allow you to record changes to existing entries.  The
-@uref{https://github.com/MobileOrg/, iOS implementation} for the
-@i{iPhone/iPod Touch/iPad} series of devices, was started by Richard Moreland
-and is now in the hands Sean Escriva.  Android users should check out
-@uref{http://wiki.github.com/matburt/mobileorg-android/, MobileOrg Android}
-by Matt Jones.  The two implementations are not identical but offer similar
-features.
-
-This appendix describes the support Org has for creating agenda views in a
-format that can be displayed by @i{MobileOrg}, and for integrating notes
-captured and changes made by @i{MobileOrg} into the main system.
-
-For changing tags and TODO states in MobileOrg, you should have set up the
-customization variables @code{org-todo-keywords} and @code{org-tag-alist} to
-cover all important tags and TODO keywords, even if individual files use only
-part of these.  MobileOrg will also offer you states and tags set up with
-in-buffer settings, but it will understand the logistics of TODO state
-@i{sets} (@pxref{Per-file keywords}) and @i{mutually exclusive} tags
+MobileOrg is a companion mobile app that runs on iOS and Android devices.
+MobileOrg enables offline-views and capture support for an Org mode system
+that is rooted on a ``real'' computer.  MobileOrg can record changes to
+existing entries.
+
+The @uref{https://github.com/MobileOrg/, iOS implementation} for the
+@emph{iPhone/iPod Touch/iPad} series of devices, was started by Richard
+Moreland and is now in the hands Sean Escriva.  Android users should check
+out @uref{http://wiki.github.com/matburt/mobileorg-android/, MobileOrg
+Android} by Matt Jones.  Though the two implementations are not identical,
+they offer similar features.
+
+This appendix describes Org's support for agenda view formats compatible with
+MobileOrg.  It also describes synchronizing changes, such as to notes,
+between MobileOrg and the computer.
+
+To change tags and TODO states in MobileOrg, first customize the variables
+@code{org-todo-keywords} and @code{org-tag-alist}.  These should cover all
+the important tags and TODO keywords, even if Org files use only some of
+them.  Though MobileOrg has in-buffer settings, it understands TODO states
+@emph{sets} (@pxref{Per-file keywords}) and @emph{mutually exclusive} tags
 (@pxref{Setting tags}) only for those set in these variables.
 
 @menu
-* Setting up the staging area::  Where to interact with the mobile device
+* Setting up the staging area::  For the mobile device
 * Pushing to MobileOrg::        Uploading Org files and agendas
 * Pulling from MobileOrg::      Integrating captured and flagged items
 @end menu
 
-@node Setting up the staging area, Pushing to MobileOrg, MobileOrg, MobileOrg
+@node Setting up the staging area
 @section Setting up the staging area
 
-MobileOrg needs to interact with Emacs through a directory on a server.  If you
-are using a public server, you should consider to encrypt the files that are
-uploaded to the server.  This can be done with Org mode 7.02 and with
-@i{MobileOrg 1.5} (iPhone version), and you need an @file{openssl}
-installation on your system.  To turn on encryption, set a password in
-@i{MobileOrg} and, on the Emacs side, configure the variable
-@code{org-mobile-use-encryption}@footnote{If you can safely store the
-password in your Emacs setup, you might also want to configure
-@code{org-mobile-encryption-password}.  Please read the docstring of that
-variable.  Note that encryption will apply only to the contents of the
-@file{.org} files.  The file names themselves will remain visible.}.
-
-The easiest way to create that directory is to use a free
-@uref{http://dropbox.com,Dropbox.com} account@footnote{If you cannot use
-Dropbox, or if your version of MobileOrg does not support it, you can use a
-webdav server.  For more information, check out the documentation of MobileOrg and also this
+MobileOrg needs access to a file directory on a server to interact with
+Emacs.  With a public server, consider encrypting the files.  MobileOrg
+version 1.5 supports encryption for the iPhone.  Org also requires
+@file{openssl} installed on the local computer.  To turn on encryption, set
+the same password in MobileOrg and in Emacs.  Set the password in the
+variable @code{org-mobile-use-encryption}@footnote{If Emacs is configured for
+safe storing of passwords, then configure the variable,
+@code{org-mobile-encryption-password}; please read the docstring of that
+variable.}.  Note that even after MobileOrg encrypts the file contents, the
+file names will remain visible on the file systems of the local computer, the
+server, and the mobile device.
+
+For a server to host files, consider options like
+@uref{http://dropbox.com,Dropbox.com} account@footnote{An alternative is to
+use webdav server.  MobileOrg documentation has details of webdav server
+configuration.  Additional help is at
 @uref{http://orgmode.org/worg/org-faq.html#mobileorg_webdav, FAQ entry}.}.
-When MobileOrg first connects to your Dropbox, it will create a directory
-@i{MobileOrg} inside the Dropbox.  After the directory has been created, tell
-Emacs about it:
+On first connection, MobileOrg creates a directory @file{MobileOrg/} on
+Dropbox.  Pass its location to Emacs through an init file variable as
+follows:
 
 @lisp
 (setq org-mobile-directory "~/Dropbox/MobileOrg")
 @end lisp
 
-Org mode has commands to put files for @i{MobileOrg} into that directory,
-and to read captured notes from there.
+Org copies files to the above directory for MobileOrg.  Org also uses the
+same directory for sharing notes between Org and MobileOrg.
 
-@node Pushing to MobileOrg, Pulling from MobileOrg, Setting up the staging area, MobileOrg
+@node Pushing to MobileOrg
 @section Pushing to MobileOrg
 
-This operation copies all files currently listed in @code{org-mobile-files}
-to the directory @code{org-mobile-directory}.  By default this list contains
-all agenda files (as listed in @code{org-agenda-files}), but additional files
-can be included by customizing @code{org-mobile-files}.  File names will be
-staged with paths relative to @code{org-directory}, so all files should be
-inside this directory@footnote{Symbolic links in @code{org-directory} need to
-have the same name than their targets.}.
-
-The push operation also creates a special Org file @file{agendas.org} with
-all custom agenda view defined by the user@footnote{While creating the
-agendas, Org mode will force ID properties on all referenced entries, so that
-these entries can be uniquely identified if @i{MobileOrg} flags them for
-further action.  If you do not want to get these properties in so many
-entries, you can set the variable @code{org-mobile-force-id-on-agenda-items}
-to @code{nil}.  Org mode will then rely on outline paths, in the hope that
-these will be unique enough.}.
-
-Finally, Org writes the file @file{index.org}, containing links to all other
-files.  @i{MobileOrg} first reads this file from the server, and then
-downloads all agendas and Org files listed in it.  To speed up the download,
-MobileOrg will only read files whose checksums@footnote{Checksums are stored
-automatically in the file @file{checksums.dat}} have changed.
-
-@node Pulling from MobileOrg,  , Pushing to MobileOrg, MobileOrg
+Org pushes files listed in @code{org-mobile-files} to
+@code{org-mobile-directory}.  Files include agenda files (as listed in
+@code{org-agenda-files}).  Customize @code{org-mobile-files} to add other
+files.  File names will be staged with paths relative to
+@code{org-directory}, so all files should be inside this
+directory@footnote{Symbolic links in @code{org-directory} should have the
+same name as their targets.}.
+
+Push creates a special Org file @file{agendas.org} with custom agenda views
+defined by the user@footnote{While creating the agendas, Org mode will force
+ID properties on all referenced entries, so that these entries can be
+uniquely identified if MobileOrg flags them for further action.  To avoid
+setting properties configure the variable
+@code{org-mobile-force-id-on-agenda-items} to @code{nil}.  Org mode will then
+rely on outline paths, assuming they are unique.}.
+
+Org writes the file @file{index.org}, containing links to other files.
+MobileOrg reads this file first from the server to determine what other files
+to download for agendas.  For faster downloads, MobileOrg will read only
+those files whose checksums@footnote{Checksums are stored automatically in
+the file @file{checksums.dat}.} have changed.
+
+@node Pulling from MobileOrg
 @section Pulling from MobileOrg
 
-When @i{MobileOrg} synchronizes with the server, it not only pulls the Org
-files for viewing.  It also appends captured entries and pointers to flagged
-and changed entries to the file @file{mobileorg.org} on the server.  Org has
-a @emph{pull} operation that integrates this information into an inbox file
-and operates on the pointers to flagged entries.  Here is how it works:
+When MobileOrg synchronizes with the server, it pulls the Org files for
+viewing.  It then appends to the file @file{mobileorg.org} on the server the
+captured entries, pointers to flagged and changed entries.  Org integrates
+its data in an inbox file format.
 
 @enumerate
 @item
@@ -18092,46 +18936,37 @@ Org moves all entries found in
 @file{mobileorg.org}@footnote{@file{mobileorg.org} will be empty after this
 operation.} and appends them to the file pointed to by the variable
 @code{org-mobile-inbox-for-pull}.  Each captured entry and each editing event
-will be a top-level entry in the inbox file.
+is a top-level entry in the inbox file.
 @item
-After moving the entries, Org will attempt to implement the changes made in
-@i{MobileOrg}.  Some changes are applied directly and without user
-interaction.  Examples are all changes to tags, TODO state, headline and body
-text that can be cleanly applied.  Entries that have been flagged for further
-action will receive a tag @code{:FLAGGED:}, so that they can be easily found
-again.  When there is a problem finding an entry or applying the change, the
-pointer entry will remain in the inbox and will be marked with an error
-message.  You need to later resolve these issues by hand.
+After moving the entries, Org attempts changes to MobileOrg.  Some changes
+are applied directly and without user interaction.  Examples include changes
+to tags, TODO state, headline and body text.  Entries for further action are
+tagged as @code{:FLAGGED:}.  Org marks entries with problems with an error
+message in the inbox.  They have to be resolved manually.
 @item
-Org will then generate an agenda view with all flagged entries.  The user
-should then go through these entries and do whatever actions are necessary.
-If a note has been stored while flagging an entry in @i{MobileOrg}, that note
-will be displayed in the echo area when the cursor is on the corresponding
-agenda line.
+Org generates an agenda view for flagged entries for user intervention to
+clean up.  For notes stored in flagged entries, MobileOrg displays them in
+the echo area when the cursor is on the corresponding agenda item.
 
 @table @kbd
 @kindex ?
 @item ?
-Pressing @kbd{?} in that special agenda will display the full flagging note in
-another window and also push it onto the kill ring.  So you could use @kbd{?
-z C-y C-c C-c} to store that flagging note as a normal note in the entry.
-Pressing @kbd{?} twice in succession will offer to remove the
-@code{:FLAGGED:} tag along with the recorded flagging note (which is stored
-in a property).  In this way you indicate that the intended processing for
-this flagged entry is finished.
+Pressing @kbd{?} displays the entire flagged note in another window.  Org
+also pushes it to the kill ring.  To store flagged note as a normal note, use
+@kbd{?  z C-y C-c C-c}.  Pressing @kbd{?} twice does these things: first it
+removes the @code{:FLAGGED:} tag; second, it removes the flagged note from
+the property drawer; third, it signals that manual editing of the flagged
+entry is now finished.
 @end table
 @end enumerate
 
 @kindex C-c a ?
-If you are not able to process all flagged entries directly, you can always
-return to this agenda view@footnote{Note, however, that there is a subtle
-difference.  The view created automatically by @kbd{M-x org-mobile-pull RET}
-is guaranteed to search all files that have been addressed by the last pull.
-This might include a file that is not currently in your list of agenda files.
-If you later use @kbd{C-c a ?} to regenerate the view, only the current
-agenda files will be searched.} using @kbd{C-c a ?}.
-
-@node History and Acknowledgments, GNU Free Documentation License, MobileOrg, Top
+@kbd{C-c a ?} returns to the agenda view to finish processing flagged
+entries.  Note that these entries may not be the most recent since MobileOrg
+searches files that were last pulled.  To get an updated agenda view with
+changes since the last pull, pull again.
+
+@node History and acknowledgments
 @appendix History and acknowledgments
 @cindex acknowledgments
 @cindex history
@@ -18143,17 +18978,17 @@ 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 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{timestamps}, and
-@emph{table support}.  These areas highlighted the two main 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.
+parts of the outline tree, that seemed entirely unacceptable.  Also, when
+using outlines to take notes, I constantly wanted to restructure the tree,
+organizing it paralleling 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{timestamps}, and @emph{table
+support}.  These areas highlighted the two main 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.
 
 Since the first release, literally thousands of emails to me or to
 @email{emacs-orgmode@@gnu.org} have provided a constant stream of bug
@@ -18169,15 +19004,17 @@ Before I get to this list, a few special mentions are in order:
 @table @i
 @item Bastien Guerry
 Bastien has written a large number of extensions to Org (most of them
-integrated into the core by now), including the @LaTeX{} exporter and the plain
-list parser.  His support during the early days, when he basically acted as
-co-maintainer, was central to the success of this project.  Bastien also
-invented Worg, helped establishing the Web presence of Org, and sponsored
-hosting costs for the orgmode.org website.
+integrated into the core by now), including the @LaTeX{} exporter and the
+plain list parser.  His support during the early days was central to the
+success of this project.  Bastien also invented Worg, helped establishing the
+Web presence of Org, and sponsored hosting costs for the orgmode.org website.
+Bastien stepped in as maintainer of Org between 2011 and 2013, at a time when
+I desperately needed a break.
 @item Eric Schulte and Dan Davison
 Eric and Dan are jointly responsible for the Org-babel system, which turns
 Org into a multi-language environment for evaluating code and doing literate
-programming and reproducible research.
+programming and reproducible research.  This has become one of Org's killer
+features that define what Org is today.
 @item John Wiegley
 John has contributed a number of great ideas and patches directly to Org,
 including the attachment system (@file{org-attach.el}), integration with
@@ -18198,9 +19035,8 @@ let me know what I am missing here!
 
 @section From Bastien
 
-I (Bastien) have been maintaining Org since January 2011.  This appendix
-would not be complete without adding a few more acknowledgements and thanks
-to Carsten's ones above.
+I (Bastien) have been maintaining Org between 2011 and 2013.  This appendix
+would not be complete without adding a few more acknowledgments and thanks.
 
 I am first grateful to Carsten for his trust while handing me over the
 maintainership of Org.  His unremitting support is what really helped me
@@ -18218,13 +19054,13 @@ Eric is maintaining the Babel parts of Org.  His reactivity here kept me away
 from worrying about possible bugs here and let me focus on other parts.
 
 @item Nicolas Goaziou
-Nicolas is maintaining the consistency of the deepest parts of Org.  His
-work on @file{org-element.el} and @file{ox.el} has been outstanding, and
-opened the doors for many new ideas and features.  He rewrote many of the
-old exporters to use the new export engine, and helped with documenting
-this major change.  More importantly (if that's possible), he has been more
-than reliable during all the work done for Org 8.0, and always very
-reactive on the mailing list.
+Nicolas is maintaining the consistency of the deepest parts of Org.  His work
+on @file{org-element.el} and @file{ox.el} has been outstanding, and it opened
+the doors for many new ideas and features.  He rewrote many of the old
+exporters to use the new export engine, and helped with documenting this
+major change.  More importantly (if that's possible), he has been more than
+reliable during all the work done for Org 8.0, and always very reactive on
+the mailing list.
 
 @item Achim Gratz
 Achim rewrote the building process of Org, turning some @emph{ad hoc} tools
@@ -18280,13 +19116,14 @@ specified time.
 calculations and improved XEmacs compatibility, in particular by porting
 @file{nouline.el} to XEmacs.
 @item
-@i{Sacha Chua} suggested copying some linking code from Planner.
+@i{Sacha Chua} suggested copying some linking code from Planner, and helped
+make Org pupular through her blog.
 @item
 @i{Toby S. Cubitt} contributed to the code for clock formats.
 @item
-@i{Baoqiu Cui} contributed the DocBook exporter.  It has been deleted from
-Org 8.0: you can now export to Texinfo and export the @file{.texi} file to
-DocBook using @code{makeinfo}.
+@i{Baoqiu Cui} contributed the first DocBook exporter.  In Org 8.0, we go a
+different route: you can now export to Texinfo and export the @file{.texi}
+file to DocBook using @code{makeinfo}.
 @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
@@ -18383,7 +19220,7 @@ basis.
 @i{Stefan Monnier} provided a patch to keep the Emacs-Lisp compiler
 happy.
 @item
-@i{Richard Moreland} wrote @i{MobileOrg} for the iPhone.
+@i{Richard Moreland} wrote MobileOrg for the iPhone.
 @item
 @i{Rick Moynihan} proposed allowing multiple TODO sequences in a file
 and being able to quickly restrict the agenda to a subtree.
@@ -18501,35 +19338,37 @@ work on a tty.
 @item
 @i{Piotr Zielinski} wrote @file{org-mouse.el}, proposed agenda blocks
 and contributed various ideas and code snippets.
+@item
+@i{Marco Wahl} wrote @file{org-eww.el}.
 @end itemize
 
 
-@node GNU Free Documentation License, Main Index, History and Acknowledgments, Top
+@node GNU Free Documentation License
 @appendix GNU Free Documentation License
 @include doclicense.texi
 
 
-@node Main Index, Key Index, GNU Free Documentation License, Top
+@node Main Index
 @unnumbered Concept index
 
 @printindex cp
 
-@node Key Index, Command and Function Index, Main Index, Top
+@node Key Index
 @unnumbered Key index
 
 @printindex ky
 
-@node Command and Function Index, Variable Index, Key Index, Top
+@node Command and Function Index
 @unnumbered Command and function index
 
 @printindex fn
 
-@node Variable Index,  , Command and Function Index, Top
+@node Variable Index
 @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 click yourself through the tree.
+mentioned in the manual.  For a complete list, use @kbd{M-x org-customize
+@key{RET}}.
 
 @printindex vr