diff --git a/ChangeLog b/ChangeLog
index 192dfd36..657ff272 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,8 +81,14 @@ CVS code -
 - doc/nanorc.5:
 	- Give the default values for the brackets and punct options,
 	  and better display the default values for quotestr. (DLR)
+	- Mention that quotes inside string parameters don't need to be
+	  escaped with backslashes. (John M. Gabriele, minor tweaks by
+	  DLR)
 - doc/nanorc.sample:
 	- Remove unneeded comment. (DLR)
+	- Mention that quotes inside string parameters don't need to be
+	  escaped with backslashes. (John M. Gabriele, minor tweaks by
+	  DLR)
 
 GNU nano 1.3.10 - 2005.12.23
 - General:
diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5
index 2de05bd9..925c5886 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.10" "January 06, 2006"
+.TH NANORC 5 "version 1.3.10" "March 12, 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .SH NAME
@@ -37,6 +37,11 @@ line options override rcfile settings.
 
 Options are unset by default, except for options that take an argument.
 
+Quotes inside string parameters don't have to be escaped with
+backslashes.  The last double quote in the string will be treated as its
+end.  For example, for the brackets option, "\fI'")}]>\fP" will match
+\fI'\fP, \fI"\fP, \fI)\fP, \fI}\fP, \fI]\fP, and \fI>\fP.
+
 The supported commands and arguments are:
 
 .TP 3
diff --git a/doc/nanorc.sample b/doc/nanorc.sample
index ecce99c4..9011bd29 100644
--- a/doc/nanorc.sample
+++ b/doc/nanorc.sample
@@ -1,4 +1,5 @@
-## Sample initialization file for GNU nano
+## Sample initialization file for GNU nano.
+##
 ## Please note that you must have configured nano with --enable-nanorc
 ## for this file to be read!  Also note that characters specially
 ## interpreted by the shell should not be escaped here.
@@ -7,6 +8,11 @@
 ##
 ## For the options that take parameters, the default value is given.
 ## Other options are unset by default.
+##
+## Quotes inside string parameters don't have to be escaped with
+## backslashes.  The last double quote in the string will be treated as
+## its end.  For example, for the brackets option, "'")}]>" will match
+## ', ", ), }, ], and >.
 
 ## Use auto-indentation.
 # set autoindent