Spelling fixes

* lisp/org/org-table.el (org-table-sort-lines):
Fix misspelling in prompt.
* lisp/org/ox-ascii.el (org-ascii--describe-datum):
Fix misspelling in call to org-element-lineage.

26 files changed, 55 insertions, 54 deletions

diff --git a/ChangeLog.2 b/ChangeLog.2
index 96a647d9b44..bf52ac0ef1d 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -16541,7 +16541,7 @@
 	* lisp/faces.el (faces--attribute-at-point): Fix an issue
 
 	Previous code would signal an error when the face at point was
-	a manually built list of attributes such as '(:foregroud "white").
+	a manually built list of attributes such as '(:foreground "white").
 
 	* test/automated/faces-tests.el (faces--test-color-at-point): Add a test
 
@@ -32017,10 +32017,10 @@
 
 2015-05-18  Dmitry Gutov  <dgutov@yandex.ru>
 
-	Add a test case for Maven warning ouput
+	Add a test case for Maven warning output
 	* test/automated/compile-tests.el
 	(compile-tests--test-regexps-data): Add a case for Maven warning
-	ouput.
+	output.
 	(compile--test-error-line): Check the compilation message type, if
 	it's specified in the test data.
 
@@ -32142,7 +32142,7 @@
 	(xpm_load): Call the above functions.  Handle XPM without mask
 	when USE_CAIRO.
 	(png_load_body): Handle USE_CAIRO case.
-	(png_load): Remove USE_CAIRO specific fuction, modify png_load_body
+	(png_load): Remove USE_CAIRO specific function, modify png_load_body
 	instead.
 	(jpeg_load_body): Call create_cairo_image_surface.
 	(gif_load, svg_load_image): Handle specified background, call
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index 0b5efd04a18..5165881739f 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -521,7 +521,7 @@ data to the clipboard manager, change the variable
 
   Since strings containing NUL bytes are usually truncated when passed
 through the clipboard, Emacs replaces such characters with ``\0''
-before transfering them to the system's clipboard.
+before transferring them to the system's clipboard.
 
 @vindex select-enable-primary
 @findex clipboard-kill-region
diff --git a/doc/misc/org.texi b/doc/misc/org.texi
index e3f8962c896..e1de3087311 100644
--- a/doc/misc/org.texi
+++ b/doc/misc/org.texi
@@ -1983,7 +1983,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
 
@@ -5291,7 +5291,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
@@ -6218,7 +6218,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
@@ -10011,7 +10011,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
@@ -17679,7 +17679,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
@@ -18459,7 +18459,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
@@ -19116,7 +19116,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
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 87c6458ae4c..f8399dbf1e8 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -20,7 +20,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
@@ -117,7 +117,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))
@@ -198,7 +198,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 ~&vert;~ when using
 a HTML derived export back-end.
 
@@ -579,7 +579,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.
@@ -986,7 +986,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
 
@@ -1022,7 +1022,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
 
@@ -1087,7 +1087,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.
 
diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16
index 691b7945bf4..ffd99f7438c 100644
--- a/lisp/ChangeLog.16
+++ b/lisp/ChangeLog.16
@@ -11992,11 +11992,11 @@
 	* progmodes/verilog-mode.el (verilog-pretty-expr): Don't line up
 	assignment with tests in ifs and for loops.
 	(verilog-extended-complete-re, verilog-complete-reg): Change so
-	that DPI inport functions don't look like fuction declarations.
+	that DPI inport functions don't look like function declarations.
 	(verilog-pretty-expr): Don't line up assignment
 	operations to the test and increment in if and for loops
 	(verilog-extended-complete-re, verilog-complete-reg): Change so
-	that DPI inport functions don't look like fuction declarations.
+	that DPI inport functions don't look like function declarations.
 
 2012-05-03  Kenichi Handa  <handa@m17n.org>
 
