From 9cd40747e96d384616c78e86f9a38a9b1742651c Mon Sep 17 00:00:00 2001
From: Lisa Cawley <lcawley@elastic.co>
Date: Fri, 3 Nov 2017 09:27:20 -0700
Subject: [PATCH] [DOCS] Add X-Pack license settings
 (elastic/x-pack-elasticsearch#2833)

Original commit: elastic/x-pack-elasticsearch@6bab8306828ae3b6c50c0f7a14982e7f1c0d77e5
---
 docs/en/settings/configuring-xes.asciidoc  |  1 +
 docs/en/settings/license-settings.asciidoc | 19 +++++++++++++++++++
 docs/en/settings/x-pack-settings.asciidoc  |  3 +++
 3 files changed, 23 insertions(+)
 create mode 100644 docs/en/settings/license-settings.asciidoc

diff --git a/docs/en/settings/configuring-xes.asciidoc b/docs/en/settings/configuring-xes.asciidoc
index eb8498166b8..1230e824c07 100644
--- a/docs/en/settings/configuring-xes.asciidoc
+++ b/docs/en/settings/configuring-xes.asciidoc
@@ -3,6 +3,7 @@
 == Configuring X-Pack
 
 include::x-pack-settings.asciidoc[]
+include::license-settings.asciidoc[]
 include::ml-settings.asciidoc[]
 include::monitoring-settings.asciidoc[]
 include::security-settings.asciidoc[]
diff --git a/docs/en/settings/license-settings.asciidoc b/docs/en/settings/license-settings.asciidoc
new file mode 100644
index 00000000000..afe47322ad1
--- /dev/null
+++ b/docs/en/settings/license-settings.asciidoc
@@ -0,0 +1,19 @@
+[role="xpack"]
+[[license-settings]]
+=== {xpack} License Settings
+++++
+<titleabbrev>License Settings</titleabbrev>
+++++
+
+You can configure this licensing setting in the `elasticsearch.yml` file.
+For more information, see
+{xpack-ref}/license-management.html[{xpack} License Management].
+
+`xpack.license.self_generated.type`::
+Set to `trial` (default) to enable all {xpack} features. +
++
+--
+If set to `basic`, the self-generated license gives access only to the features
+of a standard basic license. You can later upgrade the cluster to a trial
+license.
+--
diff --git a/docs/en/settings/x-pack-settings.asciidoc b/docs/en/settings/x-pack-settings.asciidoc
index 128030c6807..a35f94f4eb1 100644
--- a/docs/en/settings/x-pack-settings.asciidoc
+++ b/docs/en/settings/x-pack-settings.asciidoc
@@ -12,3 +12,6 @@ You configure settings for X-Pack features in the `elasticsearch.yml`,
 |Security          |{ref}/security-settings.html[Yes]      |{kibana-ref}/security-settings-kb.html[Yes]   |No
 |Watcher           |{ref}/notification-settings.html[Yes]    |No                                  |No
 |=======================
+
+There are also {ref}/license-settings.html[{xpack} license settings] in the
+`elasticsearch.yml` file.