Merge branch 'maint'

doc/org.texi

@@ -1982,7 +1982,7 @@ you can use the usual commands to follow these links.
 @item C-c '
 @item C-c '
 Edit the footnote definition corresponding to the reference at point in
-a seperate window.  The window can be closed by pressing @kbd{C-c '}.
+a separate window.  The window can be closed by pressing @kbd{C-c '}.
 
 @end table
 
@@ -5290,7 +5290,7 @@ or with a tree they need to be inserted into a special drawer
 right below a headline, and its planning line (@pxref{Deadlines and
 scheduling}) when applicable.  Each property is specified on a single line,
 with the key (surrounded by colons) first, and the value after it.  Keys are
-case-insensitives.  Here is an example:
+case-insensitive.  Here is an example:
 
 @example
 * CD collection
@@ -6217,7 +6217,7 @@ format is shorter, things do work as expected.
 @section Deadlines and scheduling
 
 A timestamp may be preceded by special keywords to facilitate planning.  Both
-the timestamp and the keyword have to be positioned immediatly after the task
+the timestamp and the keyword have to be positioned immediately after the task
 they refer to.
 
 @table @var
@@ -9995,7 +9995,7 @@ completions.  If you need such a symbol inside a word, terminate it with
 a pair of curly brackets.  For example
 
 @example
-Protip: Given a circle \Gamma of diameter d, the length of its circumference
+Pro tip: Given a circle \Gamma of diameter d, the length of its circumference
 is \pi@{@}d.
 @end example
 
@@ -11395,7 +11395,7 @@ transcoding @LaTeX{} fragments to images (@pxref{Math formatting in HTML
 export}).
 
 @item SUBTITLE
-@cindex #+SUBTILE (HTML)
+@cindex #+SUBTITLE (HTML)
 The document's subtitle.  HTML exporter formats subtitle if document type is
 @samp{HTML5} and the CSS has a @samp{subtitle} class.
 @end table
@@ -11692,7 +11692,7 @@ buffer.  For example, with the following settings,
 @smallexample
 #+HTML_MATHJAX: align: left indent: 5em tagside: left font: Neo-Euler
 @end smallexample
-equation labels will be displayed on the left marign and equations will be
+equation labels will be displayed on the left margin and equations will be
 five ems from the left margin.
 
 @noindent See the docstring of
@@ -17807,7 +17807,7 @@ thes variable, @code{org-imenu-depth}.
 @cindex Ludlam, Eric M.
 Speedbar package creates a special Emacs frame for displaying files and index
 items in files.  Org mode supports Speedbar; users can drill into Org files
-directly from the Speedbar.  The @kbd{<} in the Speedbar frame tweeks the
+directly from the Speedbar.  The @kbd{<} in the Speedbar frame tweaks the
 agenda commands to that file or to a subtree.
 @cindex @file{table.el}
 @item @file{table.el} by Takaaki Ota
@@ -18587,7 +18587,7 @@ meaningful string suitable for the agenda view.
 @vindex org-agenda-skip-function
 
 Search for entries with a limit set on levels for the custom search.  This is
-a general appraoch to creating custom searches in Org.  To include all
+a general approach to creating custom searches in Org.  To include all
 levels, use @samp{LEVEL>0}@footnote{Note that, for
 @code{org-odd-levels-only}, a level number corresponds to order in the
 hierarchy, not to the number of stars.}.  Then to selectively pick the
@@ -19244,7 +19244,7 @@ calculations and improved XEmacs compatibility, in particular by porting
 @file{nouline.el} to XEmacs.
 @item
 @i{Sacha Chua} suggested copying some linking code from Planner, and helped
-make Org pupular through her blog.
+make Org popular through her blog.
 @item
 @i{Toby S. Cubitt} contributed to the code for clock formats.
 @item

etc/ORG-NEWS

@@ -416,7 +416,7 @@ above is suggested.
 *** XEmacs support has been dropped
 
 Incomplete compatibility layer with XEmacs has been removed.  If you
-want to take over maintainance of this compatibility, please contact
+want to take over maintenance of this compatibility, please contact
 our mailing list.
 
 *** New syntax for export blocks
@@ -513,7 +513,7 @@ exists.
 *** ~org-file-apps~ no longer accepts S-expressions as commands
 
 The variable now accepts functions of two arguments instead of plain
-S-expressions.  Replacing a S-expresion with an appropriate function
+S-expressions.  Replacing an S-expression with an appropriate function
 is straightforward.  For example
 
 : ("pdf" . (foo))
@@ -594,7 +594,7 @@ entries are added to last in the date tree.
 
 *** New ~vbar~ entity
 
-~\vbar~ or ~\vbar{}~ will be exported unconditionnally as a =|=,
+~\vbar~ or ~\vbar{}~ will be exported unconditionally as a =|=,
 unlike to existing ~\vert~, which is expanded as ~|~ when using
 a HTML derived export back-end.
 
@@ -975,7 +975,7 @@ is that spaces are allowed within the path.
 *** ~:preparation-function~ called earlier during publishing
 
 Functions in this list are called before any file is associated to the
-current projet.  Thus, they can be used to generate to be published
+current project.  Thus, they can be used to generate to be published
 Org files.
 
 *** Function ~org-remove-indentation~ changes.
@@ -1382,7 +1382,7 @@ a source block.
 *** New option in ASCII export
 
 Plain lists can have an extra margin by setting ~org-ascii-list-margin~
-variable to an appopriate integer.
+variable to an appropriate integer.
 
 *** New blocks in ASCII export
 
@@ -1418,7 +1418,7 @@ more features.  See docstring for details.
 *** New filter: ~org-export-filter-body-functions~
 
 Functions in this filter are applied on the body of the exported
-document, befor wrapping it within the template.
+document, before wrapping it within the template.
 
 *** New :environment parameter when exporting example blocks to LaTeX
 
@@ -1483,7 +1483,7 @@ property is inherited by children.
 
 *** Tables can be sorted with an arbitrary function
 
-It is now possible to specify a function, both programatically,
+It is now possible to specify a function, both programmatically,
 through a new optional argument, and interactively with ~f~ or ~F~ keys,
 to sort a table.
 

lisp/ob-J.el

@@ -89,7 +89,7 @@ This function is called by `org-babel-execute-src-block'"
        (org-babel-J-eval-string full-body)))))
 
 (defun org-babel-J-eval-string (str)
-  "Sends STR to the `j-console-cmd' session and exectues it."
+  "Sends STR to the `j-console-cmd' session and executes it."
   (let ((session (j-console-ensure-session)))
     (with-current-buffer (process-buffer session)
       (goto-char (point-max))

lisp/ob-abc.el

@@ -7,22 +7,20 @@
 ;; Homepage: http://www.tardis.ed.ac.uk/wwaites
 ;; Version: 0.01
 
-;;; License:
+;; This file is part of GNU Emacs.
 
-;; This program is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
-;;
+
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 

lisp/ob-ebnf.el

@@ -7,27 +7,25 @@
 ;; Homepage: http://orgmode.org
 ;; Version: 1.00
 
-;;; License:
+;; This file is part of GNU Emacs.
 
-;; This program is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
-;;
+
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
 ;;; Org-Babel support for using ebnf2ps to generate encapsulated postscript
-;;; railroad diagrams. It recogises these arguments:
+;;; railroad diagrams. It recognizes these arguments:
 ;;;
 ;;;     :file is required; it must include the extension '.eps.' All the rules
 ;;;           in the block will be drawn in the same file. This is done by
@@ -35,7 +33,7 @@
 ;;;           documentation for ebnf-eps-buffer for more information).
 ;;;
 ;;;     :style specifies a value in ebnf-style-database. This provides the
-;;;            ability to customise the output. The style can also specify the
+;;;            ability to customize the output. The style can also specify the
 ;;;            grammar syntax (by setting ebnf-syntax); note that only ebnf,
 ;;;            iso-ebnf, and yacc are supported by this file.
 

lisp/ob-lua.el

@@ -1,6 +1,6 @@
 ;;; ob-lua.el --- Org Babel functions for Lua evaluation -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2014, 2016, 2017 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2016-2017 Free Software Foundation, Inc.
 
 ;; Authors: Dieter Schoen
 ;; Keywords: literate programming, reproducible research
@@ -25,7 +25,7 @@
 ;; for session support, lua-mode is needed.
 ;; lua-mode is not part of GNU Emacs/orgmode, but can be obtained
 ;; from marmalade or melpa.
-;; The source respository is here:
+;; The source repository is here:
 ;; https://github.com/immerrr/lua-mode
 
 ;; However, sessions are not yet working.

lisp/ob-sed.el

@@ -8,20 +8,18 @@
 
 ;; This file is part of GNU Emacs.
 
-;;; License:
-
-;; This program is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
-;;
-;; This program is distributed in the hope that it will be useful,
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
-;;
+
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 

lisp/ob-sql.el

@@ -115,7 +115,7 @@ Pass nil to omit that arg."
   (format "%s/%s@%s:%s/%s" user password host port database))
 
 (defun org-babel-sql-dbstring-mssql (host user password database)
-  "Make sqlcmd commmand line args for database connection.
+  "Make sqlcmd command line args for database connection.
 `sqlcmd' is the preferred command line tool to access Microsoft
 SQL Server on Windows and Linux platform."
   (mapconcat #'identity

lisp/org-bbdb.el

@@ -105,7 +105,7 @@
 (declare-function bbdb-name "ext:bbdb-com" (string elidep))
 (declare-function bbdb-completing-read-record "ext:bbdb-com"
 		  (prompt &optional omit-records))
-(declare-function bbdb-record-field "ext:bbdb" (recond field))
+(declare-function bbdb-record-field "ext:bbdb" (record field))
 (declare-function bbdb-record-getprop "ext:bbdb" (record property))
 (declare-function bbdb-record-name "ext:bbdb" (record))
 (declare-function bbdb-records "ext:bbdb"

lisp/org-bibtex.el

@@ -301,8 +301,8 @@ is non-nil."
 (defcustom org-bibtex-inherit-tags nil
   "Controls whether inherited tags are converted to bibtex keywords.
 It is relevant only if `org-bibtex-tags-are-keywords' is non-nil.
-Tag inheritence itself is controlled by `org-use-tag-inheritence'
-and `org-exclude-tags-from-inheritence'."
+Tag inheritance itself is controlled by `org-use-tag-inheritance'
+and `org-exclude-tags-from-inheritance'."
   :group 'org-bibtex
   :version "26.1"
   :package-version '(Org . "8.3")

lisp/org-eww.el

@@ -5,15 +5,15 @@
 ;; Author: Marco Wahl <marcowahlsoft>a<gmailcom>
 ;; Keywords: link, eww
 ;; Homepage: http://orgmode.org
-;;
+
 ;; This file is part of GNU Emacs.
-;;
-;; This program is free software: you can redistribute it and/or modify
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; This program is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.

lisp/org-footnote.el

@@ -345,7 +345,7 @@ to rename."
 	(t nil)))
 
 (defun org-footnote--collect-references (&optional anonymous)
-  "Collect all labelled footnote references in current buffer.
+  "Collect all labeled footnote references in current buffer.
 
 Return an alist where associations follow the pattern
 

lisp/org-lint.el

@@ -1,22 +1,24 @@
 ;;; org-lint.el --- Linting for Org documents        -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2015-2017  Free Software Foundation
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;; Keywords: outlines, hypermedia, calendar, wp
 
-;; This program is free software; you can redistribute it and/or modify
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation, either version 3 of the License, or
 ;; (at your option) any later version.
 
-;; This program is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 

lisp/org-table.el

@@ -1755,7 +1755,7 @@ function is being called interactively."
 		 (or compare-func
 		     (and interactive?
 			  (org-read-function
-			   (concat "Fuction for comparing keys "
+			   (concat "Function for comparing keys "
 				   "(empty for default `sort-subr' predicate): ")
 			   'allow-empty)))))))
 	(goto-char (point-min))

lisp/org-timer.el

@@ -143,7 +143,7 @@ the region 0:00:00."
 	      (seconds-to-time
 	       ;; Pass `current-time' result to `float-time' (instead
 	       ;; of calling without arguments) so that only
-	       ;; `current-time' has to be overriden in tests.
+	       ;; `current-time' has to be overridden in tests.
 	       (- (float-time (current-time)) delta))))
       (setq org-timer-pause-time nil)
       (org-timer-set-mode-line 'on)
@@ -172,7 +172,7 @@ With prefix arg STOP, stop it entirely."
 	(setq org-timer-start-time
 	      ;; Pass `current-time' result to `float-time' (instead
 	      ;; of calling without arguments) so that only
-	      ;; `current-time' has to be overriden in tests.
+	      ;; `current-time' has to be overridden in tests.
 	      (seconds-to-time (- (float-time (current-time))
 				  (- pause-secs start-secs)))))
       (setq org-timer-pause-time nil)
@@ -235,7 +235,7 @@ it in the buffer."
 (defun org-timer-seconds ()
   ;; Pass `current-time' result to `float-time' (instead of calling
   ;; without arguments) so that only `current-time' has to be
-  ;; overriden in tests.
+  ;; overridden in tests.
   (if org-timer-countdown-timer
       (- (float-time org-timer-start-time)
 	 (float-time (or org-timer-pause-time (current-time))))

lisp/org.el

@@ -4015,7 +4015,7 @@ PROPERTIES accepts the following attributes:
   :image-output-type  string, output file type of image converter (e.g., \"png\").
   :use-xcolor         boolean, when non-nil, LaTeX \"xcolor\" macro is used to
                       deal with background and foreground color of image.
-                      Otherwise, dvipng style background and foregroud color
+                      Otherwise, dvipng style background and foreground color
                       format are generated.  You may then refer to them in
                       command options with \"%F\" and \"%B\".
   :image-size-adjust  cons of numbers, the car element is used to adjust LaTeX
@@ -16966,7 +16966,7 @@ user."
   ;; FIXME: cleanup and comment
   ;; Pass `current-time' result to `decode-time' (instead of calling
   ;; without arguments) so that only `current-time' has to be
-  ;; overriden in tests.
+  ;; overridden in tests.
   (let ((org-def def)
 	(org-defdecode defdecode)
 	(nowdecode (decode-time (current-time)))
@@ -17148,7 +17148,7 @@ user."
       (unless deltadef
 	;; Pass `current-time' result to `decode-time' (instead of
 	;; calling without arguments) so that only `current-time' has
-	;; to be overriden in tests.
+	;; to be overridden in tests.
 	(let ((now (decode-time (current-time))))
 	  (setq day (nth 3 now) month (nth 4 now) year (nth 5 now))))
       (cond ((member deltaw '("d" "")) (setq day (+ day deltan)))
@@ -17603,7 +17603,7 @@ BUFFER.
 
 Diary sexp timestamps are matched against DAYNR, when non-nil.
 If matching fails or DAYNR is nil, `org-diary-sexp-no-match' is
-signalled."
+signaled."
   (cond
    ((string-match "\\`%%\\((.*)\\)" s)
     ;; Sexp timestamp: try to match DAYNR, if available, since we're

lisp/ox-ascii.el

@@ -916,7 +916,8 @@ as a plist."
 	   ;; If destination is a target, make sure we can name the
 	   ;; container it refers to.
 	   (enumerable
-	    (org-element-lineage datum '(headline paragrah src-block table) t)))
+	    (org-element-lineage datum
+				 '(headline paragraph src-block table) t)))
        (pcase (org-element-type enumerable)
 	 (`headline
 	  (format (org-ascii--translate "See section %s" info)
@@ -1752,7 +1753,7 @@ contextual information."
   "Transcode a SPECIAL-BLOCK element from Org to ASCII.
 CONTENTS holds the contents of the block.  INFO is a plist
 holding contextual information."
-  ;; "JUSTIFYLEFT" and "JUSTFYRIGHT" have already been taken care of
+  ;; "JUSTIFYLEFT" and "JUSTIFYRIGHT" have already been taken care of
   ;; at a lower level.  There is no other special block type to
   ;; handle.
   contents)

lisp/ox-html.el

@@ -525,7 +525,7 @@ means to use the maximum value consistent with other options."
  * @licstart  The following is the entire license notice for the
  *  JavaScript code in %SCRIPT_PATH.
  *
- * Copyright (C) 2012-2013 Free Software Foundation, Inc.
+ * Copyright (C) 2012-2017 Free Software Foundation, Inc.
  *
  *
  * The JavaScript code in this tag is free software: you can
@@ -554,7 +554,7 @@ means to use the maximum value consistent with other options."
 @licstart  The following is the entire license notice for the
 JavaScript code in this tag.
 
-Copyright (C) 2012-2013 Free Software Foundation, Inc.
+Copyright (C) 2012-2017 Free Software Foundation, Inc.
 
 The JavaScript code in this tag is free software: you can
 redistribute it and/or modify it under the terms of the GNU

lisp/ox-man.el

@@ -1014,7 +1014,7 @@ information."
 
 (defun org-man-timestamp (_timestamp _contents _info)
   "Transcode a TIMESTAMP object from Org to Man.
-ONTENTS is nil.  INFO is a plist holding contextual information."
+CONTENTS is nil.  INFO is a plist holding contextual information."
   "")
 
 

lisp/ox-publish.el

@@ -1113,7 +1113,7 @@ publishing directory."
 (defun org-publish--store-crossrefs (output _backend info)
   "Store cross-references for current published file.
 
-OUPUT is the produced output, as a string.  BACKEND is the export
+OUTPUT is the produced output, as a string.  BACKEND is the export
 back-end used, as a symbol.  INFO is the final export state, as
 a plist.