*** org.texi.old	Fri Sep 11 19:30:09 2009
--- org.texi	Fri Sep 18 04:59:29 2009
***************
*** 4831,4844 ****
  @cindex deadlines
  @cindex scheduling
  
! A timestamp is a specification of a date (possibly with a time or a range
! of times) in a special format, either @samp{<2003-09-16 Tue>} or
  @samp{<2003-09-16 Tue 09:39>} or @samp{<2003-09-16 Tue
! 12:00-12:30>}@footnote{This is the standard ISO date/time format.  To
! use an alternative format, see @ref{Custom time format}.}.  A timestamp
! can appear anywhere in the headline or body of an Org tree entry.  Its
! presence causes entries to be shown on specific dates in the agenda
! (@pxref{Weekly/daily agenda}).  We distinguish:
  
  @table @var
  @item Plain timestamp; Event; Appointment
--- 4831,4844 ----
  @cindex deadlines
  @cindex scheduling
  
! A timestamp is a specification of a date (possibly with a time or a range of
! times) in a special format, either @samp{<2003-09-16 Tue>} or
  @samp{<2003-09-16 Tue 09:39>} or @samp{<2003-09-16 Tue
! 12:00-12:30>}@footnote{This format is inspired by the standard ISO 8601
! date/time format.  To use an alternative format, see @ref{Custom time
! format}.}.  A timestamp can appear anywhere in the headline or body of an Org
! tree entry.  Its presence causes entries to be shown on specific dates in the
! agenda (@pxref{Weekly/daily agenda}).  We distinguish:
  
  @table @var
  @item Plain timestamp; Event; Appointment
***************
*** 4985,4992 ****
  @cindex time, reading in minibuffer
  
  @vindex org-read-date-prefer-future
! When Org mode prompts for a date/time, the default is shown as an ISO
! date, and the prompt therefore seems to ask for an ISO date.  But it
  will in fact accept any string containing some date and/or time
  information, and it is really smart about interpreting your input.  You
  can, for example, use @kbd{C-y} to paste a (possibly multi-line) string
--- 4985,4993 ----
  @cindex time, reading in minibuffer
  
  @vindex org-read-date-prefer-future
! When Org mode prompts for a date/time, the default value is shown in default
! date/time format which looks like an ISO date, and the prompt therefore seems
! to ask for a date/time in this format.  But it
  will in fact accept any string containing some date and/or time
  information, and it is really smart about interpreting your input.  You
  can, for example, use @kbd{C-y} to paste a (possibly multi-line) string