Merge branch 'master' of ssh://git.hyperdex.org/HyperDex

Conflicts: doc/index.rst
ashikratnani · Mar 14, 2012 · 5a98f6c · 5a98f6c
2 parents 4ec8828 + dafb10f
commit 5a98f6c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/doc/concepts.rst b/doc/concepts.rst
@@ -1,8 +1,20 @@
 Concepts
 ========
 
-HyperDex is a distributed, searchable key-value store. Unlike other key-value
-stores such as BigTable and Cassandra, HyperDex provides a unique search
+HyperDex is a distributed, searchable key-value store. The key features of HyperDex are:
+
+ * **Fast**: HyperDex has lower latency, higher throughput, and lower variance than other key-value stores.
+
+ * **Scalable**: HyperDex scales as more machines are added to the system.
+
+ * **Consistent**: HyperDex guarantees linearizability for key-based operations. Thus, it a GET always returns the latest value inserted into the system. Not just "eventually," but immediately and always.
+
+ * **Fault tolerant**: HyperDex automatically replicates data on multiple machines so that concurrent failures, up to an application-determined limit, will not cause data loss.
+
+ * **Searchable**: HyperDex enables lookups of non-primary data attributes. Such searches are implemented efficiently and contact a small number of servers.
+
+
+Unlike other NoSQL key-value stores, HyperDex provides a unique search
 primitive which enables searches over stored values. By design, HyperDex
 retains the performance of traditional key-value stores while enabling support
 for the search operation.  This is possible through the use of Hyperspace

diff --git a/doc/index.rst b/doc/index.rst
@@ -7,6 +7,7 @@ Welcome to HyperDex's documentation!
    :maxdepth: 2
 
    concepts
+   installation
    tutorial
    tutorial-advanced
    api/python

diff --git a/doc/installation.rst b/doc/installation.rst
@@ -54,5 +54,3 @@ coordinator and daemon processes as follows.
 Once you get to this stage, HyperDex is ready to go. We can set up a
 data store and examine how to place values in it, which is the topic
 of the next chapter.
-
-
diff --git a/doc/tutorial.rst b/doc/tutorial.rst
@@ -1,5 +1,7 @@
-Basic Tutorial
-==============
+
+
+Basic Operations
+================
 
 A HyperDex cluster consists of three types of components: clients, servers, and
 a coordinator.
@@ -26,13 +28,6 @@ In this tutorial, we'll discuss how to get a HyperDex cluster up and running. In
 particular, we'll create a simple space, insert objects into it, retrieve those
 objects, and then perform queries over these objects.
 
-Installing HyperDex
--------------------
-
-For this tutorial, we will need a working copy of HyperDex. The easiest way to
-install the system is through the precompiled packages.  This tutorial makes use
-of features available in HyperDex 0.2b8 and later.
-
 Starting the Coordinator
 ------------------------