New version number, effort estimates work now.

README_DIST

@@ -1,7 +1,7 @@
 The is a distribution of Org, a plain text notes and project planning
 tool for Emacs.
 
-The version of this release is: 6.02pre02
+The version of this release is: 6.02pre-03
 
 The homepage of Org is at http://orgmode.org
 

doc/org.texi

@@ -3,7 +3,7 @@
 @setfilename ../../info/org
 @settitle The Org Manual
 
-@set VERSION 6.02pre02
+@set VERSION 6.02pre-03
 @set DATE April 2008
 
 @dircategory Emacs
@@ -212,6 +212,7 @@ Dates and Times
 * Creating timestamps::         Commands which insert timestamps
 * Deadlines and scheduling::    Planning your work
 * Clocking work time::          Tracking how long you spend on a task
+* Effort estimates::            Planning work effort in advance
 
 Creating timestamps
 
@@ -3999,6 +4000,7 @@ is used in a much wider sense.
 * Creating timestamps::         Commands which insert timestamps
 * Deadlines and scheduling::    Planning your work
 * Clocking work time::          Tracking how long you spend on a task
+* Effort estimates::            Planning work effort in advance
 @end menu
 
 
@@ -4466,7 +4468,7 @@ special repeaters markers with @samp{++} and @samp{.+}.  For example:
 You may have both scheduling and deadline information for a specific
 task - just make sure that the repeater intervals on both are the same.
 
-@node Clocking work time,  , Deadlines and scheduling, Dates and Times
+@node Clocking work time, Effort estimates, Deadlines and scheduling, Dates and Times
 @section Clocking work time
 
 Org mode allows you to clock the time you spent on specific tasks in a
@@ -4598,6 +4600,47 @@ The @kbd{l} key may be used in the timeline (@pxref{Timeline}) and in
 the agenda (@pxref{Weekly/daily agenda}) to show which tasks have been
 worked on or closed during a day.
 
+@node Effort estimates
+@section Effort estimates
+@cindex Effort estimates
+
+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}.}.  Clearly the best way to
+work with effort estimates is through column view (@pxref{Column view}).  You
+should start by setting up discrete values for effort estimates, and a
+@code{COLUMNS} format that displays these values together with clock sums (if
+you want to clock your time).  For a specific buffer you can use
+
+@example
+#+PROPERTY: Effort_ALL 0 0:10 0:30 1:00 2:00 3:00 4:00 5:00 6:00 7:00 8:00
+#+COLUMNS: %40ITEM(Task) %17Effort(Estimated Effort){:} %CLOCKSUM
+@end example
+
+@noindent
+or you can set up these values globally by customizing the variables
+@code{org-global-properties} and @code{org-columns-default-format}.  In
+particular if you want to use this setup also in the agenda, a global setup
+may be advised.
+
+The way to assign estimates to individual items is then to switch to column
+mode, and to use @kbd{S-@key{right}} and @kbd{S-@key{left}} to change the
+value.  The values you enter will immediately be summed up in the hierarchy.
+In the column next to it, any clocked time will be displayed.
+
+If you switch to column view in the daily/weekly agenda, the effort column
+will summarize the estimated work effort for each day@footnote{Please note
+the pitfalls of summing hierarchical data in a flat list (@pxref{Agenda
+column view}.}, and you can use this to find space in your schedule.  To get
+an overview of the entire part of the day that is committed, you can set the
+option @code{org-agenda-columns-add-appointments-to-effort-sum}.  The
+appointments on a day that take place over a specified time interval will
+then also be added to the load estimate of the day.
+
 @node Remember, Agenda Views, Dates and Times, Top
 @chapter Remember
 @cindex @file{remember.el}

doc/orgcard.tex

@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{6.02pre02}
+\def\orgversionnumber{6.02pre-03}
 \def\versionyear{2008}          % latest update
 \def\year{2008}                 % latest copyright year
 

lisp/org-agenda.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-archive.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-bbdb.el

@@ -6,7 +6,7 @@
 ;;         Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-bibtex.el

@@ -5,7 +5,7 @@
 ;; Author: Bastien Guerry <bzg at altern dot org>
 ;;         Carsten Dominik <carsten dot dominik at gmail dot com>
 ;; Keywords: org, wp, remember
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-clock.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-colview.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-compat.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-exp.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-export-latex.el

@@ -4,7 +4,7 @@
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-export-latex.el
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;; Author: Bastien Guerry <bzg AT altern DOT org>
 ;; Maintainer: Bastien Guerry <bzg AT altern DOT org>
 ;; Keywords: org, wp, tex

lisp/org-faces.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-gnus.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-info.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-infojs.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-irc.el

@@ -4,7 +4,7 @@
 ;;
 ;; Author: Philip Jackson <emacs@shellarchive.co.uk>
 ;; Keywords: erc, irc, link, org
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-mac-message.el

@@ -3,7 +3,7 @@
 ;; Copyright (C) 2008 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;; Keywords: outlines, hypermedia, calendar, wp
 
 ;; This file is part of GNU Emacs.

lisp/org-macs.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-mew.el

@@ -4,7 +4,7 @@
 ;;
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-mew.el
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;; Author: Bastien Guerry <bzg AT altern DOT org>
 ;; Maintainer: Bastien Guerry <bzg AT altern DOT org>
 ;; Keywords: org, mail, Mew

lisp/org-mhe.el

@@ -5,7 +5,7 @@
 ;; Author: Thomas Baumann <thomas dot baumann at ch dot tum dot de>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-mouse.el

@@ -4,7 +4,7 @@
 ;;
 ;; Author: Piotr Zielinski <piotr dot zielinski at gmail dot com>
 ;; Maintainer: Carsten Dominik <carsten at orgmode dot org>
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-publish.el

@@ -4,7 +4,7 @@
 ;; Author: David O'Toole <dto@gnu.org>
 ;; Maintainer: Bastien Guerry <bzg AT altern DOT org>
 ;; Keywords: hypermedia, outlines, wp
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-remember.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-rmail.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-table.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-vm.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org-wl.el

@@ -5,7 +5,7 @@
 ;; Author: Tokuya Kameshima <kames at fa2 dot so-net dot ne dot jp>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;

lisp/org.el

@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 6.02pre02
+;; Version: 6.02pre-03
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -93,7 +93,7 @@
 
 ;;; Version
 
-(defconst org-version "6.02pre02"
+(defconst org-version "6.02pre-03"
   "The version number of the file org.el.")
 
 (defun org-version (&optional here)