diff --git a/ChangeLog b/ChangeLog
index 5184e20cd4efb7aac3c6f3366b48d854a4639713..7c3470e086988416e8ae7326b367a1a78a1d1333 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -66,6 +66,9 @@ CVS code -
 	- Don't bother assigning the value of get_mouseinput() to
 	  anything.  Since allow_shortcuts is FALSE, its return value
 	  will always be FALSE. (DLR)
+  nanorc.sample:
+	- Remove specific references to control key shortcuts other than
+	  XON and XOFF. (DLR)
 
 GNU nano 1.3.4 - 2004.08.17
 - General:
diff --git a/doc/nanorc.sample b/doc/nanorc.sample
index c6bed8e3251260f15fe22df2f3d42e931ef50d7d..8ee3f37a10609425cc7230af1eedc39d58f1c76e 100644
--- a/doc/nanorc.sample
+++ b/doc/nanorc.sample
@@ -26,7 +26,7 @@
 ## Constantly display the cursor position in the status bar.
 # set const
 
-## Use cut to end of line with ^K by default.
+## Use cut to end of line by default.
 # set cut
 
 ## Set the line length for wrapping text and justifying paragraphs.
@@ -42,9 +42,9 @@
 ## and run shortcuts.
 # set mouse
 
-## Allow multiple file buffers (using ^R will insert into a separate
-## buffer).  You must have configured with --enable-multibuffer or
-## --enable-extra for this to work.
+## Allow multiple file buffers (inserting a file will put it into a
+## separate buffer).  You must have configured with --enable-multibuffer
+## or --enable-extra for this to work.
 ##
 # set multibuffer
 
@@ -106,7 +106,7 @@
 ##
 # set speller "aspell -c"
 
-## Allow nano to be suspended with ^Z.
+## Allow nano to be suspended.
 # set suspend
 
 ## Use this tab size instead of the default; it must be greater than 0.