diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 99c3ec3a5..8f2a99385 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -3,6 +3,10 @@ * org-exp.el (org-export): Added taskjuggler export to the export dispatcher. +2010-06-08 Bastien Guerry + + * org-timer.el (org-timer-set-timer): Fix typo in the docstring. + 2010-05-28 Bastien Guerry * org-timer.el (org-timer-set-timer): Use a prefix argument. diff --git a/lisp/org-timer.el b/lisp/org-timer.el index 88ae69a79..e0817c8df 100644 --- a/lisp/org-timer.el +++ b/lisp/org-timer.el @@ -320,10 +320,10 @@ prompt the use if she wants to replace it. Called with a numeric prefix argument, use this numeric value as the duration of the timer. -Called with a `C-u' prefix argument, use `org-timer-default-timer' +Called with a `C-u' prefix arguments, use `org-timer-default-timer' without prompting the user for a duration. -With two `C-u' prefix argument, use `org-timer-default-timer' +With two `C-u' prefix arguments, use `org-timer-default-timer' without prompting the user for a duration and automatically replace any running timer." (interactive "P")