From c161d90524fa45acfeffe52105f805e6d1290f81 Mon Sep 17 00:00:00 2001 From: debadair Date: Thu, 15 Jun 2017 08:54:10 -0700 Subject: [PATCH] [DOCS] Defined es-test-dir and plugins-examples-dir in index.asciidoc. (#25232) Use these attributes when specifying the location of included tests. --- .../tokenfilters/stemmer-override-tokenfilter.asciidoc | 2 +- .../analysis/tokenfilters/synonym-graph-tokenfilter.asciidoc | 2 +- .../analysis/tokenfilters/synonym-tokenfilter.asciidoc | 2 +- docs/reference/index.asciidoc | 3 +++ docs/reference/modules/scripting/engine.asciidoc | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/reference/analysis/tokenfilters/stemmer-override-tokenfilter.asciidoc b/docs/reference/analysis/tokenfilters/stemmer-override-tokenfilter.asciidoc index 33191805fe6..e178181d147 100644 --- a/docs/reference/analysis/tokenfilters/stemmer-override-tokenfilter.asciidoc +++ b/docs/reference/analysis/tokenfilters/stemmer-override-tokenfilter.asciidoc @@ -46,7 +46,7 @@ Where the file looks like: [source,stemmer_override] -------------------------------------------------- -include::{docdir}/../src/test/cluster/config/analysis/stemmer_override.txt[] +include::{es-test-dir}/cluster/config/analysis/stemmer_override.txt[] -------------------------------------------------- You can also define the overrides rules inline: diff --git a/docs/reference/analysis/tokenfilters/synonym-graph-tokenfilter.asciidoc b/docs/reference/analysis/tokenfilters/synonym-graph-tokenfilter.asciidoc index 09707fdeb1c..d29ec51e3d4 100644 --- a/docs/reference/analysis/tokenfilters/synonym-graph-tokenfilter.asciidoc +++ b/docs/reference/analysis/tokenfilters/synonym-graph-tokenfilter.asciidoc @@ -65,7 +65,7 @@ The following is a sample format of the file: [source,synonyms] -------------------------------------------------- -include::{docdir}/../src/test/cluster/config/analysis/synonym.txt[] +include::{es-test-dir}/cluster/config/analysis/synonym.txt[] -------------------------------------------------- You can also define synonyms for the filter directly in the diff --git a/docs/reference/analysis/tokenfilters/synonym-tokenfilter.asciidoc b/docs/reference/analysis/tokenfilters/synonym-tokenfilter.asciidoc index c4961d1e5f9..4f69cbf3458 100644 --- a/docs/reference/analysis/tokenfilters/synonym-tokenfilter.asciidoc +++ b/docs/reference/analysis/tokenfilters/synonym-tokenfilter.asciidoc @@ -49,7 +49,7 @@ The following is a sample format of the file: [source,synonyms] -------------------------------------------------- -include::{docdir}/../src/test/cluster/config/analysis/synonym.txt[] +include::{es-test-dir}/cluster/config/analysis/synonym.txt[] -------------------------------------------------- You can also define synonyms for the filter directly in the diff --git a/docs/reference/index.asciidoc b/docs/reference/index.asciidoc index 992792455d1..a620bcbeaaf 100644 --- a/docs/reference/index.asciidoc +++ b/docs/reference/index.asciidoc @@ -1,4 +1,7 @@ [[elasticsearch-reference]] = Elasticsearch Reference +:es-test-dir: {docdir}/../src/test +:plugins-examples-dir: {docdir}/../../plugins/examples + include::index-shared.asciidoc[] diff --git a/docs/reference/modules/scripting/engine.asciidoc b/docs/reference/modules/scripting/engine.asciidoc index be103599152..37baa0801c9 100644 --- a/docs/reference/modules/scripting/engine.asciidoc +++ b/docs/reference/modules/scripting/engine.asciidoc @@ -17,7 +17,7 @@ the document frequency of a provided term. ["source","java",subs="attributes,callouts,macros"] -------------------------------------------------- -include-tagged::{docdir}/../../plugins/examples/script-expert-scoring/src/main/java/org/elasticsearch/example/expertscript/ExpertScriptPlugin.java[expert_engine] +include-tagged::{plugins-examples-dir}/script-expert-scoring/src/main/java/org/elasticsearch/example/expertscript/ExpertScriptPlugin.java[expert_engine] -------------------------------------------------- You can execute the script by specifying its `lang` as `expert_scripts`, and the name