ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2016-11-10 16:05:33 +01:00
parent c0b37e1883 dd2a0d3361
commit c535f54330
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
doc/org.texi
View File

@ -6213,7 +6213,9 @@ format is shorter, things do work as expected.
@node Deadlines and scheduling @node Deadlines and scheduling
@section Deadlines and scheduling @section Deadlines and scheduling
A timestamp may be preceded by special keywords to facilitate planning: A timestamp may be preceded by special keywords to facilitate planning. Both
the timestamp and the keyword have to be positioned immediatly after the task
they refer to.
@table @var @table @var
@item DEADLINE @item DEADLINE
@ -6302,25 +6304,22 @@ sexp entry matches.
@node Inserting deadline/schedule @node Inserting deadline/schedule
@subsection Inserting deadlines or schedules @subsection Inserting deadlines or schedules
The following commands allow you to quickly insert@footnote{The @samp{SCHEDULED} and The following commands allow you to quickly insert a deadline or to schedule
@samp{DEADLINE} dates are inserted on the line right below the headline. Don't put
any text between this line and the headline.} a deadline or to schedule
an item: an item:
@table @kbd @table @kbd
@c @c
@orgcmd{C-c C-d,org-deadline} @orgcmd{C-c C-d,org-deadline}
Insert @samp{DEADLINE} keyword along with a stamp. The insertion will happen Insert @samp{DEADLINE} keyword along with a stamp. Any CLOSED timestamp will
in the line directly following the headline. Any CLOSED timestamp will be be removed. When called with a prefix arg, an existing deadline will be
removed. When called with a prefix arg, an existing deadline will be removed removed from the entry. Depending on the variable
from the entry. Depending on the variable @code{org-log-redeadline}@footnote{with corresponding @code{org-log-redeadline}@footnote{with corresponding @code{#+STARTUP}
@code{#+STARTUP} keywords @code{logredeadline}, @code{lognoteredeadline}, keywords @code{logredeadline}, @code{lognoteredeadline}, and
and @code{nologredeadline}}, a note will be taken when changing an existing @code{nologredeadline}}, a note will be taken when changing an existing
deadline. deadline.
@orgcmd{C-c C-s,org-schedule} @orgcmd{C-c C-s,org-schedule}
Insert @samp{SCHEDULED} keyword along with a stamp. The insertion will Insert @samp{SCHEDULED} keyword along with a stamp. Any CLOSED timestamp
happen in the line directly following the headline. Any CLOSED timestamp
will be removed. When called with a prefix argument, remove the scheduling will be removed. When called with a prefix argument, remove the scheduling
date from the entry. Depending on the variable date from the entry. Depending on the variable
@code{org-log-reschedule}@footnote{with corresponding @code{#+STARTUP} @code{org-log-reschedule}@footnote{with corresponding @code{#+STARTUP}