summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2019-01-03 20:43:15 -0500
committerKyle Meyer <kyle@kyleam.com>2019-01-03 20:43:15 -0500
commit23ef240aa6f69bf5d5df3bb48521b09af5474dad (patch)
treeb21e5bad021531ecab064ebc2c7fc7a2079fab4b
parentf1de41e17289e674f9c069cb5fda4215de066a2f (diff)
parent98407c111d4da7895faae6afd7f63784edf975cd (diff)
downloadorg-mode-23ef240aa6f69bf5d5df3bb48521b09af5474dad.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 0e541cd..ce2bc5e 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3200,7 +3200,7 @@ Depending on the system Emacs is running on, certain dates cannot
be represented with the type used internally to represent time.
Dates between 1970-1-1 and 2038-1-1 can always be represented
correctly. Some systems allow for earlier dates, some for later,
-some for both. One way to find out it to insert any date into an
+some for both. One way to find out is to insert any date into an
Org buffer, putting the cursor on the year and hitting S-up and
S-down to test the range.
@@ -3208,7 +3208,7 @@ When this variable is set to t, the date/time prompt will not let
you specify dates outside the 1970-2037 range, so it is certain that
these dates will work in whatever version of Emacs you are
running, and also that you can move a file from one Emacs implementation
-to another. WHenever Org is forcing the year for you, it will display
+to another. Whenever Org is forcing the year for you, it will display
a message and beep.
When this variable is nil, Org will check if the date is