From fed06a5cc382fb009ffdede6feeb42048a237904 Mon Sep 17 00:00:00 2001
From: "Chris M. Hostetter" <hossman@apache.org>
Date: Tue, 21 Dec 2010 20:01:40 +0000
Subject: [PATCH] SOLR-2232: Improved README info on solr.solr.home in examples

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1051629 13f79535-47bb-0310-9956-ffa450edef68
---
 solr/CHANGES.txt                  |  3 +++
 solr/example/README.txt           | 20 ++++++++++++++------
 solr/example/multicore/README.txt |  6 +++++-
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7e6a369810d..b31f2db8788 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -703,6 +703,9 @@ Documentation
 * SOLR-1792: Documented peculiar behavior of TestHarness.LocalRequestFactory
   (hossman)
 
+* SOLR-2232: Improved README info on solr.solr.home in examples
+  (Eric Pugh and hossman)
+
 ================== Release 1.4.0 ==================
 Release Date:  See http://lucene.apache.org/solr for the official release date.
 
diff --git a/solr/example/README.txt b/solr/example/README.txt
index 6126fd63271..8c44a7c29b5 100644
--- a/solr/example/README.txt
+++ b/solr/example/README.txt
@@ -16,19 +16,20 @@
 Solr example configuration
 --------------------------
 
-To run this example configuration, use 
+To run the default example configuration, use 
 
   java -jar start.jar
 
-in this directory, and when Solr is started connect to 
+in this example directory, and when Solr is started connect to 
 
   http://localhost:8983/solr/admin/
 
-To add documents to the index, use the post.sh script in the exampledocs
-subdirectory (while Solr is running), for example:
+To add documents to the index, use the post.jar (or post.sh script) in
+the exampledocs subdirectory (while Solr is running), for example:
 
-  cd exampledocs
-  ./post.sh *.xml
+     cd exampledocs
+     java -jar post.jar *.xml
+Or:  ./post.sh *.xml
 
 See also README.txt in the solr subdirectory, and check
 http://wiki.apache.org/solr/SolrResources for a list of tutorials and
@@ -40,3 +41,10 @@ this example server and wish to use the ExtractingRequestHandler (SolrCell),
 you will need to copy the required jars into solr/lib or update the paths to
 the jars in your solrconfig.xml.
 
+By default, start.jar starts Solr in Jetty using the default SolrHome 
+directory of "./solr/" -- To run other example configurations, you can
+speciy the solr.solr.home system property when starting jetty...
+
+  java -Dsolr.solr.home=multicore -jar start.jar
+  java -Dsolr.solr.home=example-DIH -jar start.jar
+
diff --git a/solr/example/multicore/README.txt b/solr/example/multicore/README.txt
index e7010b5ad91..eba14575efb 100644
--- a/solr/example/multicore/README.txt
+++ b/solr/example/multicore/README.txt
@@ -1,3 +1,7 @@
 This is an alternative setup structure to support multiple cores.
 
-For general examples on standard solr configuration, see the "solr" directory.
\ No newline at end of file
+To run this configuration, start jetty in the example/ directory using:
+
+java -Dsolr.solr.home=multicore -jar start.jar
+
+For general examples on standard solr configuration, see the "solr" directory.