Remove sections from docs

who's using, other resources and license sections from intro

Author: russcam

docs/asciidoc/client-concepts/low-level/lifetimes.asciidoc

@@ -7,18 +7,18 @@
 [[lifetimes]]
 == Lifetimes
 
-If you are using an IOC container its always useful to know the best practices around the lifetime of your objects 
+If you are using an IOC container its always useful to know the best practices around the lifetime of your objects
 
 In general we advise folks to register their ElasticClient instances as singletons. The client is thread safe
-so sharing an instance between threads is fine. 
+so sharing an instance between threads is fine.
 
 Zooming in however the actual moving part that benefits the most from being static for most of the duration of your
-application is `ConnectionSettings`; caches are __per__ `ConnectionSettings`. 
+application is `ConnectionSettings`; caches are __per__ `ConnectionSettings`.
 
 In some applications it could make perfect sense to have multiple singleton `ElasticClient`'s registered with different
 connection settings. e.g if you have 2 functionally isolated Elasticsearch clusters.
 
-NOTE: Due to the semantic versioning of Elasticsearch.Net and NEST and their alignment to versions of Elasticsearch, all instances of `ElasticClient` and
+IMPORTANT: Due to the semantic versioning of Elasticsearch.Net and NEST and their alignment to versions of Elasticsearch, all instances of `ElasticClient` and
 Elasticsearch clusters that are connected to must be on the **same major version** i.e. it is not possible to have both an `ElasticClient` to connect to
 Elasticsearch 1.x _and_ 2.x in the same application as the former would require NEST 1.x and the latter, NEST 2.x.
 
@@ -74,7 +74,7 @@ connectionPool.IsDisposed.Should().BeFalse();
 connection.IsDisposed.Should().BeFalse();
 ----
 
-Disposing `ConnectionSettings` will dispose the `IConnectionPool` and `IConnection` it has a hold of
+Disposing `ConnectionSettings` will also dispose the `IConnectionPool` and `IConnection` it uses
 
 [source,csharp]
 ----

docs/asciidoc/intro.asciidoc

@@ -5,33 +5,19 @@
 [[introduction]]
 == Introduction
 
-You've reached the documentation page for `Elasticsearch.Net` and `NEST`. The two official .NET clients for Elasticsearch. So why two clients I hear you say?
+You've reached the documentation page for `Elasticsearch.Net` and `NEST`, The two official .NET clients for Elasticsearch. 
 
-`Elasticsearch.Net` is a very low level, dependency free, client that has no opinions about how you build and represent your requests and responses. It has abstracted 
-enough so that **all** the Elasticsearch API endpoints are represented as methods but not too much to get in the way of how you want to build your json/request/response objects. It also comes with builtin, configurable/overridable, cluster failover retry mechanisms. Elasticsearch is elastic so why not your client?
-
-`NEST` is a high level client that has the advantage of having mapped all the request and response objects, comes with a strongly typed query DSL that maps 1 to 1 with the Elasticsearch query DSL, and takes advantage of specific .NET features such as covariant results. NEST internally uses, and still exposes, the low level `Elasticsearch.Net` client.
-
-Please read the getting started guide for both.
-
-=== Who's using Nest
-
-* {stackoverflow}[stackoverflow.com] (and the rest of the stackexchange family).
-
-* http://www.7digital.com[7digital.com] (run NEST on mono).
-
-* https://www.rijksmuseum.nl/en[rijksmuseum.nl] (Elasticsearch is the only datastorage hit for each page).
-
-* http://www.fogcreek.com/kiln/[Kiln] FogCreek's version control & code review tooling. 
-  They are so pleased with Elasticsearch that http://blog.fogcreek.com/kiln-powered-by-elasticsearch/[they made a video about how pleased they are!]
+=== Why two clients?
 
-=== Other resources
+`Elasticsearch.Net` is a very low level, dependency free, client that has no opinions about how you build and represent your requests and responses. It has abstracted 
+enough so that **all** the Elasticsearch API endpoints are represented as methods but not too much to get in the way of how you want to build 
+your json/request/response objects. It also comes with built in, configurable/overridable, cluster failover retry mechanisms. Elasticsearch is _elastic_ so why not your client?
 
