[elpa] externals/org f5392c4 08/85: Merge branch 'km/from-emacs-master'

[ELPA Syncer]

branch: externals/org
commit f5392c4f2bb2ca8197bcc712f0cb9f8bbeb5f312
Merge: d3d2e56 7aeadf2
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>

    Merge branch 'km/from-emacs-master'
---
 lisp/ol.el        | 2 +-
 lisp/org-timer.el | 6 +++---
 lisp/ox.el        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lisp/ol.el b/lisp/ol.el
index 7862ded..75d0022 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -442,7 +442,7 @@ negates this setting for the duration of the command."
   :safe (lambda (val) (or (booleanp val) (integerp val))))
 
 (defcustom org-link-email-description-format "Email %c: %s"
-  "Format of the description part of a link to an email or usenet message.
+  "Format of the description part of a link to an email or Usenet message.
 The following %-escapes will be replaced by corresponding information:
 
 %F   full \"From\" field
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 67b8c46..bfcea44 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -400,16 +400,16 @@ prompt the user if she wants to replace it.
 Called with a numeric prefix argument, use this numeric value as
 the duration of the timer in minutes.
 
-Called with a `C-u' prefix arguments, use `org-timer-default-timer'
+Called with a \\[universal-argument] prefix arguments, use 
`org-timer-default-timer'
 without prompting the user for a duration.
 
-With two `C-u' prefix arguments, use `org-timer-default-timer'
+With two \\[universal-argument] prefix arguments, use `org-timer-default-timer'
 without prompting the user for a duration and automatically
 replace any running timer.
 
 By default, the timer duration will be set to the number of
 minutes in the Effort property, if any.  You can ignore this by
-using three `C-u' prefix arguments."
+using three \\[universal-argument] prefix arguments."
   (interactive "P")
   (when (and org-timer-start-time
             (not org-timer-countdown-timer))
diff --git a/lisp/ox.el b/lisp/ox.el
index 5fe8945..18b13a3 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -299,7 +299,7 @@ and its CDR is a list of export options.")
 
 (defvar org-export-dispatch-last-position (make-marker)
   "The position where the last export command was created using the dispatcher.
-This marker will be used with `C-u C-c C-e' to make sure export repetition
+This marker will be used with `\\[universal-argument] C-c C-e' to make sure 
export repetition
 uses the same subtree if the previous command was restricted to a subtree.")
 
 ;; For compatibility with Org < 8