diff --git a/ChangeLog b/ChangeLog
index 2a419eb6794bb13672c6a27e5aeaaed67ae2566c..dd62b64ac619ab8e206bd3f47bd48207dd0ff711 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,9 +17,10 @@ CVS code -
 	- Replace instances of \" with ", since quotes inside string
 	  parameters don't need to be escaped with backslashes. (DLR)
 	- Mention in the comments that more than one start/end regex can
-	  be included per line, and change the comment for the
+	  be included per line.  Also, change the comment for the
 	  "whitespace" option so that the hexadecimal character values
-	  are six digits long. (DLR)
+	  are six digits long, and state which character values work
+	  with which encodings. (DLR)
 	- Add sample regexes for Python. (singular on the Gentoo forums,
 	  http://forums.gentoo.org/viewtopic.php?t=86562; minor tweaks
 	  by DLR, suggested by John M. Gabriele)
diff --git a/doc/nanorc.sample b/doc/nanorc.sample
index 7c40f8cf9a2c5587c015f9bc5c78c92fc238c509..62578d5bb493b5b8abc7970540fa6ea84a249f20 100644
--- a/doc/nanorc.sample
+++ b/doc/nanorc.sample
@@ -153,8 +153,8 @@
 # set view
 
 ## The two single-column characters used to display the first characters
-## of tabs and spaces.  187 decimal (0000BB hexadecimal) and 183 decimal
-## (0000B7 hexadecimal) seem to be good values for these.
+## of tabs and spaces.  187 in ISO 8859-1 (0000BB in Unicode) and 183 in
+## ISO-8859-1 (0000B7 in Unicode) seem to be good values for these.
 # set whitespace "  "
 
 ## Detect word boundaries more accurately by treating punctuation