Fix bad cross document links

russcam · russcam · commit 245686d5fcdc · 2017-04-10T17:03:07.000+10:00
diff --git a/docs/aggregations.asciidoc b/docs/aggregations.asciidoc
@@ -60,7 +60,7 @@ The values are typically extracted from the fields of the document (using the fi
 
 * <<value-count-aggregation-usage,Value Count Aggregation Usage>>
 
-See the Elasticsearch documentation on {ref_current}/search-aggregations-metric.html[Metric aggregations] for more details.
+See the Elasticsearch documentation on {ref_current}/search-aggregations-metrics.html[Metric aggregations] for more details.
 
 :includes-from-dirs: aggregations/metric
 
diff --git a/docs/client-concepts/certificates/working-with-certificates.asciidoc b/docs/client-concepts/certificates/working-with-certificates.asciidoc
@@ -118,17 +118,15 @@ the local CA certificate is part of the chain that was used to generate the serv
 
 ==== Client Certificates
 
-X-Pack also allows you to configure a {xpack_current}/pki-realm.html[PKI realm] to enable user authentication
-through client certificates. The `certgen` tool included with X-Pack allows you to
-{xpack_current}/ssl-tls.html#CO13-4[generate client certificates as well] and assign the distinguished name (DN) of the
-certificate to a user with a certain role.
+Shield also allows you to configure a PKI realm to enable user authentication
+through client certificates.
 
-certgen by default only generates a public certificate `.cer`) and a private key `.key`. To authenticate with client certificates, you need to present both
+To authenticate with client certificates, you need to present both a public certificate `.cer`) and a private key `.key`
 as one certificate. The easiest way to do this is to generate a `pfx` or `p12` file from the `.cer` and `.key`
 and attach these to requests using `new X509Certificate(pathToPfx)`.
 
-If you do not have a way to run `openssl` or `Pvk2Pfx` to do this as part of your deployments the clients ships with a handy helper to generate one
-on the fly by passing the paths to the `.cer`  and `.key` files that `certgen` outputs. Sadly, this functonality is not available on .NET Core because
+If you do not have a way to run `openssl` or `Pvk2Pfx` to do this as part of your deployments, the clients ship with a handy helper to generate one
+on the fly by passing the paths to the `.cer`  and `.key` files. Sadly, this functonality is not available on .NET Core because
 the `PublicKey` property cannot be set on the crypto service provider that is used to generate the `pfx` file at runtime.
 
 You can set Client Certificates to use on all connections on `ConnectionSettings`
diff --git a/docs/client-concepts/connection-pooling/building-blocks/connection-pooling.asciidoc b/docs/client-concepts/connection-pooling/building-blocks/connection-pooling.asciidoc
@@ -9,7 +9,7 @@
 ////
 IMPORTANT NOTE
 ==============
-This file has been generated from https://github.com/elastic/elasticsearch-net/tree/2.x/src/Tests/ClientConcepts/ConnectionPooling/BuildingBlocks/ConnectionPooling.Doc.cs. 
+This file has been generated from https://github.com/elastic/elasticsearch-net/tree/2.x/src/Tests/ClientConcepts/ConnectionPooling/BuildingBlocks/ConnectionPooling.doc.cs. 
 If you wish to submit a PR for any spelling mistakes, typos or grammatical errors for this file,
 please modify the original csharp file found at the link and submit the PR with that change. Thanks!
 ////
diff --git a/docs/client-concepts/high-level/analysis/writing-analyzers.asciidoc b/docs/client-concepts/high-level/analysis/writing-analyzers.asciidoc
@@ -34,9 +34,6 @@ An analyzer is built of three components:
 
 image::analysis-chain.png[analysis chain]
 
-Check out the Elasticsearch documentation on the {ref_current}/analyzer-anatomy.html[Anatomy of an analyzer]
-to understand more.
-
 ==== Specifying an analyzer on a field mapping
 
 An analyzer can be specified on a `text` datatype field mapping when creating a new field on a type, usually
diff --git a/docs/client-concepts/high-level/mapping/auto-map.asciidoc b/docs/client-concepts/high-level/mapping/auto-map.asciidoc
@@ -178,8 +178,7 @@ In this example,
 
 * Employees is mapped as an `object`
 
-and the remaining string properties as multi field `text` datatypes, each with a `keyword` datatype
-sub field.
+and the remaining string properties as `string` datatypes.
 
 NEST has inferred mapping support for the following .NET types
 
diff --git a/docs/client-concepts/high-level/mapping/fluent-mapping.asciidoc b/docs/client-concepts/high-level/mapping/fluent-mapping.asciidoc
@@ -81,7 +81,7 @@ var descriptor = new CreateIndexDescriptor("myindex")
     );
 ----
 
