summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClinton Gormley <clint@traveljury.com>2017-07-03 18:17:10 +0200
committerClinton Gormley <clint@traveljury.com>2017-07-03 18:17:34 +0200
commit82966186401d71977bc9ac9440b5ef5d54da1b83 (patch)
tree74e11fef88078b1bcd3575dd133d5c39274e56bb
parent091b1b0765cd6a08d4333112ceecdaa4f5b217ad (diff)
Include shared/attributes.asciidoc from docs master
-rw-r--r--docs/Versions.asciidoc3
-rw-r--r--docs/painless/index.asciidoc2
-rw-r--r--docs/reference/index.asciidoc1
3 files changed, 2 insertions, 4 deletions
diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc
index 339b5d54f2..68ffc2085f 100644
--- a/docs/Versions.asciidoc
+++ b/docs/Versions.asciidoc
@@ -38,4 +38,5 @@ endif::[]
///////
Shared attribute values are pulled from elastic/docs
///////
-include::{docs-dir}/shared/attributes.asciidoc[]
+
+include::{asciidoc-dir}/../../shared/attributes.asciidoc[]
diff --git a/docs/painless/index.asciidoc b/docs/painless/index.asciidoc
index 92c40c852c..4898ed9333 100644
--- a/docs/painless/index.asciidoc
+++ b/docs/painless/index.asciidoc
@@ -1,8 +1,6 @@
[[painless]]
= Painless Scripting Language
-:docs-dir: {docdir}/../../../docs
-
include::../Versions.asciidoc[]
include::painless-getting-started.asciidoc[]
diff --git a/docs/reference/index.asciidoc b/docs/reference/index.asciidoc
index f4eed6de09..5fa6e1d914 100644
--- a/docs/reference/index.asciidoc
+++ b/docs/reference/index.asciidoc
@@ -3,7 +3,6 @@
:es-test-dir: {docdir}/../src/test
:plugins-examples-dir: {docdir}/../../plugins/examples
-:docs-dir: {docdir}/../../../docs
include::../Versions.asciidoc[]
include::index-shared1.asciidoc[]