diff --git a/ChangeLog b/ChangeLog
index c7f9f944..2679efcf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -147,13 +147,13 @@ CVS code -
 	  --rebindkeypad, clarify its description on the command line,
 	  and add an updated FAQ entry about its use.  Changes to
 	  window_init(), usage(), main(), get_verbatim_kbinput(),
-	  nanorc.sample, and faq.html. (DLR)
+	  nanorc.sample, nano.1, nanorc.5, and faq.html. (DLR)
 	- Add new -W/--wordbounds command line option, and new
 	  "wordbounds" rcfile option, to control whether
 	  the word movement functions treat punctuation characters as
 	  part of a word.  Changes to do_next_word_void(),
-	  do_prev_word_void(), usage(), main(), and nanorc.sample. (DLR,
-	  suggested by Mike Frysinger)
+	  do_prev_word_void(), usage(), main(), nano.1, nanorc.5, and
+	  nanorc.sample. (DLR, suggested by Mike Frysinger)
 - color.c:
 	- Remove unneeded fcntl.h include. (DLR)
 - chars.c:
diff --git a/doc/man/nano.1 b/doc/man/nano.1
index eec50598..31b8d9eb 100644
--- a/doc/man/nano.1
+++ b/doc/man/nano.1
@@ -6,7 +6,7 @@
 .\" Public License for copying conditions.  There is NO warranty.
 .\"
 .\" $Id$
-.TH NANO 1 "version 1.3.8" "June 27, 2005"
+.TH NANO 1 "version 1.3.8" "August 10, 2005"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 
@@ -68,6 +68,11 @@ stored for later editing, if nanorc support is configured.
 Don't look at \fISYSCONFDIR/nanorc\fP or \fI~/.nanorc\fP, if nanorc
 support is available.
 .TP
+.B \-K (\-\-rebindkeypad)
+Interpret the numeric keypad keys so that they all work properly.  You
+should only need to use this option if they don't, as mouse support
+won't work properly with this option enabled.
+.TP
 .B \-N (\-\-noconvert)
 Disable automatic conversion of files from DOS/Mac format.
 .TP
@@ -101,6 +106,10 @@ keystroke instead of 25.  Note that \fB-c\fP cancels this out.
 .B \-V (\-\-version)
 Show the current version number and author.
 .TP
+.B \-W (\-\-wordbounds)
+Detect word boundaries more accurately by treating punctuation
+characters as part of a word.
+.TP
 .B \-Y \fIstr\fP (\-\-syntax=\fIstr\fP)
 Specify a specific syntax highlighting from the \fInanorc\fP to use, if
 available.
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index 6594e84c..c5c26246 100644
--- a/doc/man/nanorc.5
+++ b/doc/man/nanorc.5
@@ -6,7 +6,7 @@
 .\" Public License for copying conditions.  There is NO warranty.
 .\"
 .\" $Id$
-.TH NANORC 5 "version 1.3.8" "August 01, 2005"
+.TH NANORC 5 "version 1.3.8" "August 10, 2005"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
@@ -112,7 +112,7 @@ Set the characters treated as closing punctuation.  They cannot contain
 blank characters.  Only closing punctuation, optionally followed by
 closing brackets, can end sentences.
 .TP
-.B set quickblank
+.B set/unset quickblank
 Do quick statusbar blanking.  Statusbar messages will disappear after 1
 keystroke instead of 25.
 .TP
@@ -131,6 +131,11 @@ Interpret the Delete key differently so that both Backspace and Delete
 work properly.  You should only need to use this option if Backspace
 acts like Delete on your system.
 .TP
+.B set/unset rebindkeypad
+Interpret the numeric keypad keys so that they all work properly.  You
+should only need to use this option if they don't, as mouse support
+won't work properly with this option enabled.
+.TP
 .B set/unset regexp
 Do regular expression searches by default.
 .TP
@@ -168,6 +173,10 @@ Disallow file modification.
 Set the two characters used to display the first characters of tabs and
 spaces.  They must be single-column characters.
 .TP
+.B set/unset wordbounds
+Detect word boundaries more accurately by treating punctuation
+characters as part of a word.
+.TP
 .B syntax "\fIstr\fP" ["\fIfileregex\fP" ... ]
 Defines a syntax named \fIstr\fP which can be activated via the \fB-Y\fP
 flag, or will be automatically activated if the current filename matches
diff --git a/src/text.c b/src/text.c
index 62c7e393..2b121995 100644
--- a/src/text.c
+++ b/src/text.c
@@ -2059,6 +2059,8 @@ void do_spell(void)
 #endif /* !DISABLE_SPELLER */
 
 #ifndef NANO_SMALL
+/* Our own version of "wc".  Note that its character counts are in
+ * multibyte characters instead of single-byte characters. */
 void do_wordlinechar_count(void)
 {
     size_t words = 0, chars = 0;