-Here, the Name property of the `Company` type has been mapped as a {ref_current}/text.html[text datatype] and
+Here, the Name property of the `Company` type has been mapped as a {ref_current}/string.html[string datatype] and
 the `Employees` property mapped as an {ref_current}/object.html[object datatype]. Within this object mapping,
 only the `FirstName`, `LastName` and `Salary` properties of the `Employee` type have been mapped.
 
diff --git a/docs/client-concepts/high-level/mapping/multi-fields.asciidoc b/docs/client-concepts/high-level/mapping/multi-fields.asciidoc
@@ -18,7 +18,7 @@ please modify the original csharp file found at the link and submit the PR with
 === Multi fields
 
 It is often useful to index the same field in Elasticsearch in different ways, to
-serve different purposes, for example, mapping a POCO `string` property as a`text` datatype for full text search as well as mapping as a `keyword` datatype for
+serve different purposes, for example, mapping a POCO `string` property as a`string` datatype for full text search as well as mapping as a `not_analyzed` `string` datatype for
 structured search, sorting and aggregations. Another example is mapping a POCO `string`
 property to use different analyzers, to serve different full text search needs.
 
@@ -135,7 +135,6 @@ var searchResponse = client.Search<Person>(s => s
 );
 ----
 <1> Use the shingles subfield on `Name`
-
 <2> Use the keyword subfield on `Name`
 
 [source,javascript]
diff --git a/docs/query-dsl-usage.asciidoc b/docs/query-dsl-usage.asciidoc
diff --git a/docs/search-usage.asciidoc b/docs/search-usage.asciidoc
diff --git a/docs/search/writing-queries.asciidoc b/docs/search/writing-queries.asciidoc
@@ -193,8 +193,8 @@ is not analyzed, and an *exact match* to the input is looked for in the inverted
 trip many new users up when using a term level query against a field that is analyzed at index
 time.
 
-When a field is _only_ to be used for exact matching, you should consider indexing it as a
-{ref_current}/keyword.html[keyword] datatype. If a field is used for both exact matches and
+When a field is _only_ to be used for exact matching, you should consider indexing it as a `not_analyzed`
+{ref_current}/string.html[string] datatype. If a field is used for both exact matches and
 full text search, you should consider indexing it with <<multi-fields, multi fields>>.
 
 --
@@ -241,7 +241,7 @@ is analyzed, and the resulting terms from query analysis are compared to the ter
 index.
 
 You have full control over the analysis that is applied at both search time and index time, by applying
-<<writing-analyzers, analyzers>> to {ref_current}/text.html[text] datatype fields through
+<<writing-analyzers, analyzers>> to {ref_current}/string.html[string] datatype fields through
 <<mapping, mapping>>.
 
 --
