diff --git a/ChangeLog b/ChangeLog
index bd3b6c1a..aa645635 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1547,10 +1547,10 @@ GNU nano 2.3.99pre2 - 2015.02.06
 GNU nano 2.3.99pre1 - 2015.01.06
 
 2015-01-03  Chris Allegretta  <chrisa@asty.org>
-	* New formatter code to support syntaxes like
-	go which have tools to automatically lint and reformat the text for
-	you (gofmt), which is lovely.  rcfile option formatter, function
-	text.c:do_formatter() and some other calls.
+	* New formatter code to support syntaxes like Go that have tools to
+	automatically lint and reformat the text (gofmt), which is lovely.
+	Added rcfile option formatter, a function do_formatter() in text.c
+	and some other calls.
 
 2014-12-28  Benno Schulenberg  <bensberg@justemail.net>
 	* src/files.c (do_lockfile): Gettextize the "File being edited"
@@ -2854,7 +2854,7 @@ GNU nano 2.3.3 - 2014.05.29
 
 2013-06-13  David Lawrence Ramsey <pooka109@gmail.com>
 	* src/global.c (first_sc_for): Try to more consistently display keystrokes,
-	  useful when the user has re-binded a bunch of them.
+	  useful when the user has rebound a bunch of them.
 
 2013-06-13 Kamil Dudka <kdudka@redhat.com>
 	* doc/man/nano.1: Actually document the -P (--poslog) option.
diff --git a/NEWS b/NEWS
index e10cbbeb..3239a3eb 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@
 		and allows to abort re-searches.  Among bunches of other
 		things.  It is worth the trouble to upgrade.
 
+
 2016.02.25 - GNU nano 2.5.3 "Alphys" is released.  This release
 		contains fixes for bugs like: stray cursor positioning
 		errors, many many memory leaks including file reading,
@@ -26,7 +27,7 @@
 		size growth, and a long standing issue with using
 		nano under sudo creating root-owned files.  There are also
 		the usual bevy of documentation and other miscellaneous
-		fixes and touch ups.  Upgrade today while supplies last,
+		fixes and touchups.  Upgrade today while supplies last,
 		operators are standing by!
 
 2016.01.11 - GNU nano 2.5.1 "Salzburg" is released.  It includes fixes
@@ -121,7 +122,7 @@
 2014.07.17 - GNU nano 2.3.6 "Columbo" is released.  This release
 		contains a fix for installing internationalization
 		files.  Also included are scattered documentation
-		(in particular man page) fixes, and a few touch ups
+		(in particular man page) fixes, and a few touchups
 		to syntax highlighting definitions.  Oh, just one
 		more thing, thanks for using nano!
 
diff --git a/doc/syntax/Makefile.am b/doc/syntax/Makefile.am
index d1ece406..64440357 100644
--- a/doc/syntax/Makefile.am
+++ b/doc/syntax/Makefile.am
@@ -22,8 +22,8 @@ pkgdata_DATA =	asm.nanorc \
 		man.nanorc \
 		mgp.nanorc \
 		mutt.nanorc \
-		nftables.nanorc \
 		nanorc.nanorc \
+		nftables.nanorc \
 		objc.nanorc \
 		ocaml.nanorc \
 		patch.nanorc \
diff --git a/src/files.c b/src/files.c
index dbd6e654..11e5a3c2 100644
--- a/src/files.c
+++ b/src/files.c
@@ -144,7 +144,7 @@ void set_modified(void)
 	return;
 
     if (openfile->lock_filename == NULL) {
-	/* TRANSLATORS: Keep the next two messages at most 76 characters. */
+	/* TRANSLATORS: Keep the next ten messages at most 76 characters. */
 	statusline(ALERT, _("Warning: Modifying a file which is not locked,"
 			" check directory permission?"));
     } else {