diff --git a/lisp/auth-source.el b/lisp/auth-source.el
index 01d12c26141..d1747bda3da 100644
--- a/lisp/auth-source.el
+++ b/lisp/auth-source.el
@@ -934,7 +934,7 @@ Note that the MAX parameter is used so we can exit the parse early."
                              (or
                               ;; the required list of keys is nil, or
                               (null require)
-                              ;; every element of require is in n(ormalized)
+                              ;; every element of require is in n (normalized)
                               (let ((n (nth 0 (auth-source-netrc-normalize
                                                (list alist) file))))
                                 (cl-loop for req in require
diff --git a/lisp/erc/ChangeLog.2 b/lisp/erc/ChangeLog.2
index d961fbfd08a..6d789e4c93f 100644
--- a/lisp/erc/ChangeLog.2
+++ b/lisp/erc/ChangeLog.2
@@ -120,7 +120,7 @@
 
 2014-09-25  Kelvin White  <kwhite@gnu.org>
 
-	* erc.el: Follow Emacs version instead of tracking it seperately.
+	* erc.el: Follow Emacs version instead of tracking it separately.
 	(erc-quit/part-reason-default) : Clean up quit/part message
 	functions by abstracting repetitive code, change version string.
 	(erc-quit-reason-various, erc-quit-reason-normal, erc-quit-reason-zippy)
diff --git a/lisp/mouse.el b/lisp/mouse.el
index e0794435d7a..2fbaaadf16b 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -663,7 +663,7 @@ frame with the mouse."
          ;; difference between `pos-x' and `snap-x' (or `pos-y' and
          ;; `snap-y') exceeds the value of FRAME's `snap-width'
          ;; parameter, unsnap FRAME (at the respective side).  `snap-x'
-         ;; and `snap-y' nil mean FRAME is curerntly not snapped.
+         ;; and `snap-y' nil mean FRAME is currently not snapped.
          snap-x snap-y
          (exitfun nil)
          (move
diff --git a/lisp/org/ob-J.el b/lisp/org/ob-J.el
index eba4bc63498..ff4190b265d 100644
--- a/lisp/org/ob-J.el
+++ b/lisp/org/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))
diff --git a/lisp/org/ob-ebnf.el b/lisp/org/ob-ebnf.el
index ec5001cde81..0fceb5fc6b4 100644
--- a/lisp/org/ob-ebnf.el
+++ b/lisp/org/ob-ebnf.el
@@ -25,7 +25,7 @@
 ;;; 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
@@ -33,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.
 
diff --git a/lisp/org/ob-exp.el b/lisp/org/ob-exp.el
index 2556362f926..f87d0f8e7d3 100644
--- a/lisp/org/ob-exp.el
+++ b/lisp/org/ob-exp.el
@@ -41,7 +41,7 @@
 (defcustom org-export-babel-evaluate t
   "Switch controlling code evaluation during export.
 When set to nil no code will be evaluated as part of the export
-process and no header argumentss will be obeyed.  When set to
+process and no header arguments will be obeyed.  When set to
 `inline-only', only inline code blocks will be executed.  Users
 who wish to avoid evaluating code on export should use the header
 argument `:eval never-export'."
diff --git a/lisp/org/ob-lua.el b/lisp/org/ob-lua.el
index 686d41a4b68..877d895284f 100644
--- a/lisp/org/ob-lua.el
+++ b/lisp/org/ob-lua.el
@@ -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.
diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el
index 06477d38469..6d39e953be4 100644
--- a/lisp/org/ob-sql.el
+++ b/lisp/org/ob-sql.el
@@ -105,7 +105,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
diff --git a/lisp/org/org-bbdb.el b/lisp/org/org-bbdb.el
index f8516681578..bf6a79ab855 100644
--- a/lisp/org/org-bbdb.el
+++ b/lisp/org/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"
diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el
index d81c9f1898e..d52b9475836 100644
--- a/lisp/org/org-bibtex.el
+++ b/lisp/org/org-bibtex.el
@@ -290,8 +290,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")
diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el
index af03fbfe7b6..b9f23f144f7 100644
--- a/lisp/org/org-footnote.el
+++ b/lisp/org/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
 
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 40a715aebd9..357fdcfa441 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -1748,7 +1748,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))
diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el
index 146775b200f..58eb4bd4690 100644
--- a/lisp/org/org-timer.el
+++ b/lisp/org/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))))
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 22b7dbfdaf4..5d10eed1511 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -4132,7 +4132,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
@@ -17106,7 +17106,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)))
@@ -17288,7 +17288,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)))
@@ -17743,7 +17743,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
diff --git a/lisp/org/ox-ascii.el b/lisp/org/ox-ascii.el
index 2a129e9de78..8dc31be99d7 100644
--- a/lisp/org/ox-ascii.el
+++ b/lisp/org/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)
diff --git a/lisp/org/ox-man.el b/lisp/org/ox-man.el
index 71718ab7768..d0e4976edb9 100644
--- a/lisp/org/ox-man.el
+++ b/lisp/org/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."
   "")
 
 
diff --git a/lisp/org/ox-publish.el b/lisp/org/ox-publish.el
index 884d6bf6910..508209ae44b 100644
--- a/lisp/org/ox-publish.el
+++ b/lisp/org/ox-publish.el
@@ -1107,7 +1107,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.
 
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 4ea097445da..9b89681c3bf 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1198,7 +1198,7 @@ Note that this is a strict tail, so won't match, e.g. \"0x....\".")
   ;; This function is called exclusively as a before-change function via the
   ;; variable `c-get-state-before-change-functions'.
   (c-save-buffer-state (p-limit found)
-    ;; Special consideraton for deleting \ from '\''.
+    ;; Special consideration for deleting \ from '\''.
     (if (and (> end beg)
 	     (eq (char-before end) ?\\)
 	     (<= c-new-END end))
diff --git a/lisp/window.el b/lisp/window.el
index c933996a72f..43e9e995953 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -8033,7 +8033,7 @@ parameters of FRAME."
            ;; to its workarea or the parent frame's native rectangle.
            (margins (or (frame-parameter frame 'fit-frame-to-buffer-margins)
                         fit-frame-to-buffer-margins))
-           ;; Convert margins intto pixel offsets from the left-top
+           ;; Convert margins into pixel offsets from the left-top
            ;; corner of FRAME's display or parent.
            (left-margin (if (nth 0 margins)
                             (window--sanitize-margin
diff --git a/src/window.c b/src/window.c
index 4816bd69909..857870591f3 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4875,7 +4875,7 @@ mark_window_cursors_off (struct window *w)
  * window_wants_mode_line:
  *
  * Return 1 if window W wants a mode line and is high enough to
- * accomodate it, 0 otherwise.
+ * accommodate it, 0 otherwise.
  *
  * W wants a mode line if it's a leaf window and neither a minibuffer
  * nor a pseudo window.  Moreover, its 'window-mode-line-format'
@@ -4905,14 +4905,14 @@ window_wants_mode_line (struct window *w)
  * window_wants_header_line:
  *
  * Return 1 if window W wants a header line and is high enough to
- * accomodate it, 0 otherwise.
+ * accommodate it, 0 otherwise.
  *
  * W wants a header line if it's a leaf window and neither a minibuffer
  * nor a pseudo window.  Moreover, its 'window-mode-line-format'
  * parameter must not be 'none' and either that parameter or W's
  * buffer's 'mode-line-format' value must be non-nil.  Finally, W must
  * be higher than its frame's canonical character height and be able to
- * accomodate a mode line too if necessary (the mode line prevails).
+ * accommodate a mode line too if necessary (the mode line prevails).
  */
 bool
 window_wants_header_line (struct window *w)
diff --git a/test/manual/etags/tex-src/gzip.texi b/test/manual/etags/tex-src/gzip.texi
index 07be37187d7..ea5f7f5879e 100644
--- a/test/manual/etags/tex-src/gzip.texi
+++ b/test/manual/etags/tex-src/gzip.texi
@@ -240,7 +240,7 @@ Force compression or decompression even if the file has multiple links
 or the corresponding file already exists, or if the compressed data
 is read from or written to a terminal. If the input data is not in
 a format recognized by @code{gzip}, and if the option --stdout is also
-given, copy the input data without change to the standard ouput: let
+given, copy the input data without change to the standard output: let
 @code{zcat} behave as @code{cat}. If @samp{-f} is not given, and
 when not running in the background, @code{gzip} prompts to verify
 whether an existing file should be overwritten.