diff --git a/src/Tests/ClientConcepts/Certificates/WorkingWithCertificates.doc.cs b/src/Tests/ClientConcepts/Certificates/WorkingWithCertificates.doc.cs
@@ -113,17 +113,15 @@ public override ConnectionSettings ClusterConnectionSettings(ConnectionSettings
 		/**
 		 * ==== Client Certificates
 		 *
-		 * X-Pack also allows you to configure a {xpack_current}/pki-realm.html[PKI realm] to enable user authentication
-		 * through client certificates. The `certgen` tool included with X-Pack allows you to
-		 * {xpack_current}/ssl-tls.html#CO13-4[generate client certificates as well] and assign the distinguished name (DN) of the
-		 * certificate to a user with a certain role.
+		 * Shield also allows you to configure a PKI realm to enable user authentication
+		 * through client certificates.
 		 *
-		 * certgen by default only generates a public certificate (`.cer`) and a private key `.key`. To authenticate with client certificates, you need to present both
+		 * To authenticate with client certificates, you need to present both a public certificate (`.cer`) and a private key `.key`
 		 * as one certificate. The easiest way to do this is to generate a `pfx` or `p12` file from the `.cer` and `.key`
 		 * and attach these to requests using `new X509Certificate(pathToPfx)`.
 		 *
-		 * If you do not have a way to run `openssl` or `Pvk2Pfx` to do this as part of your deployments the clients ships with a handy helper to generate one
-		 * on the fly by passing the paths to the `.cer`  and `.key` files that `certgen` outputs. Sadly, this functonality is not available on .NET Core because
+		 * If you do not have a way to run `openssl` or `Pvk2Pfx` to do this as part of your deployments, the clients ship with a handy helper to generate one
+		 * on the fly by passing the paths to the `.cer`  and `.key` files. Sadly, this functonality is not available on .NET Core because
 		 * the `PublicKey` property cannot be set on the crypto service provider that is used to generate the `pfx` file at runtime.
 		 *
 		 * You can set Client Certificates to use on all connections on `ConnectionSettings`
diff --git a/src/Tests/ClientConcepts/HighLevel/Analysis/WritingAnalyzers.doc.cs b/src/Tests/ClientConcepts/HighLevel/Analysis/WritingAnalyzers.doc.cs
@@ -25,8 +25,6 @@ namespace Tests.ClientConcepts.HighLevel.Analysis
      *
 	 * image::analysis-chain.png[analysis chain]
      *
-     * Check out the Elasticsearch documentation on the {ref_current}/analyzer-anatomy.html[Anatomy of an analyzer]
-     * to understand more.
      */
     public class WritingAnalyzers
     {
diff --git a/src/Tests/ClientConcepts/HighLevel/Mapping/AutoMap.doc.cs b/src/Tests/ClientConcepts/HighLevel/Mapping/AutoMap.doc.cs
@@ -202,8 +202,7 @@ public void OverridingInheritedProperties()
 		 * - Salary is mapped as an `integer`
 		 * - Employees is mapped as an `object`
 		 *
-		 * and the remaining string properties as multi field `text` datatypes, each with a `keyword` datatype
-         * sub field.
+		 * and the remaining string properties as `string` datatypes.
          *
          * NEST has inferred mapping support for the following .NET types
          *
diff --git a/src/Tests/ClientConcepts/HighLevel/Mapping/FluentMapping.doc.cs b/src/Tests/ClientConcepts/HighLevel/Mapping/FluentMapping.doc.cs
@@ -76,7 +76,7 @@ public void MappingManually()
                 );
 
             /**
-             * Here, the Name property of the `Company` type has been mapped as a {ref_current}/text.html[text datatype] and
+             * Here, the Name property of the `Company` type has been mapped as a {ref_current}/string.html[string datatype] and
              * the `Employees` property mapped as an {ref_current}/object.html[object datatype]. Within this object mapping,
              * only the `FirstName`, `LastName` and `Salary` properties of the `Employee` type have been mapped.
              *
diff --git a/src/Tests/ClientConcepts/HighLevel/Mapping/MultiFields.doc.cs b/src/Tests/ClientConcepts/HighLevel/Mapping/MultiFields.doc.cs
@@ -16,11 +16,9 @@ namespace Tests.ClientConcepts.HighLevel.Mapping
     *
     * It is often useful to index the same field in Elasticsearch in different ways, to
     * serve different purposes, for example, mapping a POCO `string` property as a
-    * `text` datatype for full text search as well as mapping as a `keyword` datatype for
+    * `string` datatype for full text search as well as mapping as a `not_analyzed` `string` datatype for
     * structured search, sorting and aggregations. Another example is mapping a POCO `string`
     * property to use different analyzers, to serve different full text search needs.
-    *
-    *
     */
     public class MultiFields
     {
diff --git a/src/Tests/Search/WritingQueries.doc.cs b/src/Tests/Search/WritingQueries.doc.cs
@@ -230,8 +230,8 @@ public void StructuredSearch()
          * trip many new users up when using a term level query against a field that is analyzed at index
          * time.
          *
-         * When a field is _only_ to be used for exact matching, you should consider indexing it as a
-         * {ref_current}/keyword.html[keyword] datatype. If a field is used for both exact matches and
+         * When a field is _only_ to be used for exact matching, you should consider indexing it as a `not_analyzed`
+         * {ref_current}/string.html[string] datatype. If a field is used for both exact matches and
          * full text search, you should consider indexing it with <<multi-fields, multi fields>>.
          * --
          *
@@ -291,7 +291,7 @@ public void UnstructuredSearch()
          * index.
          *
          * You have full control over the analysis that is applied at both search time and index time, by applying
-         * <<writing-analyzers, analyzers>> to {ref_current}/text.html[text] datatype fields through
+         * <<writing-analyzers, analyzers>> to {ref_current}/string.html[string] datatype fields through
          * <<mapping, mapping>>.
          * --
          *
diff --git a/src/Tests/Tests.csproj b/src/Tests/Tests.csproj
@@ -781,9 +781,7 @@
     <None Include="intro.asciidoc" />
     <None Include="low-level.asciidoc" />
     <None Include="paket.references" />
-    <None Include="query-dsl-usage.asciidoc" />
     <None Include="query-dsl.asciidoc" />
-    <None Include="search-usage.asciidoc" />
     <None Include="search.asciidoc" />
     <None Include="tests.yaml" />
     <None Include="troubleshooting.asciidoc" />
diff --git a/src/Tests/aggregations.asciidoc b/src/Tests/aggregations.asciidoc
diff --git a/src/Tests/query-dsl-usage.asciidoc b/src/Tests/query-dsl-usage.asciidoc
diff --git a/src/Tests/search-usage.asciidoc b/src/Tests/search-usage.asciidoc
diff --git a/src/Tests/search.asciidoc b/src/Tests/search.asciidoc
