Combined elastic search instructions

docs/search-elastic.md

@@ -1,60 +0,0 @@
-## Docs for Elastic Search
-
-### Requirements:
-
-```    
-sudo apt-get install mongodb
-sudo apt-get install memcached libmemcached-dev
-sudo apt-get install python2.7-dev
-pip install -r requirements.txt 
-```
-
-### Elastic Search
-
-Elastic Search library is not in github and resides at unix/lib/elastic
-
-the current version we're using is *0.90.2*. Download from:
-
-> wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.90.2.zip
-
-before installing pylimbmc make sure libmemcache is installed:
-
-> brew install libmemcached
-> pip install pylibmc 
-
-You'll also need to install elastic search:
-
-on mac:
-> brew install elasticsearch(requires java sdk)
-
-
-Ensure that mongodb and elastic search are running 
-starting elastic search:
-
-```
-$elasticsearch (on mac)
-bin/elasticsearch -d (on linux)
-```
-
-To test if elastic search is running:
-
-> curl -X GET http://localhost:9200/
-
-returns:
-
-```
-{
-  "ok" : true,
-  "status" : 200,
-  "name" : "Angler",
-  "version" : {
-    "number" : "0.90.2",
-    "snapshot_build" : false,
-    "lucene_version" : "4.3.1"
-  },
-```
-
-Create Index: 
-  
-> python create_search_index.py --create_index
-

docs/search.md

@@ -1,4 +1,4 @@
-#Search
+# Search
 
 The search subsystem for Blockstack Core creates an index for data associated
 with registered names in namespaces and makes that data searchable.
@@ -118,3 +118,55 @@ Sample Response:
   ]
 }
 ```
+
+## Enabling Elastic Search
+
+### Requirements:
+
+```    
+sudo apt-get install mongodb
+sudo apt-get install memcached libmemcached-dev
+sudo apt-get install python2.7-dev
+pip install -r requirements.txt 
+```
+
+### Elastic Search
+
+Elastic Search library is not in github and resides at unix/lib/elastic
+
+the current version we're using is *0.90.2*. Download from:
+
+> wget https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-0.90.2.zip
+
+before installing pylimbmc make sure [memcached](memcached.md) is installed.
+
+Ensure that mongodb and elastic search are running 
+starting elastic search:
+
+```
+$elasticsearch (on mac)
+bin/elasticsearch -d (on linux)
+```
+
+To test if elastic search is running:
+
+> curl -X GET http://localhost:9200/
+
+returns:
+
+```
+{
+  "ok" : true,
+  "status" : 200,
+  "name" : "Angler",
+  "version" : {
+    "number" : "0.90.2",
+    "snapshot_build" : false,
+    "lucene_version" : "4.3.1"
+  },
+```
+
+Create Index: 
+  
+> python create_search_index.py --create_index
+