Merge branch 'master' into feature/api-parser

5 files changed, 10 insertions, 4 deletions

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 8c7876f4..6e5d1a78 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -5,6 +5,10 @@
 	* wordlist2: New file.
 	* Makefile.am: Revised for new document. Copyright years updated.
 
+	* gawkworkflow.texi: Fix some spelling errors. :-(
+	* wordlist2: Updated.
+	* Makefile.am: Fix spell checking. :-(
+
 2017-03-22         Andrew J. Schorr     <aschorr@telemetry-investments.com>
 
 	* gawk.1: Document new PROCINFO["FS"] value "API".
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 76ba8246..367ed0c9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -108,7 +108,7 @@ awkcard.nc: $(CARDFILES)
 awkcard.pdf: awkcard.ps
 	ps2pdf awkcard.ps awkcard.pdf
 
-spell: spellmanual spell workflow
+spell: spellmanual spellworkflow
 
 spellmanual:
 	@echo ==== gawktexi.in ====;
diff --git a/doc/Makefile.in b/doc/Makefile.in
index fd4f47a3..c20aecf5 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -922,7 +922,7 @@ awkcard.nc: $(CARDFILES)
 awkcard.pdf: awkcard.ps
 	ps2pdf awkcard.ps awkcard.pdf
 
-spell: spellmanual spell workflow
+spell: spellmanual spellworkflow
 
 spellmanual:
 	@echo ==== gawktexi.in ====;
diff --git a/doc/gawkworkflow.texi b/doc/gawkworkflow.texi
index 4d9ddd05..1bee193a 100755
--- a/doc/gawkworkflow.texi
+++ b/doc/gawkworkflow.texi
@@ -246,7 +246,7 @@ This file describes how to participate in software development for
                                       development.
 * Using Git::                         Getting started with Git.
 * Configuring git::                   Configuring Git.
-* Development without commit access:: How to wwork without commit access.
+* Development without commit access:: How to work without commit access.
 * Development with commit access::    How to work with commit access.
 * General practices::                 How things should usually be done.
 * Repo Maintenance::                  Tips for keeping your repo clean.
@@ -1160,7 +1160,7 @@ chance for recovery, so be sure you really want to do it.
 
 As you work on your branch, you will occasionally want to bring it
 up to date with respect to @code{master}.
-This @value{SECTION} dicusses updating locale branches
+This @value{SECTION} discusses updating locale branches
 and handling merge conflicts.
 
 @menu
diff --git a/doc/wordlist2 b/doc/wordlist2
index 5d91c81b..0d2db288 100644
--- a/doc/wordlist2
+++ b/doc/wordlist2
@@ -1,5 +1,6 @@
 Autoconf
 Automake
+Autotools
 Awk
 Bernat
 CFLAGS
@@ -16,6 +17,7 @@ Libtool
 PCC
 PDF
 Rebase
+Rebasing
 Repo
 SVN
 TODO