diff --git a/ChangeLog b/ChangeLog
index 0cdc7a486fb3918169b2f0d0e228d9376e7ab0f5..a68be134924c147b6b3515efbbb52d1b1b19b8cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -143,8 +143,11 @@ CVS code -
 	  could break anything using extended regular expressions, and
 	  glibc 2.2.3 is old.  Changes to configure.ac, faq.html,
 	  nano.h, proto.h, and UPGRADE; removal of safe_regexec(). (DLR)
-	- Minor wording fixes to various messages. (Benno Schulenberg,
-	  minor tweaks by DLR)
+	- Minor wording fixes to various messages.  Changes to
+	  load_history(), shortcut_init(), toggle_init(), usage(),
+	  do_suspend(), do_input(), do_rcfile_error(), nano.1,
+	  nano.texi, and nanorc.sample.in. (Benno Schulenberg, minor
+	  tweaks by DLR)
 - browser.c:
   do_browser()
 	- Reference NANO_GOTODIR_(ALT|F)?KEY instead of
diff --git a/doc/man/nano.1 b/doc/man/nano.1
index bfe2756b418ecba03c8f6726ebe20c9129a2e678..2dae5b15781b9e5a0c43041f4bb2aa1f07620c9d 100644
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -7,7 +7,7 @@
 .\" warranty.
 .\"
 .\" $Id$
-.TH NANO 1 "version 1.3.12" "May 24, 2006"
+.TH NANO 1 "version 1.3.12" "June 7, 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 
@@ -109,7 +109,7 @@ Set the size (width) of a tab to \fIcols\fP columns.  The value of
 .TP
 .B \-U (\-\-quickblank)
 Do quick statusbar blanking.  Statusbar messages will disappear after 1
-keystroke instead of 25.  Note that \fB-c\fP overrules this.
+keystroke instead of 25.  Note that \fB-c\fP overrides this.
 .TP
 .B \-V (\-\-version)
 Show the current version number and exit.
@@ -123,7 +123,7 @@ Specify a specific syntax highlighting from the \fInanorc\fP to use, if
 available.
 .TP
 .B \-c (\-\-const)
-Constantly show the cursor position.  Note that this overrules \fB-U\fP.
+Constantly show the cursor position.  Note that this overrides \fB-U\fP.
 .TP
 .B \-d (\-\-rebinddelete)
 Interpret the Delete key differently so that both Backspace and Delete
diff --git a/doc/nanorc.sample.in b/doc/nanorc.sample.in
index fa36f3bb0dfc3b8a19ae4515a692dc32eb2a748c..ec00dd361ef8e6183f4c52cdcd33581956ca0630 100644
--- a/doc/nanorc.sample.in
+++ b/doc/nanorc.sample.in
@@ -41,7 +41,7 @@
 # set casesensitive
 
 ## Constantly display the cursor position in the statusbar.  Note that
-## this overrules "quickblank".
+## this overrides "quickblank".
 # set const
 
 ## Use cut to end of line by default.
@@ -111,7 +111,7 @@
 # set punct "!.?"
 
 ## Do quick statusbar blanking.  Statusbar messages will disappear after
-## 1 keystroke instead of 26.  Note that "const" overrules this.
+## 1 keystroke instead of 26.  Note that "const" overrides this.
 ##
 # set quickblank
 
diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi
index 2bd43731fc62c44845cb105fb83e23f1d1f7e84d..67ab889eb6126389123a5f73dcd48eeb9501dbc5 100644
--- a/doc/texinfo/nano.texi
+++ b/doc/texinfo/nano.texi
@@ -9,7 +9,7 @@
 @smallbook
 @set EDITION 0.1
 @set VERSION 1.3.12
-@set UPDATED 24 May 2006
+@set UPDATED 07 Jun 2006
 
 @dircategory Editors
 @direntry
@@ -182,7 +182,7 @@ be greater than 0.  The default value is 8.
 
 @item -U, --quickblank
 Do quick statusbar blanking.  Statusbar messages will disappear after 1
-keystroke instead of 25.  Note that -c overules this.
+keystroke instead of 25.  Note that -c overrides this.
 
 @item -V, --version
 Show the current version number and exit.
@@ -197,7 +197,7 @@ available.  See @xref{Nanorc Files}, for more info.
 
 @item -c, --const
 Constantly display the cursor position and line number on the statusbar.
-Note that this overrules -U.
+Note that this overrides -U.
 
 @item -d, --rebinddelete
 Interpret the Delete key differently so that both Backspace and Delete