Fix conflicts

Author: leemthompo

docs/reference/aggregations/search-aggregations-pipeline-avg-bucket-aggregation.md

@@ -29,7 +29,7 @@ A sibling pipeline aggregation which calculates the mean value of a specified me
 :   (Optional, string) Policy to apply when gaps are found in the data. For valid values, see [Dealing with gaps in the data](/reference/aggregations/pipeline.md#gap-policy). Defaults to `skip`.
 
 `format`
-:   (Optional, string) [DecimalFormat pattern](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/text/DecimalFormat.md) for the output value. If specified, the formatted value is returned in the aggregation’s `value_as_string` property.
+:   (Optional, string) [DecimalFormat pattern](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/text/DecimalFormat.html) for the output value. If specified, the formatted value is returned in the aggregation’s `value_as_string` property.
 
 
 ## Response body [avg-bucket-agg-response]

docs/reference/aggregations/search-aggregations-pipeline-bucket-script-aggregation.md

@@ -33,8 +33,13 @@ $$$bucket-script-params$$$
 | Parameter Name | Description | Required | Default Value |
 | --- | --- | --- | --- |
 | `script` | The script to run for this aggregation. The script can be inline, file or indexed. (see [Scripting](docs-content://explore-analyze/scripting.md)for more details) | Required |  |
+<<<<<<< HEAD:docs/reference/aggregations/search-aggregations-pipeline-bucket-script-aggregation.md
 | `buckets_path` | A map of script variables and their associated path to the buckets we wish to use for the variable(see [`buckets_path` Syntax](/reference/aggregations/pipeline.md#buckets-path-syntax) for more details) | Required |  |
 | `gap_policy` | The policy to apply when gaps are found in the data (see [Dealing with gaps in the data](/reference/aggregations/pipeline.md#gap-policy) for more details) | Optional | `skip` |
+=======
+| `buckets_path` | A map of script variables and their associated path to the buckets we wish to use for the variable(see [`buckets_path` Syntax](/reference/data-analysis/aggregations/pipeline.md#buckets-path-syntax) for more details) | Required |  |
+| `gap_policy` | The policy to apply when gaps are found in the data (see [Dealing with gaps in the data](/reference/data-analysis/aggregations/pipeline.md#gap-policy) for more details) | Optional | `skip` |
+>>>>>>> upstream/9.0:docs/reference/data-analysis/aggregations/search-aggregations-pipeline-bucket-script-aggregation.md
 | `format` | [DecimalFormat pattern](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/text/DecimalFormat.html) for theoutput value. If specified, the formatted value is returned in the aggregation’s`value_as_string` property | Optional | `null` |
 
 The following snippet calculates the ratio percentage of t-shirt sales compared to total sales each month:

docs/reference/aggregations/search-aggregations-pipeline-normalize-aggregation.md

@@ -28,7 +28,7 @@ $$$normalize_pipeline-params$$$
 | --- | --- | --- | --- |
 | `buckets_path` | The path to the buckets we wish to normalize (see [`buckets_path` syntax](/reference/aggregations/pipeline.md#buckets-path-syntax) for more details) | Required |  |
 | `method` | The specific [method](#normalize_pipeline-method) to apply | Required |  |
-| `format` | [DecimalFormat pattern](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/text/DecimalFormat.md) for theoutput value. If specified, the formatted value is returned in the aggregation’s`value_as_string` property | Optional | `null` |
+| `format` | [DecimalFormat pattern](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/text/DecimalFormat.html) for theoutput value. If specified, the formatted value is returned in the aggregation’s`value_as_string` property | Optional | `null` |
 
 
 ## Methods [_methods]

docs/reference/aggregations/search-aggregations-pipeline-serialdiff-aggregation.md

@@ -51,7 +51,7 @@ $$$serial-diff-params$$$
 | `buckets_path` | Path to the metric of interest (see [`buckets_path` Syntax](/reference/aggregations/pipeline.md#buckets-path-syntax) for more details | Required |  |
 | `lag` | The historical bucket to subtract from the current value. E.g. a lag of 7 will subtract the current value from the value 7 buckets ago. Must be a positive, non-zero integer | Optional | `1` |
 | `gap_policy` | Determines what should happen when a gap in the data is encountered. | Optional | `insert_zeros` |
-| `format` | [DecimalFormat pattern](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/text/DecimalFormat.md) for theoutput value. If specified, the formatted value is returned in the aggregation’s`value_as_string` property | Optional | `null` |
+| `format` | [DecimalFormat pattern](https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/text/DecimalFormat.html) for theoutput value. If specified, the formatted value is returned in the aggregation’s`value_as_string` property | Optional | `null` |
 
 `serial_diff` aggregations must be embedded inside of a `histogram` or `date_histogram` aggregation:
 

docs/reference/community-contributed/index.md

@@ -42,7 +42,7 @@ a number of clients that have been contributed by the community for various lang
 
 ## Go [go]
 
-Also see the [official Elasticsearch Go client](go-elasticsearch://docs/reference/index.md).
+Also see the [official Elasticsearch Go client](go-elasticsearch://reference/index.md).
 
 * [elastigo](https://github.com/mattbaird/elastigo): Go client. **Last commit more than a year ago**
 
@@ -56,23 +56,23 @@ Also see the [official Elasticsearch Go client](go-elasticsearch://docs/referenc
 
 ## Java [java]
 
-Also see the [official Elasticsearch Java client](elasticsearch-java://docs/reference/index.md).
+Also see the [official Elasticsearch Java client](elasticsearch-java://reference/index.md).
 
 * [Flummi](https://github.com/otto-de/flummi): Java Rest client with comprehensive Query DSL API.
 
 * [Jest](https://github.com/searchbox-io/Jest): Java Rest client. **No longer maintained**
 
 ## JavaScript [javascript]
 
-See the [official Elasticsearch JavaScript client](elasticsearch-js://docs/reference/index.md).
+See the [official Elasticsearch JavaScript client](elasticsearch-js://reference/index.md).
 
 ## Julia [julia]
 
-* [ElasticsearchClient.jl](https://github.com/OpenSesame/ElasticsearchClient.jl): Elasticsearch client inspired by the [official Elasticsearch Ruby client](elasticsearch-ruby://docs/reference/index.md).
+* [ElasticsearchClient.jl](https://github.com/OpenSesame/ElasticsearchClient.jl): Elasticsearch client inspired by the [official Elasticsearch Ruby client](elasticsearch-ruby://reference/index.md).
 
 ## Kotlin [kotlin]
 
-* [ES Kotlin](https://github.com/mbuhot/eskotlin): Elasticsearch Query DSL for kotlin based on the [official Elasticsearch Java client](elasticsearch-java://docs/reference/index.md). **Last commit more than a year ago**
+* [ES Kotlin](https://github.com/mbuhot/eskotlin): Elasticsearch Query DSL for kotlin based on the [official Elasticsearch Java client](elasticsearch-java://reference/index.md). **Last commit more than a year ago**
 
 * [ES Kotlin Wrapper Client](https://github.com/jillesvangurp/es-kotlin-wrapper-client): Kotlin extension functions and abstractions for the [official Elasticsearch high-level client](https://www.elastic.co/guide/en/elasticsearch/client/java-api/current/index.html). Aims to reduce the amount of boilerplate needed to do searches, bulk indexing and other common things users do with the client. **No longer maintained**
 
@@ -82,7 +82,7 @@ See the [official Elasticsearch JavaScript client](elasticsearch-js://docs/refer
 
 ## .NET [dotnet]
 
-See the [official Elasticsearch .NET client](elasticsearch-net://docs/reference/index.md).
+See the [official Elasticsearch .NET client](elasticsearch-net://reference/index.md).
 
 ## Perl [perl]
 
@@ -92,7 +92,7 @@ Also see the [official Elasticsearch Perl client](https://www.elastic.co/guide/e
 
 ## PHP [php]
 
-Also see the [official Elasticsearch PHP client](elasticsearch-php://docs/reference/index.md).
+Also see the [official Elasticsearch PHP client](elasticsearch-php://reference/index.md).
 
 * [Elastica](https://github.com/ruflin/Elastica): PHP client.
 
@@ -102,7 +102,7 @@ Also see the [official Elasticsearch PHP client](elasticsearch-php://docs/refere
 
 ## Python [python]
 
-See the [official Elasticsearch Python client](elasticsearch-py://docs/reference/index.md).
+See the [official Elasticsearch Python client](elasticsearch-py://reference/index.md).
 
 ## R [r]
 
@@ -114,7 +114,7 @@ See the [official Elasticsearch Python client](elasticsearch-py://docs/reference
 
 ## Ruby [ruby]
 
-Also see the [official Elasticsearch Ruby client](elasticsearch-ruby://docs/reference/index.md).
+Also see the [official Elasticsearch Ruby client](elasticsearch-ruby://reference/index.md).
 
 * [chewy](https://github.com/toptal/chewy): An ODM and wrapper for the official Elasticsearch client.
 
@@ -128,7 +128,7 @@ Also see the [official Elasticsearch Ruby client](elasticsearch-ruby://docs/refe
 
 ## Rust [rust]
 
-Also see the [official Elasticsearch Rust client](elasticsearch-rs://docs/reference/index.md).
+Also see the [official Elasticsearch Rust client](elasticsearch-rs://reference/index.md).
 
 * [rs-es](https://github.com/benashford/rs-es): A REST API client with a strongly-typed Query DSL. **Last commit more than a year ago**
 

docs/reference/elasticsearch-plugins/analysis-icu-tokenizer.md

@@ -33,7 +33,7 @@ This functionality is marked as experimental in Lucene
 
 You can customize the `icu-tokenizer` behavior by specifying per-script rule files, see the [RBBI rules syntax reference](http://userguide.icu-project.org/boundaryanalysis#TOC-RBBI-Rules) for a more detailed explanation.
 
-To add icu tokenizer rules, set the `rule_files` settings, which should contain a comma-separated list of `code:rulefile` pairs in the following format: [four-letter ISO 15924 script code](https://unicode.org/iso15924/iso15924-codes.md), followed by a colon, then a rule file name. Rule files are placed `ES_HOME/config` directory.
+To add icu tokenizer rules, set the `rule_files` settings, which should contain a comma-separated list of `code:rulefile` pairs in the following format: [four-letter ISO 15924 script code](https://unicode.org/iso15924/iso15924-codes.html), followed by a colon, then a rule file name. Rule files are placed `ES_HOME/config` directory.
 
 As a demonstration of how the rule files can be used, save the following user file to `$ES_HOME/config/KeywordTokenizer.rbbi`:
 

docs/reference/elasticsearch-plugins/analysis-nori-speech.md

@@ -5,7 +5,7 @@ mapped_pages:
 
 # nori_part_of_speech token filter [analysis-nori-speech]
 
-The `nori_part_of_speech` token filter removes tokens that match a set of part-of-speech tags. The list of supported tags and their meanings can be found here: [Part of speech tags](https://lucene.apache.org/core/10_1_0/core/../analysis/nori/org/apache/lucene/analysis/ko/POS.Tag.md)
+The `nori_part_of_speech` token filter removes tokens that match a set of part-of-speech tags. The list of supported tags and their meanings can be found here: [Part of speech tags](https://lucene.apache.org/core/10_1_0/core/../analysis/nori/org/apache/lucene/analysis/ko/POS.Tag.html)
 
 It accepts the following setting:
 

docs/reference/elasticsearch-plugins/cloud-aws-best-practices.md

@@ -11,7 +11,7 @@ This section contains some other information about designing and managing an {{e
 
 EC2 instances offer a number of different kinds of storage. Please be aware of the following when selecting the storage for your cluster:
 
-* [Instance Store](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.md) is recommended for {{es}} clusters as it offers excellent performance and is cheaper than EBS-based storage. {{es}} is designed to work well with this kind of ephemeral storage because it replicates each shard across multiple nodes. If a node fails and its Instance Store is lost then {{es}} will rebuild any lost shards from other copies.
+* [Instance Store](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html) is recommended for {{es}} clusters as it offers excellent performance and is cheaper than EBS-based storage. {{es}} is designed to work well with this kind of ephemeral storage because it replicates each shard across multiple nodes. If a node fails and its Instance Store is lost then {{es}} will rebuild any lost shards from other copies.
 * [EBS-based storage](https://aws.amazon.com/ebs/) may be acceptable for smaller clusters (1-2 nodes). Be sure to use provisioned IOPS to ensure your cluster has satisfactory performance.
 * [EFS-based storage](https://aws.amazon.com/efs/) is not recommended or supported as it does not offer satisfactory performance. Historically, shared network filesystems such as EFS have not always offered precisely the behaviour that {{es}} requires of its filesystem, and this has been known to lead to index corruption. Although EFS offers durability, shared storage, and the ability to grow and shrink filesystems dynamically, you can achieve the same benefits using {{es}} directly.
 
@@ -24,12 +24,12 @@ Prefer the [Amazon Linux 2 AMIs](https://aws.amazon.com/amazon-linux-2/) as thes
 ## Networking [_networking]
 
 * Smaller instance types have limited network performance, in terms of both [bandwidth and number of connections](https://lab.getbase.com/how-we-discovered-limitations-on-the-aws-tcp-stack/). If networking is a bottleneck, avoid [instance types](https://aws.amazon.com/ec2/instance-types/) with networking labelled as `Moderate` or `Low`.
-* It is a good idea to distribute your nodes across multiple [availability zones](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.md) and use [shard allocation awareness](docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/shard-allocation-awareness.md) to ensure that each shard has copies in more than one availability zone.
+* It is a good idea to distribute your nodes across multiple [availability zones](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html) and use [shard allocation awareness](docs-content://deploy-manage/distributed-architecture/shard-allocation-relocation-recovery/shard-allocation-awareness.md) to ensure that each shard has copies in more than one availability zone.
 * Do not span a cluster across regions. {{es}} expects that node-to-node connections within a cluster are reasonably reliable and offer high bandwidth and low latency, and these properties do not hold for connections between regions. Although an {{es}} cluster will behave correctly when node-to-node connections are unreliable or slow, it is not optimised for this case and its performance may suffer. If you wish to geographically distribute your data, you should provision multiple clusters and use features such as [cross-cluster search](docs-content://solutions/search/cross-cluster-search.md) and [cross-cluster replication](docs-content://deploy-manage/tools/cross-cluster-replication.md).
 
 
 ## Other recommendations [_other_recommendations]
 
-* If you have split your nodes into roles, consider [tagging the EC2 instances](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.md) by role to make it easier to filter and view your EC2 instances in the AWS console.
-* Consider [enabling termination protection](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/terminating-instances.md#Using_ChangingDisableAPITermination) for all of your data and master-eligible nodes. This will help to prevent accidental termination of these nodes which could temporarily reduce the resilience of the cluster and which could cause a potentially disruptive reallocation of shards.
-* If running your cluster using one or more [auto-scaling groups](https://docs.aws.amazon.com/autoscaling/ec2/userguide/AutoScalingGroup.md), consider protecting your data and master-eligible nodes [against termination during scale-in](https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-instance-termination.md#instance-protection-instance). This will help to prevent automatic termination of these nodes which could temporarily reduce the resilience of the cluster and which could cause a potentially disruptive reallocation of shards. If these instances are protected against termination during scale-in then you can use shard allocation filtering to gracefully migrate any data off these nodes before terminating them manually. Refer to [](/reference/elasticsearch/index-settings/shard-allocation.md).
+* If you have split your nodes into roles, consider [tagging the EC2 instances](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html) by role to make it easier to filter and view your EC2 instances in the AWS console.
+* Consider [enabling termination protection](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/terminating-instances.html#Using_ChangingDisableAPITermination) for all of your data and master-eligible nodes. This will help to prevent accidental termination of these nodes which could temporarily reduce the resilience of the cluster and which could cause a potentially disruptive reallocation of shards.
+* If running your cluster using one or more [auto-scaling groups](https://docs.aws.amazon.com/autoscaling/ec2/userguide/AutoScalingGroup.html), consider protecting your data and master-eligible nodes [against termination during scale-in](https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-instance-termination.html#instance-protection-instance). This will help to prevent automatic termination of these nodes which could temporarily reduce the resilience of the cluster and which could cause a potentially disruptive reallocation of shards. If these instances are protected against termination during scale-in then you can use shard allocation filtering to gracefully migrate any data off these nodes before terminating them manually. Refer to [](/reference/elasticsearch/index-settings/shard-allocation.md).

docs/reference/elasticsearch-plugins/cloud/ec-adding-elastic-plugins.md

@@ -0,0 +1,30 @@
+---
+mapped_pages:
+  - https://www.elastic.co/guide/en/cloud/current/ec-adding-elastic-plugins.html
+---
+
+# Add plugins provided with Elasticsearch Service [ec-adding-elastic-plugins]
+
+You can use a variety of official plugins that are compatible with your version of {{es}}. When you upgrade to a new {{es}} version, these plugins are simply upgraded with the rest of your deployment.
+
+## Before you begin [ec_before_you_begin_6]
+
+Some restrictions apply when adding plugins. To learn more, check [Restrictions for {{es}} and {{kib}} plugins](cloud://release-notes/cloud-hosted/known-issues.md#ec-restrictions-plugins).
+
+Only Gold, Platinum, Enterprise and Private subscriptions, running version 2.4.6 or later, have access to uploading custom plugins. All subscription levels, including Standard, can upload scripts and dictionaries.
+
+To enable a plugin for a deployment:
+
+1. Log in to the [Elasticsearch Service Console](https://cloud.elastic.co?page=docs&placement=docs-body).
+2. Find your deployment on the home page in the Elasticsearch Service card and select **Manage** to access it directly. Or, select **Hosted deployments** to go to the deployments page to view all of your deployments.
+
+    On the deployments page you can narrow your deployments by name, ID, or choose from several other filters. To customize your view, use a combination of filters, or change the format from a grid to a list.
+
+3. From the **Actions** dropdown, select **Edit deployment**.
+4. Select **Manage user settings and extensions**.
+5. Select the **Extensions** tab.
+6. Select the plugins that you want to enable.
+7. Select **Back**.
+8. Select **Save**. The {{es}} cluster is then updated with new nodes that have the plugin installed.
+
+