Browse Source

Backport commit 7aa506e from Emacs master branch

Spelling fixes
7aa506eed8881788485a9774165454404bac2623
Paul Eggert
Thu Dec 25 18:08:47 2014 -0800
Paul Eggert 11 years ago
parent
commit
72416b82ac
5 changed files with 10 additions and 10 deletions
  1. 4 4
      lisp/org-ctags.el
  2. 1 1
      lisp/ox-html.el
  3. 1 1
      lisp/ox-latex.el
  4. 1 1
      lisp/ox-publish.el
  5. 3 3
      lisp/ox.el

+ 4 - 4
lisp/org-ctags.el

@@ -63,19 +63,19 @@
 ;; with the same name as the link; then, if unsuccessful, ask the user if
 ;; with the same name as the link; then, if unsuccessful, ask the user if
 ;; he/she wants to rebuild the 'TAGS' database and try again; then ask if
 ;; he/she wants to rebuild the 'TAGS' database and try again; then ask if
 ;; the user wishes to append 'tag' as a new toplevel heading at the end of
 ;; the user wishes to append 'tag' as a new toplevel heading at the end of
-;; the buffer; and finally, defer to org's default behaviour which is to
+;; the buffer; and finally, defer to org's default behavior which is to
 ;; search the entire text of the current buffer for 'tag'.
 ;; search the entire text of the current buffer for 'tag'.
 ;;
 ;;
-;; This behaviour can be modified by changing the value of
+;; This behavior can be modified by changing the value of
 ;; ORG-CTAGS-OPEN-LINK-FUNCTIONS. For example I have the following in my
 ;; ORG-CTAGS-OPEN-LINK-FUNCTIONS. For example I have the following in my
-;; .emacs, which describes the same behaviour as the above paragraph with
+;; .emacs, which describes the same behavior as the above paragraph with
 ;; one difference:
 ;; one difference:
 ;;
 ;;
 ;; (setq org-ctags-open-link-functions
 ;; (setq org-ctags-open-link-functions
 ;;       '(org-ctags-find-tag
 ;;       '(org-ctags-find-tag
 ;;         org-ctags-ask-rebuild-tags-file-then-find-tag
 ;;         org-ctags-ask-rebuild-tags-file-then-find-tag
 ;;         org-ctags-ask-append-topic
 ;;         org-ctags-ask-append-topic
-;;         org-ctags-fail-silently))  ; <-- prevents org default behaviour
+;;         org-ctags-fail-silently))  ; <-- prevents org default behavior
 ;;
 ;;
 ;;
 ;;
 ;; Usage
 ;; Usage

+ 1 - 1
lisp/ox-html.el

@@ -581,7 +581,7 @@ The function must accept two parameters:
 The function should return the string to be exported.
 The function should return the string to be exported.
 
 
 For example, the variable could be set to the following function
 For example, the variable could be set to the following function
-in order to mimic default behaviour:
+in order to mimic default behavior:
 
 
 The default value simply returns the value of CONTENTS."
 The default value simply returns the value of CONTENTS."
   :group 'org-export-html
   :group 'org-export-html

+ 1 - 1
lisp/ox-latex.el

@@ -589,7 +589,7 @@ The function must accept six parameters:
 The function should return the string to be exported.
 The function should return the string to be exported.
 
 
 For example, the variable could be set to the following function
 For example, the variable could be set to the following function
-in order to mimic default behaviour:
+in order to mimic default behavior:
 
 
 \(defun org-latex-format-inlinetask \(todo type priority name tags contents\)
 \(defun org-latex-format-inlinetask \(todo type priority name tags contents\)
 \"Format an inline task element for LaTeX export.\"
 \"Format an inline task element for LaTeX export.\"

+ 1 - 1
lisp/ox-publish.el

@@ -228,7 +228,7 @@ If you create a site-map file, adjust the sorting like this:
   `:sitemap-sort-files'
   `:sitemap-sort-files'
 
 
     The site map is normally sorted alphabetically.  You can
     The site map is normally sorted alphabetically.  You can
-    change this behaviour setting this to `anti-chronologically',
+    change this behavior setting this to `anti-chronologically',
     `chronologically', or nil.
     `chronologically', or nil.
 
 
   `:sitemap-ignore-case'
   `:sitemap-ignore-case'

+ 3 - 3
lisp/ox.el

@@ -493,7 +493,7 @@ t           Allow export of math snippets."
   "The last level which is still exported as a headline.
   "The last level which is still exported as a headline.
 
 
 Inferior levels will usually produce itemize or enumerate lists
 Inferior levels will usually produce itemize or enumerate lists
-when exported, but back-end behaviour may differ.
+when exported, but back-end behavior may differ.
 
 
 This option can also be set with the OPTIONS keyword,
 This option can also be set with the OPTIONS keyword,
 e.g. \"H:2\"."
 e.g. \"H:2\"."
@@ -1736,13 +1736,13 @@ Assume buffer is in Org mode.  Narrowing, if any, is ignored."
 		      (t
 		      (t
 		       ;; Options in `org-export-options-alist'.
 		       ;; Options in `org-export-options-alist'.
 		       (dolist (property (funcall find-properties key))
 		       (dolist (property (funcall find-properties key))
-			 (let ((behaviour (nth 4 (assq property options))))
+			 (let ((behavior (nth 4 (assq property options))))
 			   (setq plist
 			   (setq plist
 				 (plist-put
 				 (plist-put
 				  plist property
 				  plist property
 				  ;; Handle value depending on specified
 				  ;; Handle value depending on specified
 				  ;; BEHAVIOR.
 				  ;; BEHAVIOR.
-				  (case behaviour
+				  (case behavior
 				    (space
 				    (space
 				     (if (not (plist-get plist property))
 				     (if (not (plist-get plist property))
 					 (org-trim val)
 					 (org-trim val)