From 28864168b98b752273715d1b5f2459d110e0d576 Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 26 Jul 2011 20:36:07 +0000
Subject: [PATCH] Merge r8838, r8843 from maint-rel-vivo-1.3

---
 .../mannlib/vitro/webapp/search/indexing/IndexBuilder.java      | 2 +-
 webapp/web/templates/freemarker/edit/forms/menuManagement.ftl   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilder.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilder.java
index 0511e6d5d..e22928839 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilder.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/indexing/IndexBuilder.java
@@ -204,7 +204,7 @@ public class IndexBuilder extends Thread {
     	
     	log.debug("Checking if the index is empty");
     	if(indexBuilder.indexer.isIndexEmpty()){
-    		log.info("Index is empty. Running a full index rebuild!");
+    		log.info("Search index is empty. Running a full index rebuild.");
     		indexBuilder.doIndexRebuild();
     	}
     }	
diff --git a/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl b/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
index 5c37b9a1e..02ebaba8c 100644
--- a/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
@@ -27,7 +27,7 @@
 
         <label for="pretty-url">Pretty URL<span class="requiredHint"> *</span></label> 
         <input type="text" name="prettyUrl" value="${prettyUrl}" role="input" />
-        <p class="note">(Format: /<prettyURL> - ie. /people)</p>
+        <p class="note">(Format: /<prettyURL> - e.g., /people)</p>
     
         <p>Template<span class="requiredHint"> *</span></p>