Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2014-11-02 23:43:17 +01:00
commit 76034be4cd
1 changed files with 4 additions and 5 deletions

View File

@ -6730,11 +6730,10 @@ with @code{org-clock-in} and two @kbd{C-u C-u} with @code{org-clock-in-last}.
If you want to plan your work in a very detailed way, or if you need to 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 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 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 may later want to compare the planned effort with the actual working time,
great way to improve planning estimates. Effort estimates are stored in a a great way to improve planning estimates. Effort estimates are stored in
special property @samp{Effort}@footnote{You may change the property being a special property @code{EFFORT}. You can set the effort for an entry with
used with the variable @code{org-effort-property}.}. You can set the effort the following commands:
for an entry with the following commands:
@table @kbd @table @kbd
@orgcmd{C-c C-x e,org-set-effort} @orgcmd{C-c C-x e,org-set-effort}