diff --git a/ChangeLog b/ChangeLog
index b73eef7840d77c86a6d329db81286b1d952ff068..5e6dc7aa1469dcc5abefa8bf25bdb27afda413fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -496,6 +496,13 @@ CVS code -
 	- Simplify the extensions associated with the "nanorc" regexes.
 	  (DLR)
 	- Add regexes for Ruby. (John M. Gabriele, minor tweaks by DLR)
+- doc/nanorc.sample.in:
+	- Add comments describing the relationships between syntax file
+	  names and the names used as their short descriptions. (John M.
+	  Gabriele)
+- doc/man.nanorc:
+	- Change the name of the "manpage" regexes to "man", for
+	  consistency. (John M. Gabriele)
 - doc/nanorc.nanorc:
 	- Tweak the "nanorc" regexes to color comments starting with a
 	  double ## cyan instead of bright blue. (John M. Gabriele)
diff --git a/doc/nanorc.sample.in b/doc/nanorc.sample.in
index 00130bdb2bc1eb38a205cee8b2c769eba0b58e88..a8c2db87c498a3dd3b29af8907bef5bd3c68f1f2 100644
--- a/doc/nanorc.sample.in
+++ b/doc/nanorc.sample.in
@@ -206,6 +206,11 @@
 ##
 ## include "syntax file"
 ##
+## The name of the syntax file (without the ".nanorc" extension) should
+## be the same as the "short description" name inside that file.  These
+## names are kept fairly short to make them easier to remember and
+## faster to type using nano's -Y option.
+##
 ## All regexes should be extended regular expressions.
 
 
diff --git a/doc/syntax/man.nanorc b/doc/syntax/man.nanorc
index cc56430d27e74f3f1316e77cb31204e1e84c3272..85efd2629f8a7671d32a7382ec0565ee22891e51 100644
--- a/doc/syntax/man.nanorc
+++ b/doc/syntax/man.nanorc
@@ -1,6 +1,6 @@
 ## Here is an example for manpages.
 ##
-syntax "manpage" "\.[1-9]x?$"
+syntax "man" "\.[1-9]x?$"
 color green "\.(S|T)H.*$"
 color brightgreen "\.(S|T)H" "\.TP"
 color brightred "\.(BR?|I[PR]?).*$"