-http://twitter.com/joelabrahamsson[@joelabrahamsson] wrote a great http://joelabrahamsson.com/entry/extending-aspnet-mvc-music-store-with-elasticsearch[intro into elasticsearch on .NET]
-using NEST. 
+`NEST` is a high level client that has the advantage of having mapped all the request and response objects, 
+comes with a strongly typed query DSL that maps 1 to 1 with the Elasticsearch query DSL, and takes advantage of specific .NET features such as 
+<<covariant-search-results, covariant results>> and <<auto-map, auto mapping of POCOs>>. NEST internally uses and still exposes the low level `Elasticsearch.Net` client.
 
-Also checkout the https://searchbox.io/[searchbox.io guys] rocking NEST http://blog.appharbor.com/2012/06/19/searchbox-elasticsearch-is-now-an-add-on[on AppHarbor]
-with their https://github.com/searchbox-io/.net-sample[demo project]
+Please read the getting started guide for both <<elasticsearch-net,Elasticsearch.Net>> and <<nest,NEST>>.
 
 === Questions, bugs, comments, requests
 
@@ -40,23 +26,3 @@ All of these are more then welcome on the {github}/issues[github issues pages]!
 We also monitor question tagged with {stackoverflow}/questions/tagged/nest['nest' on stackoverflow] or 
 {stackoverflow}/questions/tagged/elasticsearch-net['elasticsearch-net' on stackoverflow], as well as https://discuss.elastic.co[discussions on our discourse site]
 
-=== License
-
-....
-This software is licensed under the Apache 2 license, quoted below.
-
-    Copyright (c) 2014 Elasticsearch <http://www.elasticsearch.org>
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-....
-

src/Tests/ClientConcepts/LowLevel/Lifetimes.doc.cs

