Whitespace and grammar fixes. #75

Merged
merged 2 commits into from Apr 2, 2011
View
@@ -1,11 +1,11 @@
Solandra
========
-Solandra is a real-time distributed search engine built on [Apache Solr](http://lucene.apache.org) and [Apache Cassandra](http://cassandra.apache.org).
+Solandra is a real-time distributed search engine built on [Apache Solr](http://lucene.apache.org/solr/) and [Apache Cassandra](http://cassandra.apache.org).
-At its core Solandra is a tight integration of Solr and Cassandra, meaning within a single JVM both Solr and Cassandra are running, and
-documents are stored and disributed using Cassandra's data model.
+At its core, Solandra is a tight integration of Solr and Cassandra, meaning within a single JVM both Solr and Cassandra are running, and
+documents are stored and disributed using Cassandra's data model.
-Solandra makes managing and dynamically growing Solr simple(r).
+Solandra makes managing and dynamically growing Solr simple(r).
For more information please see the [wiki](https://github.com/tjake/Solandra/wiki)
@@ -16,44 +16,44 @@ Java >= 1.6
####Features:######
- Supports most out-of-the-box Solr functionality (search, faceting, highlights)
- - Replication, Sharding, Caching and Compaction managed by Cassandra
+ - Replication, sharding, caching, and compaction managed by Cassandra
- Multi-master (read/write to any node)
- Writes become available as soon as write succeeds
- - Easily add new SolrCores w/o restart across the cluster
+ - Easily add new SolrCores w/o restart across the cluster
####Getting started:####
The following will guide you through setting up a single node instance of Solandra.
From the Solandra base directory:
-
+
mkdir /tmp/cassandra-data
ant
- cd solandra-app; ./start-solandra.sh
-
+ cd solandra-app; ./start-solandra.sh
+
Now that Solandra is running you can run the demo:
-
+
cd ../../reuters-demo
./1-download_data.sh
- ./2-import_data.sh
- While data is loading open the file ./website/index.html in your favorite browser
+ ./2-import_data.sh
+ While data is loading, open the file ./website/index.html in your favorite browser.
####Embedding in an existing cassandra distribution####
-To use an existing cassandra distribution perform the following steps.
+To use an existing Cassandra distribution perform the following steps.
-1. Download your cassandra distribution
+1. Download your Cassandra distribution
2. Unzip it the directory of your choice
3. Run the following solandra ant task to deploy the necessary files into the unzipped dir
-
- ant -Dcassandra={unzipped dir} cassandra-dist
-
-4. You can now start solr within cassandra by using $CASSANDRA_HOME/bin/solandra command. Cassandra now takes 2 optional properties -Dsolandra.context and -Dsolandra.port for the context path and the jetty port.
-
+
+ ant -Dcassandra={unzipped dir} cassandra-dist
+
+4. You can now start Solr within Cassandra by using $CASSANDRA_HOME/bin/solandra command. Cassandra now takes two optional properties: -Dsolandra.context and -Dsolandra.port for the context path and the Jetty port.
+
####Limitations####
-Solandra uses Solr's built in distributed searching meachanism,
-most of it's limitations covered here:
+Solandra uses Solr's built in distributed searching meachanism.
+Most of its limitations are covered here:
-[http://wiki.apache.org/solr/DistributedSearch#Distributed_Searching_Limitations](http://wiki.apache.org/solr/DistributedSearch#Distributed_Searching_Limitations)
+[http://wiki.apache.org/solr/DistributedSearch#Distributed_Searching_Limitations](http://wiki.apache.org/solr/DistributedSearch#Distributed_Searching_Limitations)