From f744c3f72476386ccd2e08302a97e09355df7602 Mon Sep 17 00:00:00 2001
From: Andrey Ryaguzov <dev.aeryaguzov@gmail.com>
Date: Tue, 22 Dec 2015 11:43:56 +0400
Subject: [PATCH] Docs: Added migration description for custom analysis file
 path

Closes #15597
Closes #15556
---
 .../charfilters/mapping-charfilter.asciidoc   | 24 +++++++++++--------
 .../migration/migrate_2_0/settings.asciidoc   |  6 +++++
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/docs/reference/analysis/charfilters/mapping-charfilter.asciidoc b/docs/reference/analysis/charfilters/mapping-charfilter.asciidoc
index 5b620446c7b..14c316dcac5 100644
--- a/docs/reference/analysis/charfilters/mapping-charfilter.asciidoc
+++ b/docs/reference/analysis/charfilters/mapping-charfilter.asciidoc
@@ -4,6 +4,16 @@
 A char filter of type `mapping` replacing characters of an analyzed text
 with given mapping.
 
+[horizontal]
+`mappings`::
+
+    A list of mappings to use.
+
+`mappings_path`::
+
+    A path, relative to the `config` directory, to a mappings file
+    configuration.
+
 Here is a sample configuration:
 
 [source,js]
@@ -14,7 +24,10 @@ Here is a sample configuration:
             "char_filter" : {
                 "my_mapping" : {
                     "type" : "mapping",
-                    "mappings" : ["ph=>f", "qu=>k"]
+                    "mappings" : [
+                      "ph => f",
+                      "qu => k"
+                    ]
                 }
             },
             "analyzer" : {
@@ -27,12 +40,3 @@ Here is a sample configuration:
     }
 }
 --------------------------------------------------
-
-Otherwise the setting `mappings_path` can specify a file where you can
-put the list of char mapping :
-
-[source,js]
---------------------------------------------------
-ph => f
-qu => k
---------------------------------------------------
diff --git a/docs/reference/migration/migrate_2_0/settings.asciidoc b/docs/reference/migration/migrate_2_0/settings.asciidoc
index 3e52542f804..06aa743a5d8 100644
--- a/docs/reference/migration/migrate_2_0/settings.asciidoc
+++ b/docs/reference/migration/migrate_2_0/settings.asciidoc
@@ -191,6 +191,12 @@ to check for a custom config location.  The value of the `CONF_DIR`
 variable can be set in the environment config file which is located either in
 `/etc/default/elasticsearch` or `/etc/sysconfig/elasticsearch`.
 
+==== Custom analysis file paths
+
+It is no longer possible to set custom file path outside `CONF_DIR` for `*_path` settings
+in <<analysis-charfilters,char>> or <<analysis-tokenfilters,token>> filters.
+You must specify either relative path to `CONF_DIR` location or absolute path inside `CONF_DIR` location.
+
 ==== `ES_CLASSPATH removed`
 
 The `ES_CLASSPATH` environment variable is no longer used to set the class