Merge from origin/emacs-26

a87ce5c4b4 * src/lisp.h (GCALIGNED): Clarify comment (Bug#29040).
8a31e9993f ; etc/NEWS: Add cpp-message-min-time-interval.  (Bug#28961)
ac0bb9a192 Improve the doc of eshell-cmpl-* custom variables (Bug#25069)
36400c7dc9 Fix mouse-scrollbar offset on GNUstep and old macOS (bug#2...
04bc1410c2 Merge from Gnulib
6b08ad5263 Fix alignment portability problems
a9f8706fa8 Fix completion of colon after CSS property (Bug#29056)
9031dec527 ; * src/alloc.c (sweep_symbols): Fix last change.
fdd3dcfa4e * src/alloc.c (sweep_symbols): Tweak last change
27964af438 In frame parameters documentation mention desktop saving/r...
1bd4e7c243 ; Fix typo in ChangeLog.3
4182a60d31 Don't have frameset save the 'client' parameter (Bug#29067)
9d31a97092 ; Spelling fixes
460a25f212 Handle generic variables in cl-defgeneric Edebug spec
dc0a25c2f9 Give a more sensible message if file-attributes fails (Bug...
8453423c7c Avoid wrong value from file-attributes on Linux kernel bef...
70621e2571 Fix customization of debugger-print-function (Bug#29077)

# Conflicts:
#	etc/NEWS

2 files changed, 6 insertions, 6 deletions

diff --git a/admin/nt/dist-build/README-scripts b/admin/nt/dist-build/README-scripts
index a20099e4eb6..1c62a866724 100644
--- a/admin/nt/dist-build/README-scripts
+++ b/admin/nt/dist-build/README-scripts
@@ -3,19 +3,19 @@ Distribution Build Scripts for Windows
 
 The scripts are used to build the binary distribution zip files for windows.
 
-File System Organisation
+File System Organization
 ------------------------
 
 
-They are relatively strict about the file system organisation. In
+They are relatively strict about the file system organization. In
 general, they should work across several more than just the version of
 Emacs they come with, as the dependencies of Emacs change relatively slowly.
 
-The file system needs to be organised like so:
+The file system needs to be organized like so:
 
 ~/emacs-build/git
 
-Contains a checkout of the Emacs git repository, organised according
+Contains a checkout of the Emacs git repository, organized according
 to branches, with git worktree
 
 ~/emacs-build/git/emacs-$branch
diff --git a/admin/nt/dist-build/build-dep-zips.py b/admin/nt/dist-build/build-dep-zips.py
index 33bc4b586c9..9573bf3abcc 100755
--- a/admin/nt/dist-build/build-dep-zips.py
+++ b/admin/nt/dist-build/build-dep-zips.py
@@ -61,7 +61,7 @@ mingw-w64-x86_64-xpm-nox
 mingw-w64-x86_64-lcms2'''.split()
 
     # Get a list of all dependencies needed for packages mentioned above.
-    # Run `pactree -lu' for each elment of $PKG_REQ
+    # Run `pactree -lu' for each element of $PKG_REQ.
     pkgs = set()
     for x in PKG_REQ:
         pkgs.update(
@@ -125,7 +125,7 @@ def gather_source(deps):
     ## mpc, termcap, xpm -- has x86_64, and i686 versions
 
     ## This needs to have been run first at the same time as the
-    ## system was udpated.
+    ## system was updated.
     os.mkdir("emacs-src")
     os.chdir("emacs-src")