summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-02-16 17:33:57 -0500
committerKyle Meyer <kyle@kyleam.com>2018-02-18 16:32:41 -0500
commitec8590d5e29bbdc5d58c623e8bac5e40eb68b27d (patch)
treee11d96d832264fd6d7ce8696de2661ce5b6ce733
parent4ddfc6bd69b13fece81823f6bc1bde8aee769749 (diff)
downloadorg-mode-ec8590d5e29bbdc5d58c623e8bac5e40eb68b27d.tar.gz
Backport commit 69107f347 from Emacs
; Fix doc typos related to indefinite articles 69107f347b3ac7f51cd22333f57393fd735915f2 Glenn Morris Fri Feb 16 17:33:57 2018 -0500
-rw-r--r--etc/ORG-NEWS2
-rw-r--r--lisp/ob-calc.el2
-rw-r--r--lisp/org-clock.el2
-rw-r--r--lisp/ox-odt.el5
4 files changed, 5 insertions, 6 deletions
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index fa2cafe..228ebd9 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -148,7 +148,7 @@ directories in published site-maps.
**** Scheme: support for tables
**** Scheme: new variable: ~org-babel-scheme-null-to~
-This new custom option allows to use a empty list or null symbol to
+This new custom option allows you to use an empty list or null symbol to
format the table output, initially assigned to ~hlines~.
**** Scheme: new header ~:prologue~
diff --git a/lisp/ob-calc.el b/lisp/ob-calc.el
index 19479a6..387cba2 100644
--- a/lisp/ob-calc.el
+++ b/lisp/ob-calc.el
@@ -37,7 +37,7 @@
(declare-function org-trim "org" (s &optional keep-lead))
(defvar org-babel-default-header-args:calc nil
- "Default arguments for evaluating an calc source block.")
+ "Default arguments for evaluating a calc source block.")
(defun org-babel-expand-body:calc (body _params)
"Expand BODY according to PARAMS, return the expanded body." body)
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index ee84fe4..dbbe6ad 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1366,7 +1366,7 @@ the default behavior."
;;;###autoload
(defun org-clock-in-last (&optional arg)
"Clock in the last closed clocked item.
-When already clocking in, send an warning.
+When already clocking in, send a warning.
With a universal prefix argument, select the task you want to
clock in from the last clocked in tasks.
With two universal prefix arguments, start clocking using the
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index d1b7fc6..a1145a9 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -600,8 +600,7 @@ allow document of a given class (irrespective of its source
format) to be converted to any of the export formats associated
with that class.
-See default setting of this variable for an typical
-configuration."
+See default setting of this variable for a typical configuration."
:group 'org-export-odt
:version "24.1"
:type
@@ -1938,7 +1937,7 @@ holding contextual information."
(defun org-odt-format-inlinetask-default-function
(todo todo-type priority name tags contents)
- "Default format function for a inlinetasks.
+ "Default format function for inlinetasks.
See `org-odt-format-inlinetask-function' for details."
(format "\n<text:p text:style-name=\"%s\">%s</text:p>"
"Text_20_body"