Merge branch 'ericamick-patch-3' into 2.x

russcam · russcam · commit cfe4bc6839d1 · 2016-05-31T08:59:42.000+10:00
diff --git a/src/Tests/ClientConcepts/HighLevel/Inference/IndicesPaths.doc.cs b/src/Tests/ClientConcepts/HighLevel/Inference/IndicesPaths.doc.cs
@@ -10,8 +10,8 @@ public class IndicesPaths
 	{
 		/**== Indices paths
 		*
-		* Some APIs in Elasticsearch take one or many index name or a special `_all` marker to send the request to all the indices
-		* In nest this is encoded using `Indices`.
+		* Some APIs in Elasticsearch take one or many index names or a special `_all` marker to send the request to all the indices.
+		* In NEST this is encoded using `Indices`.
 		*
 		*=== Implicit Conversion
 		* Several types implicitly convert to `Indices`

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ public class IndicesPaths`
`10`	`10`	`{`
`11`	`11`	`/**== Indices paths`
`12`	`12`	`*`
`13`		- * Some APIs in Elasticsearch take one or many index name or a special `_all` marker to send the request to all the indices
`14`		- * In nest this is encoded using `Indices`.
	`13`	+ * Some APIs in Elasticsearch take one or many index names or a special `_all` marker to send the request to all the indices.
	`14`	+ * In NEST this is encoded using `Indices`.
`15`	`15`	`*`
`16`	`16`	`*=== Implicit Conversion`
`17`	`17`	* Several types implicitly convert to `Indices`