summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-02-16 15:16:15 -0500
committerKyle Meyer <kyle@kyleam.com>2018-02-18 16:32:41 -0500
commit4ddfc6bd69b13fece81823f6bc1bde8aee769749 (patch)
tree5812285244b24b73bd982ba2eefe917a0b603ee8
parent5c3be1a2984fb5c54e28099f8c088589f7f21d9e (diff)
downloadorg-mode-4ddfc6bd69b13fece81823f6bc1bde8aee769749.tar.gz
Backport commit 66a4e651f from Emacs
; Fix doc typos related to indefinite articles 66a4e651f3cf38c320d1a9d5ae6f88dcc641792b Glenn Morris Fri Feb 16 15:16:15 2018 -0500
-rw-r--r--lisp/ob-core.el6
-rw-r--r--lisp/ob-org.el2
-rw-r--r--lisp/ob-picolisp.el2
-rw-r--r--lisp/org-eww.el6
-rw-r--r--lisp/org-protocol.el2
-rw-r--r--lisp/ox-html.el2
-rw-r--r--lisp/ox-latex.el2
-rw-r--r--lisp/ox-texinfo.el2
8 files changed, 12 insertions, 12 deletions
diff --git a/lisp/ob-core.el b/lisp/ob-core.el
index d92ebd8..5d5faaa 100644
--- a/lisp/ob-core.el
+++ b/lisp/ob-core.el
@@ -363,7 +363,7 @@ a window into the `org-babel-get-src-block-info' function."
;;;###autoload
(defun org-babel-expand-src-block-maybe ()
"Conditionally expand a source block.
-Detect if this is context for a org-babel src-block and if so
+Detect if this is context for an org-babel src-block and if so
then run `org-babel-expand-src-block'."
(interactive)
(org-babel-when-in-src-block
@@ -372,7 +372,7 @@ then run `org-babel-expand-src-block'."
;;;###autoload
(defun org-babel-load-in-session-maybe ()
"Conditionally load a source block in a session.
-Detect if this is context for a org-babel src-block and if so
+Detect if this is context for an org-babel src-block and if so
then run `org-babel-load-in-session'."
(interactive)
(org-babel-when-in-src-block
@@ -383,7 +383,7 @@ then run `org-babel-load-in-session'."
;;;###autoload
(defun org-babel-pop-to-session-maybe ()
"Conditionally pop to a session.
-Detect if this is context for a org-babel src-block and if so
+Detect if this is context for an org-babel src-block and if so
then run `org-babel-switch-to-session'."
(interactive)
(org-babel-when-in-src-block
diff --git a/lisp/ob-org.el b/lisp/ob-org.el
index 631a845..7a495fa 100644
--- a/lisp/ob-org.el
+++ b/lisp/ob-org.el
@@ -34,7 +34,7 @@
(defvar org-babel-default-header-args:org
'((:results . "raw silent") (:exports . "code"))
- "Default arguments for evaluating a org source block.")
+ "Default arguments for evaluating an org source block.")
(defvar org-babel-org-default-header
"#+TITLE: default empty header\n"
diff --git a/lisp/ob-picolisp.el b/lisp/ob-picolisp.el
index 4833289..cc2c8a8 100644
--- a/lisp/ob-picolisp.el
+++ b/lisp/ob-picolisp.el
@@ -35,7 +35,7 @@
;; (http://picolisp.com/5000/-2.html). PicoLisp is included in some
;; GNU/Linux Distributions, and can be downloaded here:
;; http://software-lab.de/down.html. It ships with a picolisp-mode and
-;; a inferior-picolisp-mode for Emacs (to be found in the /lib/el/
+;; an inferior-picolisp-mode for Emacs (to be found in the /lib/el/
;; directory).
;; Although it might seem more natural to use Emacs Lisp for most
diff --git a/lisp/org-eww.el b/lisp/org-eww.el
index 46ebccb..1b6112a 100644
--- a/lisp/org-eww.el
+++ b/lisp/org-eww.el
@@ -25,9 +25,9 @@
;;; Commentary:
;; When this module is active `org-store-link' (often on key C-c l) in
-;; a eww buffer stores a link to the current url of the eww buffer.
+;; an EWW buffer stores a link to the current url of the eww buffer.
-;; In an eww buffer function `org-eww-copy-for-org-mode' kills either
+;; In an EWW buffer function `org-eww-copy-for-org-mode' kills either
;; a region or the whole buffer if no region is set and transforms the
;; text on the fly so that it can be pasted into an Org buffer with
;; hot links.
@@ -58,7 +58,7 @@
;; Store Org-link in eww-mode buffer
(org-link-set-parameters "eww" :follow #'eww :store #'org-eww-store-link)
(defun org-eww-store-link ()
- "Store a link to the url of a Eww buffer."
+ "Store a link to the url of an EWW buffer."
(when (eq major-mode 'eww-mode)
(org-store-link-props
:type "eww"
diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el
index a0e2e42..33957ee 100644
--- a/lisp/org-protocol.el
+++ b/lisp/org-protocol.el
@@ -663,7 +663,7 @@ to deal with new-style links.")
;;; Org specific functions:
(defun org-protocol-create-for-org ()
- "Create a Org protocol project for the current file's project.
+ "Create an Org protocol project for the current file's project.
The visited file needs to be part of a publishing project in
`org-publish-project-alist' for this to work. The function
delegates most of the work to `org-protocol-create'."
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index d487b4b..39f7d83 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -2697,7 +2697,7 @@ holding contextual information."
(defun org-html-format-inlinetask-default-function
(todo todo-type priority text tags contents info)
- "Default format function for a inlinetasks.
+ "Default format function for inlinetasks.
See `org-html-format-inlinetask-function' for details."
(format "<div class=\"inlinetask\">\n<b>%s</b>%s\n%s</div>"
(org-html-format-headline-default-function
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index e612b32..5aaaf99 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -2124,7 +2124,7 @@ holding contextual information."
(defun org-latex-format-inlinetask-default-function
(todo _todo-type priority title tags contents _info)
- "Default format function for a inlinetasks.
+ "Default format function for inlinetasks.
See `org-latex-format-inlinetask-function' for details."
(let ((full-title
(concat (when todo (format "\\textbf{\\textsf{\\textsc{%s}}} " todo))
diff --git a/lisp/ox-texinfo.el b/lisp/ox-texinfo.el
index fd4235a..d877c9c 100644
--- a/lisp/ox-texinfo.el
+++ b/lisp/ox-texinfo.el
@@ -958,7 +958,7 @@ holding contextual information."
(defun org-texinfo-format-inlinetask-default-function
(todo _todo-type priority title tags contents)
- "Default format function for a inlinetasks.
+ "Default format function for inlinetasks.
See `org-texinfo-format-inlinetask-function' for details."
(let ((full-title
(concat (when todo (format "@strong{%s} " todo))