diff --git a/README.textile b/README.textile
index 82f385a28eb..0e83eaae762 100644
--- a/README.textile
+++ b/README.textile
@@ -28,7 +28,7 @@ Elasticsearch is a distributed RESTful search engine built for the cloud. Featur
** All the power of Lucene easily exposed through simple configuration / plugins.
* Per operation consistency
** Single document level operations are atomic, consistent, isolated and durable.
-* Open Source under Apache 2 License.
+* Open Source under the Apache License, version 2 ("ALv2")
h2. Getting Started
@@ -49,17 +49,17 @@ Let's try and index some twitter like information. First, let's create a twitter
curl -XPUT 'http://localhost:9200/twitter/user/kimchy' -d '{ "name" : "Shay Banon" }'
curl -XPUT 'http://localhost:9200/twitter/tweet/1' -d '
-{
- "user": "kimchy",
- "postDate": "2009-11-15T13:12:00",
- "message": "Trying out Elasticsearch, so far so good?"
+{
+ "user": "kimchy",
+ "postDate": "2009-11-15T13:12:00",
+ "message": "Trying out Elasticsearch, so far so good?"
}'
curl -XPUT 'http://localhost:9200/twitter/tweet/2' -d '
-{
- "user": "kimchy",
- "postDate": "2009-11-15T14:12:12",
- "message": "Another tweet, will it be indexed?"
+{
+ "user": "kimchy",
+ "postDate": "2009-11-15T14:12:12",
+ "message": "Another tweet, will it be indexed?"
}'
@@ -73,7 +73,7 @@ curl -XGET 'http://localhost:9200/twitter/tweet/2?pretty=true'
h3. Searching
-Mmm search..., shouldn't it be elastic?
+Mmm search..., shouldn't it be elastic?
Let's find all the tweets that @kimchy@ posted:
@@ -84,10 +84,10 @@ We can also use the JSON query language Elasticsearch provides instead of a quer
curl -XGET 'http://localhost:9200/twitter/tweet/_search?pretty=true' -d '
-{
- "query" : {
+{
+ "query" : {
"match" : { "user": "kimchy" }
- }
+ }
}'
@@ -95,10 +95,10 @@ Just for kicks, let's get all the documents stored (we should see the user as we
curl -XGET 'http://localhost:9200/twitter/_search?pretty=true' -d '
-{
- "query" : {
- "matchAll" : {}
- }
+{
+ "query" : {
+ "matchAll" : {}
+ }
}'
@@ -106,12 +106,12 @@ We can also do range search (the @postDate@ was automatically identified as date
curl -XGET 'http://localhost:9200/twitter/_search?pretty=true' -d '
-{
- "query" : {
- "range" : {
- "postDate" : { "from" : "2009-11-15T13:00:00", "to" : "2009-11-15T14:00:00" }
- }
- }
+{
+ "query" : {
+ "range" : {
+ "postDate" : { "from" : "2009-11-15T13:00:00", "to" : "2009-11-15T14:00:00" }
+ }
+ }
}'
@@ -129,17 +129,17 @@ Another way to define our simple twitter system is to have a different index per
curl -XPUT 'http://localhost:9200/kimchy/info/1' -d '{ "name" : "Shay Banon" }'
curl -XPUT 'http://localhost:9200/kimchy/tweet/1' -d '
-{
- "user": "kimchy",
- "postDate": "2009-11-15T13:12:00",
- "message": "Trying out Elasticsearch, so far so good?"
+{
+ "user": "kimchy",
+ "postDate": "2009-11-15T13:12:00",
+ "message": "Trying out Elasticsearch, so far so good?"
}'
curl -XPUT 'http://localhost:9200/kimchy/tweet/2' -d '
-{
- "user": "kimchy",
- "postDate": "2009-11-15T14:12:12",
- "message": "Another tweet, will it be indexed?"
+{
+ "user": "kimchy",
+ "postDate": "2009-11-15T14:12:12",
+ "message": "Another tweet, will it be indexed?"
}'
@@ -149,11 +149,11 @@ Complete control on the index level is allowed. As an example, in the above case
curl -XPUT http://localhost:9200/another_user/ -d '
-{
- "index" : {
- "numberOfShards" : 1,
- "numberOfReplicas" : 1
- }
+{
+ "index" : {
+ "numberOfShards" : 1,
+ "numberOfReplicas" : 1
+ }
}'
@@ -162,10 +162,10 @@ index (twitter user), for example:
curl -XGET 'http://localhost:9200/kimchy,another_user/_search?pretty=true' -d '
-{
- "query" : {
- "matchAll" : {}
- }
+{
+ "query" : {
+ "matchAll" : {}
+ }
}'
@@ -173,10 +173,10 @@ Or on all the indices:
curl -XGET 'http://localhost:9200/_search?pretty=true' -d '
-{
- "query" : {
- "matchAll" : {}
- }
+{
+ "query" : {
+ "matchAll" : {}
+ }
}'
@@ -213,7 +213,7 @@ In order to ensure a smooth upgrade process from earlier versions of Elasticsear
h1. License
-This software is licensed under the Apache 2 license, quoted below.
+This software is licensed under the Apache License, version 2 ("ALv2"), quoted below.
Copyright 2009-2014 Elasticsearch
diff --git a/rest-api-spec/README.markdown b/rest-api-spec/README.markdown
index 012b3e999cf..6a47862bee1 100644
--- a/rest-api-spec/README.markdown
+++ b/rest-api-spec/README.markdown
@@ -62,4 +62,4 @@ The full command to generate the api spec is:
## License
-This software is licensed under the Apache 2 license.
+This software is licensed under the Apache License, version 2 ("ALv2").
diff --git a/src/deb/control/control b/src/deb/control/control
index b6207b280bd..584873b97c0 100644
--- a/src/deb/control/control
+++ b/src/deb/control/control
@@ -7,7 +7,7 @@ Section: web
Priority: optional
Homepage: http://www.elasticsearch.org/
Description: Open Source, Distributed, RESTful Search Engine
- Elasticsearch is a distributed RESTful search engine built for the cloud.
+ Elasticsearch is a distributed RESTful search engine built for the cloud.
.
Features include:
.
@@ -30,9 +30,9 @@ Description: Open Source, Distributed, RESTful Search Engine
+ (Near) Real Time Search.
+ Built on top of Lucene
- Each shard is a fully functional Lucene index
- - All the power of Lucene easily exposed through simple
+ - All the power of Lucene easily exposed through simple
configuration/plugins.
+ Per operation consistency
- Single document level operations are atomic, consistent, isolated and
durable.
- + Open Source under Apache 2 License.
+ + Open Source under the Apache License, version 2 ("ALv2").