@@ -15,24 +15,23 @@ public class Lifetimes
 	{
 		/**== Lifetimes
 		*
-		* If you are using an IOC container its always useful to know the best practices around the lifetime of your objects 
+		* If you are using an IOC container its always useful to know the best practices around the lifetime of your objects
 		*
 		* In general we advise folks to register their ElasticClient instances as singletons. The client is thread safe
-		* so sharing an instance between threads is fine. 
+		* so sharing an instance between threads is fine.
 		*
 		* Zooming in however the actual moving part that benefits the most from being static for most of the duration of your
-		* application is `ConnectionSettings`; caches are __per__ `ConnectionSettings`. 
+		* application is `ConnectionSettings`; caches are __per__ `ConnectionSettings`.
 		*
 		* In some applications it could make perfect sense to have multiple singleton `ElasticClient`'s registered with different
 		* connection settings. e.g if you have 2 functionally isolated Elasticsearch clusters.
 		*
-		* NOTE: Due to the semantic versioning of Elasticsearch.Net and NEST and their alignment to versions of Elasticsearch, all instances of `ElasticClient` and
+		* IMPORTANT: Due to the semantic versioning of Elasticsearch.Net and NEST and their alignment to versions of Elasticsearch, all instances of `ElasticClient` and
 		* Elasticsearch clusters that are connected to must be on the **same major version** i.e. it is not possible to have both an `ElasticClient` to connect to
 		* Elasticsearch 1.x _and_ 2.x in the same application as the former would require NEST 1.x and the latter, NEST 2.x.
 		*
 		* Let's demonstrate which components are disposed by creating our own derived `ConnectionSettings`, `IConnectionPool` and `IConnection` types
 		*/
-
 		class AConnectionSettings : ConnectionSettings
 		{
 			public AConnectionSettings(IConnectionPool pool, IConnection connection)
@@ -82,7 +81,7 @@ [U] public void InitialDisposeState()
 		}
 
 		/**
-		* Disposing `ConnectionSettings` will dispose the `IConnectionPool` and `IConnection` it has a hold of
+		* Disposing `ConnectionSettings` will also dispose the `IConnectionPool` and `IConnection` it uses
 		*/
 		[U] public void DisposingSettingsDisposesMovingParts()
 		{

src/Tests/intro.asciidoc

@@ -4,55 +4,23 @@
 [[introduction]]
 == Introduction
 
-You've reached the documentation page for `Elasticsearch.Net` and `NEST`. The two official .NET clients for Elasticsearch. So why two clients I hear you say?
+You've reached the documentation page for `Elasticsearch.Net` and `NEST`, The two official .NET clients for Elasticsearch. 
 
-`Elasticsearch.Net` is a very low level, dependency free, client that has no opinions about how you build and represent your requests and responses. It has abstracted 
-enough so that **all** the Elasticsearch API endpoints are represented as methods but not too much to get in the way of how you want to build your json/request/response objects. It also comes with builtin, configurable/overridable, cluster failover retry mechanisms. Elasticsearch is elastic so why not your client?
-
-`NEST` is a high level client that has the advantage of having mapped all the request and response objects, comes with a strongly typed query DSL that maps 1 to 1 with the Elasticsearch query DSL, and takes advantage of specific .NET features such as covariant results. NEST internally uses, and still exposes, the low level `Elasticsearch.Net` client.
-
-Please read the getting started guide for both.
-
-=== Who's using Nest
-- {stackoverflow}[stackoverflow.com] (and the rest of the stackexchange family).
-- http://www.7digital.com[7digital.com] (run NEST on mono).
-- https://www.rijksmuseum.nl/en[rijksmuseum.nl] (Elasticsearch is the only datastorage hit for each page).
-- http://www.fogcreek.com/kiln/[Kiln] FogCreek's version control & code review tooling. 
-  They are so pleased with Elasticsearch that http://blog.fogcreek.com/kiln-powered-by-elasticsearch/[they made a video about how pleased they are!]
+=== Why two clients?
 
-=== Other resources
+`Elasticsearch.Net` is a very low level, dependency free, client that has no opinions about how you build and represent your requests and responses. It has abstracted 
+enough so that **all** the Elasticsearch API endpoints are represented as methods but not too much to get in the way of how you want to build 
+your json/request/response objects. It also comes with built in, configurable/overridable, cluster failover retry mechanisms. Elasticsearch is _elastic_ so why not your client?
 
-http://twitter.com/joelabrahamsson[@joelabrahamsson] wrote a great http://joelabrahamsson.com/entry/extending-aspnet-mvc-music-store-with-elasticsearch[intro into elasticsearch on .NET]
-using NEST. 
+`NEST` is a high level client that has the advantage of having mapped all the request and response objects, 
+comes with a strongly typed query DSL that maps 1 to 1 with the Elasticsearch query DSL, and takes advantage of specific .NET features such as 
+<<covariant-search-results, covariant results>> and <<auto-map, auto mapping of POCOs>>. NEST internally uses and still exposes the low level `Elasticsearch.Net` client.
 
-Also checkout the https://searchbox.io/[searchbox.io guys] rocking NEST http://blog.appharbor.com/2012/06/19/searchbox-elasticsearch-is-now-an-add-on[on AppHarbor]
-with their https://github.com/searchbox-io/.net-sample[demo project]
+Please read the getting started guide for both <<elasticsearch-net,Elasticsearch.Net>> and <<nest,NEST>>.
 
 === Questions, bugs, comments, requests
 
 All of these are more then welcome on the {github}/issues[github issues pages]! We try to at least reply within the same day.
 
 We also monitor question tagged with {stackoverflow}/questions/tagged/nest['nest' on stackoverflow] or 
-{stackoverflow}/questions/tagged/elasticsearch-net['elasticsearch-net' on stackoverflow], as well as https://discuss.elastic.co[discussions on our discourse site]
-
-=== License
-
-....
-This software is licensed under the Apache 2 license, quoted below.
-
-    Copyright (c) 2014 Elasticsearch <http://www.elasticsearch.org>
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-....
-
-
+{stackoverflow}/questions/tagged/elasticsearch-net['elasticsearch-net' on stackoverflow], as well as https://discuss.elastic.co[discussions on our discourse site]