diff --git a/doc/org-guide.org b/doc/org-guide.org index 95828e4c0..167f62e49 100644 --- a/doc/org-guide.org +++ b/doc/org-guide.org @@ -1088,12 +1088,12 @@ time information is called a /timestamp/ in Org mode. :DESCRIPTION: Assigning a time to a tree entry. :END: -A timestamp is a specification of a date---possibly with a time or -a range of times---in a special format, either =<2003-09-16 Tue>= or -=<2003-09-16 Tue 09:39>= or =<2003-09-16 Tue 12:00-12:30>=. -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 (see [[*The Weekly/Daily Agenda]]). We distinguish: +A timestamp is a specification of a date---possibly with a time or a +range of times---in a special format, either =<2003-09-16 Tue>= or +=<2003-09-16 Tue 09:39>= or =<2003-09-16 Tue 12:00-12:30>=. One or +more timestamps 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 (see [[*The Weekly/Daily Agenda]]). We distinguish: - Plain timestamp; Event; Appointment :: @@ -1132,15 +1132,25 @@ the agenda (see [[*The Weekly/Daily Agenda]]). We distinguish: <%%(diary-float t 4 2)> #+end_example -- Time/Date range :: +- Date range :: - Two timestamps connected by =--= denote a range. + Two timestamps connected by =--= denote a date range. NOTE: time is + not specified in these timestamps -- just dates, #+begin_example ,** Meeting in Amsterdam <2004-08-23 Mon>--<2004-08-26 Thu> #+end_example +- Time range :: + + Two times in a timestamp connected by =-= denote a time range. + + #+begin_example + ,** Planning meeting + <2004-08-23 Mon 9:00-10:00> + #+end_example + - Inactive timestamp :: Just like a plain timestamp, but with square brackets instead of diff --git a/doc/org-manual.org b/doc/org-manual.org index c11694849..824a46eaf 100644 --- a/doc/org-manual.org +++ b/doc/org-manual.org @@ -5991,42 +5991,32 @@ is used in a much wider sense. :PROPERTIES: :DESCRIPTION: Assigning a time to a tree entry. :END: -#+cindex: timestamps -#+cindex: ranges, time -#+cindex: date stamps -#+cindex: deadlines -#+cindex: scheduling - -A timestamp is a specification of a date (possibly with a time) in a -special format, either =<2003-09-16 Tue>= or -=<2003-09-16 Tue 09:39>=[fn:19]. 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 (see [[*Weekly/daily -agenda]]). We distinguish: + +A timestamp is a specification of a date---possibly with a time or a +range of times---in a special format, either =<2003-09-16 Tue>= or +=<2003-09-16 Tue 09:39>= or =<2003-09-16 Tue 12:00-12:30>=. One or +more timestamps 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 (see [[*The Weekly/Daily Agenda]]). We distinguish: - Plain timestamp; Event; Appointment :: - #+cindex: timestamp - #+cindex: appointment A simple timestamp just assigns a date/time to an item. This is just like writing down an appointment or event in a paper agenda. - In the agenda display, the headline of an entry associated with - a plain timestamp is shown exactly on that date. #+begin_example ,* Meet Peter at the movies <2006-11-01 Wed 19:15> ,* Discussion on climate change - <2006-11-02 Thu> + <2006-11-02 Thu 20:00-22:00> #+end_example - Timestamp with repeater interval :: - #+cindex: timestamp, with repeater interval A timestamp may contain a /repeater interval/, indicating that it applies not only on the given date, but again and again after - a certain interval of N hours (h), days (d), weeks (w), months (m), - or years (y). The following shows up in the agenda every Wednesday: + a certain interval of N days (d), weeks (w), months (m), or years + (y). The following shows up in the agenda every Wednesday: #+begin_example ,* Pick up Sam at school @@ -6037,46 +6027,36 @@ agenda]]). We distinguish: #+cindex: diary style timestamps #+cindex: sexp timestamps - # Mentioned inside the footnote. - #+findex: org-date - #+findex: org-anniversary - #+findex: org-cyclic - #+findex: org-block - For more complex date specifications, Org mode supports using the - special expression diary entries implemented in the - [[info:emacs#Special Diary Entries][Emacs Calendar package]][fn:20]. - For example, with optional time: + special expression diary entries implemented in the Emacs Calendar + package. For example, with optional time: #+begin_example ,* 22:00-23:00 The nerd meeting on every 2nd Thursday of the month <%%(diary-float t 4 2)> #+end_example -- Time/Date range :: +- Date range :: - #+cindex: timerange - #+cindex: date range - Two timestamps connected by =--= denote a range. In the agenda, the - headline is shown on the first and last day of the range, and on any - dates that are displayed and fall in the range. Here is an example: + Two timestamps connected by =--= denote a date range. NOTE: time is + not specified in these timestamps -- just dates, #+begin_example ,** Meeting in Amsterdam <2004-08-23 Mon>--<2004-08-26 Thu> #+end_example - Timerange is a timestamp consisting of two time units connected by =-= +- Time range :: + + Two times in a timestamp connected by =-= denote a time range. #+begin_example - ,* Discussion on climate change - <2006-11-02 Thu 10:00-12:00> + ,** Planning meeting + <2004-08-23 Mon 9:00-10:00> #+end_example - Inactive timestamp :: - #+cindex: timestamp, inactive - #+cindex: inactive timestamp Just like a plain timestamp, but with square brackets instead of angular ones. These timestamps are inactive in the sense that they do /not/ trigger an entry to show up in the agenda.