--- htdoc/cf_byname.html.orig	Thu Jan 31 17:47:17 2002
+++ htdoc/cf_byname.html	Thu Feb  7 14:47:49 2002
@@ -171,7 +171,7 @@
 	  <img src="dot.gif" alt="*" width=9 height=9> <a target="body" href="attrs.html#search_rewrite_rules">search_rewrite_rules</a><br>
 	  <img src="dot.gif" alt="*" width=9 height=9> <a target="body" href="attrs.html#server_aliases">server_aliases</a><br>
 	  <img src="dot.gif" alt="*" width=9 height=9> <a target="body" href="attrs.html#server_max_docs">server_max_docs</a><br>
-	  <img src="dot.gif" alt="*" width=9 height=9> <a target="body" href="attrs.html#server_wait_time">serrver_wait_time</a><br>
+	  <img src="dot.gif" alt="*" width=9 height=9> <a target="body" href="attrs.html#server_wait_time">server_wait_time</a><br>
 	  <img src="dot.gif" alt="*" width=9 height=9> <a target="body" href="attrs.html#sort">sort</a><br>
 	  <img src="dot.gif" alt="*" width=9 height=9> <a target="body" href="attrs.html#sort_names">sort_names</a><br>
 	  <img src="dot.gif" alt="*" width=9 height=9> <a target="body" href="attrs.html#soundex_db">soundex_db</a><br>
--- htdoc/cf_byprog.html.orig	Thu Jan 31 17:47:17 2002
+++ htdoc/cf_byprog.html	Fri Feb  8 08:24:49 2002
@@ -181,6 +181,7 @@
 	  <img src="dot.gif" alt="*" width=9 height=9> <a target="body" href="attrs.html#iso_8601">iso_8601</a><br>
 	  <img src="dot.gif" alt="*" width=9 height=9> <a target="body" href="attrs.html#logging">logging</a><br>
 	  <img src="dot.gif" alt="*" width=9 height=9> <a target="body" href="attrs.html#match_method">match_method</a><br>
+	  <img src="dot.gif" alt="*" width=9 height=9> <a target="body" href="attrs.html#matches_per_page">matches_per_page</a><br>
 	  <img src="dot.gif" alt="*" width=9 height=9> <a target="body" href="attrs.html#max_excerpts">max_excerpts</a><br>
 	  <img src="dot.gif" alt="*" width=9 height=9> <a target="body" href="attrs.html#max_prefix_matches">max_prefix_matches</a><br>
 	  <img src="dot.gif" alt="*" width=9 height=9> <a target="body" href="attrs.html#max_stars">max_stars</a><br>
--- htdoc/cf_types.html.orig	Thu Jan 31 17:47:17 2002
+++ htdoc/cf_types.html	Thu Feb  7 14:48:14 2002
@@ -32,10 +32,20 @@
 		<b>String List</b>
 	  </dt>
 	  <dd>
-		A sequence of string separated by whitespace. Individual
-		strings within the list may be quoted using double quotes.
-		The quotes are needed when the individual strings contain
-		whitespace.
+		A sequence of strings separated by whitespace. Individual
+		strings within the list cannot be quoted and therefore
+		cannot contain whitespace.
+	  </dd>
+	  <dt>
+		<b>Quoted String List</b>
+	  </dt>
+	  <dd>
+		A sequence of strings separated by whitespace. Individual
+		strings within the list may be quoted using single or double
+		quotes. The quotes are needed when the individual strings
+		contain whitespace. If you want a quote mark or a backslash
+		to be inserted as-is into a string, you must preceed it with
+		a backslash.
 	  </dd>
 	  <dt>
 		<b>Number</b>
--- htdoc/htmerge.html.orig	Thu Jan 31 17:47:17 2002
+++ htdoc/htmerge.html	Thu Feb  7 14:48:47 2002
@@ -76,8 +76,8 @@
 		  <dd>
 			Merge the databases specified by merge_configfile
 			into the databases specified by -c or the default.
-			To use multiple databases, you will need a config
-			file for each database. Then each file will set the
+			You will need a separate config file for each of
+			the two databases. Then each file will set the
 			<a href="attrs.html#database_dir">database_dir</a> or
 			<a href="attrs.html#database_base">database_base</a>
 			attribute to change the name of the databases, so
@@ -88,6 +88,11 @@
 			together with this option. This is because merging
 			the two wordlists together requires wordlists that
 			have already been cleaned up by htmerge.
+			Because the -m option allows you to specify only
+			one database to be merged into the other, and only
+			one -m option may be specified, if you need to merge
+			three or more databases together you must run htmerge
+			multiple times with the -m option.
 		  </dd>
 		  <dt>
 			-s