From 347191042a5fc2c0c59c7fe6d0448dc344613754 Mon Sep 17 00:00:00 2001 From: Alan Mackenzie Date: Sun, 24 Jan 2016 20:30:39 +0000 Subject: [PATCH] Backport commit fbce475 from Emacs Expunge "allow" + infinitive without direct object from source and doc. fbce4757a874cc43806eb41b8637538b101c3c69 Alan Mackenzie Sun Jan 24 20:30:39 2016 +0000 --- doc/org.texi | 6 +++--- lisp/org-crypt.el | 2 +- lisp/org-element.el | 10 +++++----- lisp/org-feed.el | 2 +- lisp/org.el | 2 +- lisp/ox-ascii.el | 6 +++--- lisp/ox-icalendar.el | 2 +- lisp/ox-publish.el | 2 +- lisp/ox.el | 16 ++++++++-------- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/doc/org.texi b/doc/org.texi index f5d2369d4..0da8fbf86 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -13468,9 +13468,9 @@ These keywords are treated in details in the following sections. When processing a document, @samp{texinfo} back-end generates a minimal file header along with a title page, a copyright page, and a menu. You control the latter through the structure of the document (@pxref{Headings and -sectioning structure}). Various keywords allow to tweak the other parts. It -is also possible to give directions to install the document in the @samp{Top} -node. +sectioning structure}). Various keywords allow you to tweak the other parts. +It is also possible to give directions to install the document in the +@samp{Top} node. @subsubheading File header diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el index 089666f81..559c86e91 100644 --- a/lisp/org-crypt.el +++ b/lisp/org-crypt.el @@ -225,7 +225,7 @@ See `org-crypt-disable-auto-save'." ;; outline property starts at the \n of the heading. (delete-region (1- (point)) end) ;; Store a checksum of the decrypted and the encrypted - ;; text value. This allow to reuse the same encrypted text + ;; text value. This allow reusing the same encrypted text ;; if the text does not change, and therefore avoid a ;; re-encryption process. (insert "\n" (propertize decrypted-text diff --git a/lisp/org-element.el b/lisp/org-element.el index b22c5ad1e..fec0605a7 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -415,9 +415,9 @@ Other brackets are treated as spaces.") ;; Provide four accessors: `org-element-type', `org-element-property' ;; `org-element-contents' and `org-element-restriction'. ;; -;; Setter functions allow to modify elements by side effect. There is -;; `org-element-put-property', `org-element-set-contents'. These -;; low-level functions are useful to build a parse tree. +;; Setter functions allow modification of elements by side effect. +;; There is `org-element-put-property', `org-element-set-contents'. +;; These low-level functions are useful to build a parse tree. ;; ;; `org-element-adopt-element', `org-element-set-element', ;; `org-element-extract-element' and `org-element-insert-before' are @@ -3933,8 +3933,8 @@ position of point and CDR is nil." ;; `org-element-parse-secondary-string', which parses objects within ;; a given string. ;; -;; The (almost) almighty `org-element-map' allows to apply a function -;; on elements or objects matching some type, and accumulate the +;; The (almost) almighty `org-element-map' allows applying a function +;; on elements or objects matching some type, and accumulating the ;; resulting values. In an export situation, it also skips unneeded ;; parts of the parse tree. diff --git a/lisp/org-feed.el b/lisp/org-feed.el index 8c040e985..0600f6374 100644 --- a/lisp/org-feed.el +++ b/lisp/org-feed.el @@ -24,7 +24,7 @@ ;; ;;; Commentary: ;; -;; This module allows to create and change entries in an Org-mode +;; This module allows entries to be created and changed in an Org-mode ;; file triggered by items in an RSS feed. The basic functionality is ;; geared toward simply adding new items found in a feed as outline nodes ;; to an Org file. Using hooks, arbitrary actions can be triggered for diff --git a/lisp/org.el b/lisp/org.el index 3bcb3a7ca..675345763 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -2483,7 +2483,7 @@ fast, while still showing the whole path to the entry." :type 'boolean) (defcustom org-refile-allow-creating-parent-nodes nil - "Non-nil means allow to create new nodes as refile targets. + "Non-nil means allow the creation of new nodes as refile targets. New nodes are then created by adding \"/new node name\" to the completion of an existing node. When the value of this variable is `confirm', new node creation must be confirmed by the user (recommended). diff --git a/lisp/ox-ascii.el b/lisp/ox-ascii.el index ea4ed25f5..aa12d9eb0 100644 --- a/lisp/ox-ascii.el +++ b/lisp/ox-ascii.el @@ -35,10 +35,10 @@ ;;; Define Back-End ;; -;; The following setting won't allow to modify preferred charset +;; The following setting won't allow modifying preferred charset ;; through a buffer keyword or an option item, but, since the property -;; will appear in communication channel nonetheless, it allows to -;; override `org-ascii-charset' variable on the fly by the ext-plist +;; will appear in communication channel nonetheless, it allows +;; overriding `org-ascii-charset' variable on the fly by the ext-plist ;; mechanism. ;; ;; We also install a filter for headlines and sections, in order to diff --git a/lisp/ox-icalendar.el b/lisp/ox-icalendar.el index a7cb4fb08..f965ddcf1 100644 --- a/lisp/ox-icalendar.el +++ b/lisp/ox-icalendar.el @@ -76,7 +76,7 @@ for timed events. If non-zero, alarms are created. (defcustom org-icalendar-exclude-tags nil "Tags that exclude a tree from export. -This variable allows to specify different exclude tags from other +This variable allows specifying different exclude tags from other back-ends. It can also be set with the ICALENDAR_EXCLUDE_TAGS keyword." :group 'org-export-icalendar diff --git a/lisp/ox-publish.el b/lisp/ox-publish.el index 00c2cbfd9..8e20a8138 100644 --- a/lisp/ox-publish.el +++ b/lisp/ox-publish.el @@ -1139,7 +1139,7 @@ This function is meant to be used as a final out filter. See Return value is an internal reference, as a string. -This function allows to resolve external links like: +This function allows the resolution of external links like: [[file.org::*fuzzy][description]] [[file.org::#custom-id][description]] diff --git a/lisp/ox.el b/lisp/ox.el index 7e5d1c463..b9c99eb2d 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -800,7 +800,7 @@ is nil. You can also allow them through local buffer variables." (defcustom org-export-snippet-translation-alist nil "Alist between export snippets back-ends and exporter back-ends. -This variable allows to provide shortcuts for export snippets. +This variable allows providing shortcuts for export snippets. For example, with a value of \\='((\"h\" . \"html\")), the HTML back-end will recognize the contents of \"@@h:@@\" as @@ -883,7 +883,7 @@ output is restricted to body only, \"s\" when it is restricted to the current subtree, \"v\" when only visible elements are considered for export, \"f\" when publishing functions should be passed the FORCE argument and \"a\" when the export should be -asynchronous). Also, [?] allows to switch back to standard +asynchronous). Also, [?] allows switching back to standard mode." :group 'org-export-general :version "24.4" @@ -3814,8 +3814,8 @@ process, leading to a different order when footnotes are nested." ;; level, relatively to the lower headline level in the parsed tree. ;; ;; `org-export-get-headline-number' returns the section number of an -;; headline, while `org-export-number-to-roman' allows to convert it -;; to roman numbers. With an optional argument, +;; headline, while `org-export-number-to-roman' allows it to be +;; converted to roman numbers. With an optional argument, ;; `org-export-get-headline-number' returns a number to unnumbered ;; headlines (used for internal id). ;; @@ -4265,8 +4265,8 @@ Otherwise, only provided element's type is considered. Optional argument PREDICATE is a function returning a non-nil value if the current element or object should be counted in. It accepts two arguments: the element or object being considered and -the plist used as a communication channel. This allows to count -only a certain type of objects (i.e. inline images). +the plist used as a communication channel. This allows counting +only a certain type of object (i.e. inline images). Return value is a list of numbers if ELEMENT is a headline or an item. It is nil for keywords. It represents the footnote number @@ -5689,7 +5689,7 @@ to `:default' encoding. If it fails, return S." ;; returned results in the current process. ;; ;; At a higher level, `org-export-to-buffer' and `org-export-to-file' -;; allow to export to a buffer or a file, asynchronously or not. +;; allow exporting to a buffer or a file, asynchronously or not. ;; ;; `org-export-output-file-name' is an auxiliary function meant to be ;; used with `org-export-to-file'. With a given extension, it tries @@ -6218,7 +6218,7 @@ is nil when this menu hasn't been selected yet. EXPERTP, when non-nil, triggers expert UI. In that case, no help buffer is provided, but indications about currently active -options are given in the prompt. Moreover, [?] allows to switch +options are given in the prompt. Moreover, [?] allows switching back to standard interface." (let* ((fontify-key (lambda (key &optional access-key)