Merge branch 'maint'

Conflicts:
	doc/org.texi

diff --cc doc/org.texi
index e3a40ec,e24bec8..0ab770e
--- 1/doc/org.texi
--- 2/doc/org.texi
+++ b/doc/org.texi
@@@ -480,8 -479,8 +480,8 @@@ Capture - Refile - Archiv
  * Capture::                     Capturing new stuff
  * Attachments::                 Add files to tasks
  * RSS Feeds::                   Getting input from RSS feeds
- * Protocols::                   External (e.g.@: Browser) access to Emacs and Org
+ * Protocols::                   External (e.g., Browser) access to Emacs and Org
 -* Refiling notes::              Moving a tree from one place to another
 +* Refile and copy::             Moving/copying a tree from one place to another
  * Archiving::                   What to do with finished projects
  
  Capture
@@@ -6549,8 -6489,8 +6549,8 @@@ trees to an archive file keeps the syst
  * Capture::                     Capturing new stuff
  * Attachments::                 Add files to tasks
  * RSS Feeds::                   Getting input from RSS feeds
- * Protocols::                   External (e.g.@: Browser) access to Emacs and Org
+ * Protocols::                   External (e.g., Browser) access to Emacs and Org
 -* Refiling notes::              Moving a tree from one place to another
 +* Refile and copy::             Moving/copying a tree from one place to another
  * Archiving::                   What to do with finished projects
  @end menu
  
@@@ -12065,17 -11997,15 +12065,17 @@@ time
  
  @subsection Export of properties
  
- The exporter also takes TODO state information into consideration, i.e.@: if
 -The exporter also takes TODO state information into consideration, i.e., if a
 -task is marked as done it will have the corresponding attribute in
 -TaskJuggler (@samp{complete 100}).  Also it will export any property on a task
 -resource or resource node which is known to TaskJuggler, such as
 -@samp{limits}, @samp{vacation}, @samp{shift}, @samp{booking},
 -@samp{efficiency}, @samp{journalentry}, @samp{rate} for resources or
 -@samp{account}, @samp{start}, @samp{note}, @samp{duration}, @samp{end},
 -@samp{journalentry}, @samp{milestone}, @samp{reference}, @samp{responsible},
 -@samp{scheduling}, etc for tasks.
++The exporter also takes TODO state information into consideration, i.e., if
 +a task is marked as done it will have the corresponding attribute in
 +TaskJuggler (@samp{complete 100}).  Scheduling information is also taken into
 +account to set start/end dates for tasks.
 +
 +The exporter will also export any property on a task resource or resource
 +node which is known to TaskJuggler, such as @samp{limits}, @samp{vacation},
 +@samp{shift}, @samp{booking}, @samp{efficiency}, @samp{journalentry},
 +@samp{rate} for resources or @samp{account}, @samp{start}, @samp{note},
 +@samp{duration}, @samp{end}, @samp{journalentry}, @samp{milestone},
 +@samp{reference}, @samp{responsible}, @samp{scheduling}, etc for tasks.
  
  @subsection Dependencies
  
@@@ -12119,22 -12049,13 +12119,22 @@@ examples should illustrate this
  @subsection Reports
  
  @vindex org-export-taskjuggler-default-reports
- TaskJuggler can produce many kinds of reports (e.g.@: gantt chart, resource
+ TaskJuggler can produce many kinds of reports (e.g., gantt chart, resource
  allocation, etc).  The user defines what kind of reports should be generated
 -for a project in the TaskJuggler file.  The exporter will automatically insert
 -some default reports in the file.  These defaults are defined in
 -@code{org-export-taskjuggler-default-reports}.  They can be modified using
 -customize along with a number of other options.  For a more complete list, see
 -@kbd{M-x customize-group @key{RET} org-export-taskjuggler @key{RET}}.
 +for a project in the TaskJuggler file.  By default, the exporter will
 +automatically insert some pre-set reports in the file.  These defaults are
 +defined in @code{org-export-taskjuggler-default-reports}.  They can be
 +modified using customize along with a number of other options.  For a more
 +complete list, see @kbd{M-x customize-group @key{RET} org-export-taskjuggler
 +@key{RET}}.
 +
 +Alternately, the user can tag a tree with
 +@code{org-export-taskjuggler-report-tag}, and define reports in sub-nodes,
 +similarly to what is done with tasks or resources.  The properties used for
 +report generation are defined in
 +@code{org-export-taskjuggler-valid-report-attributes}. In addition, a special
 +property named @samp{report-kind} is used to define the kind of report one
 +wants to generate (by default, a @samp{taskreport}).
  
  For more information and examples see the Org-taskjuggler tutorial at
  @uref{http://orgmode.org/worg/org-tutorials/org-taskjuggler.html}.