From b726e1efe331a6416193d153484d861fbed7c01a Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 13 Dec 2011 20:24:33 +0000
Subject: [PATCH] Merge 9389 from 1.4 maint branch

---
 doc/install.html                        | 14 +++++++-------
 webapp/config/example.deploy.properties | 16 ++++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/doc/install.html b/doc/install.html
index 4340f690d..e4d8fb0cb 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -369,21 +369,21 @@
                     <tr>
                         <td colspan="2">
                             Restricts access to the Solr search platform. 
-                            One or more regular expressions, separated by commas. When a request is 
-                            made to Solr, the IP address of the requestor must match one of the  
-                            patterns, or the request will be rejected. 
+                            The value is a regular expression. When a request is
+                            made to Solr, the IP address of the requestor must the expression, 
+                            or the request will be rejected.
                             <br>
                             Examples:<code>
                                 <ul>
                                     <li>
-                                        vitro.local.solr.ipaddress.mask = 127\.0\.0\.1 
+                                        vitro.local.solr.ipaddress.mask = 127\.0\.0\.1
                                     </li>
                                     <li>
-                                        vitro.local.solr.ipaddress.mask = 
-                                        127\.0\.0\.1,0:0:0:0:0:0:0:1 
+                                        vitro.local.solr.ipaddress.mask =
+                                        127\.0\.0\.1|0:0:0:0:0:0:0:1
                                     </li>
                                     <li>
-                                        vitro.local.solr.ipaddress.mask = 169.254.* 
+                                        vitro.local.solr.ipaddress.mask = 169.254.*
                                     </li>
                                 </ul>
                             </code>
diff --git a/webapp/config/example.deploy.properties b/webapp/config/example.deploy.properties
index bfe4bbdb4..0160f8b92 100644
--- a/webapp/config/example.deploy.properties
+++ b/webapp/config/example.deploy.properties
@@ -46,17 +46,17 @@ webapp.name = vitro
 vitro.local.solr.url = http://localhost:8080/vitrosolr
 
 #
-# Restricts access to the Solr search platform. One or more regular expressions,
-# separated by commas. When a request is made to Solr, the IP address of the 
-# requestor must match one of the patterns, or the request will be rejected.
+# Restricts access to the Solr search platform. The value is a regular expression.
+# When a request is made to Solr, the IP address of the requestor must match the 
+# regular expression, or the request will be rejected.
+#
+# NOTE: don't leave a space on the end of the line, unless you want it to be
+# part of the expression. 
 #   Examples:
 #      vitro.local.solr.ipaddress.mask = 127\.0\.0\.1
-#      vitro.local.solr.ipaddress.mask = 127\.0\.0\.1,0:0:0:0:0:0:0:1
+#      vitro.local.solr.ipaddress.mask = 127\.0\.0\.1|0:0:0:0:0:0:0:1
 #      vitro.local.solr.ipaddress.mask = 169.254.*
-# If this expression doesn't match the IP address, you will see SolrExceptions 
-# in the log.
-vitro.local.solr.ipaddress.mask = 127\.0\.0\.1,[0:]+:1[^:]*,
-
+vitro.local.solr.ipaddress.mask = 127\.0\.0\.1|[0:]+:1
 
 #
 # The location where the Vitro application will store the data that it creates.