elastic · gchaps · Jun 8, 2020 · Jun 5, 2020 · Jun 8, 2020
diff --git a/docs/settings/alert-action-settings.asciidoc b/docs/settings/alert-action-settings.asciidoc
@@ -1,6 +1,6 @@
 [role="xpack"]
 [[alert-action-settings-kb]]
-=== Alerting and action settings in Kibana
+=== Alerting and action settings in {kib}
 ++++
 <titleabbrev>Alerting and action settings</titleabbrev>
 ++++

diff --git a/docs/settings/apm-settings.asciidoc b/docs/settings/apm-settings.asciidoc
@@ -12,7 +12,7 @@ It is enabled by default.
 
 [float]
 [[apm-indices-settings-kb]]
-==== APM Indices
+==== APM indices
 
 // This content is reused in the APM app documentation.
 // Any changes made in this file will be seen there as well.

diff --git a/docs/settings/dev-settings.asciidoc b/docs/settings/dev-settings.asciidoc
@@ -1,6 +1,6 @@
 [role="xpack"]
 [[dev-settings-kb]]
-=== Development tools settings in Kibana
+=== Development tools settings in {kib}
 ++++
 <titleabbrev>Development tools settings</titleabbrev>
 ++++
@@ -21,7 +21,7 @@ They are enabled by default.
 
 [float]
 [[profiler-settings]]
-==== {searchprofiler} Settings
+==== {searchprofiler} settings
 
 [cols="2*<"]
 |===

diff --git a/docs/settings/graph-settings.asciidoc b/docs/settings/graph-settings.asciidoc
@@ -1,6 +1,6 @@
 [role="xpack"]
 [[graph-settings-kb]]
-=== Graph settings in Kibana
+=== Graph settings in {kib}
 ++++
 <titleabbrev>Graph settings</titleabbrev>
 ++++

diff --git a/docs/settings/i18n-settings.asciidoc b/docs/settings/i18n-settings.asciidoc
@@ -1,12 +1,15 @@
 [role="xpack"]
 [[i18n-settings-kb]]
-=== i18n settings in Kibana
+=== i18n settings in {kib}
+++++
+<titleabbrev>i18n settings</titleabbrev>
+++++
 
 You do not need to configure any settings to run Kibana in English.
 
 [float]
 [[general-i18n-settings-kb]]
-==== General i18n Settings
+==== General i18n settings
 
 `i18n.locale`::
   {kib} supports the following locales:

diff --git a/docs/settings/infrastructure-ui-settings.asciidoc b/docs/settings/infrastructure-ui-settings.asciidoc
@@ -1,6 +1,6 @@
 [role="xpack"]
 [[infrastructure-ui-settings-kb]]
-=== Metrics settings in Kibana
+=== Metrics settings in {kib}
 ++++
 <titleabbrev>Metrics settings</titleabbrev>
 ++++
@@ -11,4 +11,4 @@ You do not need to configure any settings to use the Metrics app in {kib}. It is
 [[general-infra-ui-settings-kb]]
 ==== General Metrics settings
 
-include::general-infra-logs-ui-settings.asciidoc[]
+include::general-infra-logs-ui-settings.asciidoc[]
diff --git a/docs/settings/logs-ui-settings.asciidoc b/docs/settings/logs-ui-settings.asciidoc
@@ -1,6 +1,6 @@
 [role="xpack"]
 [[logs-ui-settings-kb]]
-=== Logs app settings in Kibana
+=== Logs settings in {kib}
 ++++
 <titleabbrev>Logs settings</titleabbrev>
 ++++

diff --git a/docs/settings/ml-settings.asciidoc b/docs/settings/ml-settings.asciidoc
@@ -1,12 +1,12 @@
 [role="xpack"]
 [[ml-settings-kb]]
-=== Machine learning settings in Kibana
+=== Machine learning settings in {kib}
 ++++
 <titleabbrev>Machine learning settings</titleabbrev>
 ++++
 
 You do not need to configure any settings to use {kib} {ml-features}. They are
-enabled by default. 
+enabled by default.
 
 [[general-ml-settings-kb]]
 ==== General {ml} settings
@@ -26,4 +26,4 @@ enabled by default.
 [[advanced-ml-settings-kb]]
 ==== Advanced {ml} settings
 
-Refer to <<kibana-ml-settings,Advanced {ml} settings in {kib}>>.
+Refer to <<kibana-ml-settings,Advanced {ml} settings in {kib}>>.
diff --git a/docs/settings/monitoring-settings.asciidoc b/docs/settings/monitoring-settings.asciidoc
@@ -1,6 +1,6 @@
 [role="xpack"]
 [[monitoring-settings-kb]]
-=== Monitoring settings in Kibana
+=== Monitoring settings in {kib}
 ++++
 <titleabbrev>Monitoring settings</titleabbrev>
 ++++

diff --git a/docs/settings/reporting-settings.asciidoc b/docs/settings/reporting-settings.asciidoc
@@ -1,6 +1,6 @@
 [role="xpack"]
 [[reporting-settings-kb]]
-=== Reporting settings in Kibana
+=== Reporting settings in {kib}
 ++++
 <titleabbrev>Reporting settings</titleabbrev>
 ++++

diff --git a/docs/settings/security-settings.asciidoc b/docs/settings/security-settings.asciidoc
@@ -1,6 +1,6 @@
 [role="xpack"]
 [[security-settings-kb]]
-=== Security settings in Kibana
+=== Security settings in {kib}
 ++++
 <titleabbrev>Security settings</titleabbrev>
 ++++

diff --git a/docs/settings/settings-xkb.asciidoc b/docs/settings/settings-xkb.asciidoc
@@ -1,9 +1,9 @@
 [role="xpack"]
 [[settings-xpack-kb]]
-== {xpack} Settings in {kib}
+== {xpack} settings in {kib}
 [subs="attributes"]
 ++++
-<titleabbrev>{xpack} Settings</titleabbrev>
+<titleabbrev>{xpack} settings</titleabbrev>
 ++++
 
 include::{asciidoc-dir}/../../shared/settings.asciidoc[]

diff --git a/docs/settings/telemetry-settings.asciidoc b/docs/settings/telemetry-settings.asciidoc
@@ -1,5 +1,5 @@
 [[telemetry-settings-kbn]]
-=== Telemetry settings in Kibana
+=== Telemetry settings in {kib}
 ++++
 <titleabbrev>Telemetry settings</titleabbrev>
 ++++

diff --git a/docs/setup/access.asciidoc b/docs/setup/access.asciidoc
@@ -1,5 +1,5 @@
 [[access]]
-== Accessing Kibana
+== Access {kib}
 
 Kibana is a web application that you access through port 5601. All you need to do is point your web browser at the
 machine where Kibana is running and specify the port number. For example, `localhost:5601` or `http://YOURDOMAIN.com:5601`.
@@ -13,7 +13,7 @@ If you still don't see any results, it's possible that you don't *have* any docu
 
 [float]
 [[status]]
-=== Checking Kibana Status
+=== Check {kib} status
 
 You can reach the Kibana server's status page by navigating to the status endpoint, for example, `localhost:5601/status`. The status page displays
 information about the server's resource usage and lists the installed plugins.

diff --git a/docs/setup/connect-to-elasticsearch.asciidoc b/docs/setup/connect-to-elasticsearch.asciidoc
@@ -1,5 +1,5 @@
 [[connect-to-elasticsearch]]
-== Adding data
+== Add data to {kib}
 
 To start working with your data in {kib}, you can:
 

diff --git a/docs/setup/docker.asciidoc b/docs/setup/docker.asciidoc
@@ -1,5 +1,5 @@
 [[docker]]
-== Running Kibana on Docker
+=== Install Kibana with Docker
 Docker images for Kibana are available from the Elastic Docker registry. The
 base image is https://hub.docker.com/_/centos/[centos:7].
 
@@ -16,7 +16,7 @@ Elastic license levels.
 
 [float]
 [[pull-image]]
-=== Pulling the image
+=== Pull the image
 
 Obtaining Kibana for Docker is as simple as issuing a +docker pull+ command
 against the Elastic Docker registry.
@@ -40,7 +40,7 @@ available under the Apache 2.0 license. To download the images, go to
 https://www.docker.elastic.co[www.docker.elastic.co].
 
 [float]
-=== Running Kibana on Docker for development
+=== Run Kibana on Docker for development
 Kibana can be quickly started and connected to a local Elasticsearch container for development
 or testing use with the following command:
 --------------------------------------------
@@ -50,7 +50,7 @@ endif::[]
 
 [float]
 [[configuring-kibana-docker]]
-=== Configuring Kibana on Docker
+=== Configure Kibana on Docker
 
 The Docker images provide several methods for configuring Kibana. The
 conventional approach is to provide a `kibana.yml` file as described in

diff --git a/docs/setup/install.asciidoc b/docs/setup/install.asciidoc
@@ -1,13 +1,13 @@
 [[install]]
-== Installing Kibana
+== Install {kib}
 
 [float]
-=== Hosted Kibana
+=== Hosted {kib}
 
 If you are running our hosted Elasticsearch Service on Elastic Cloud, you access Kibana with a single click. (You can {ess-trial}[sign up for a free trial] and start exploring data in minutes.)
 
 [float]
-=== Installing Kibana Yourself
+=== Install {kib} yourself
 
 NOTE: Starting with version 6.0.0, Kibana only supports 64 bit operating systems.
 
@@ -59,10 +59,12 @@ additional setup instructions.
 
 include::install/targz.asciidoc[]
 
+include::install/windows.asciidoc[]
+
 include::install/deb.asciidoc[]
 
 include::install/rpm.asciidoc[]
 
-include::install/windows.asciidoc[]
+include::{kib-repo-dir}/setup/docker.asciidoc[]
 
 include::install/brew.asciidoc[]
diff --git a/docs/setup/install/brew-running.asciidoc b/docs/setup/install/brew-running.asciidoc
@@ -1,6 +1,6 @@
-==== Running Kibana with `brew services`
+==== Run {kib} with `brew services`
 
-With Homebrew, Kibana can be started and stopped as follows: 
+With Homebrew, Kibana can be started and stopped as follows:
 
 [source,sh]
 --------------------------------------------------

diff --git a/docs/setup/install/deb-init.asciidoc b/docs/setup/install/deb-init.asciidoc
@@ -1,4 +1,4 @@
-==== Running Kibana with SysV `init`
+==== Run {kib} with SysV `init`
 
 Use the `update-rc.d` command to configure Kibana to start automatically
 when the system boots up:
@@ -18,4 +18,3 @@ sudo -i service kibana stop
 
 If Kibana fails to start for any reason, it will print the reason for
 failure to `STDOUT`. Log files can be found in `/var/log/kibana/`.
-
diff --git a/docs/setup/install/deb.asciidoc b/docs/setup/install/deb.asciidoc
@@ -1,23 +1,23 @@
 [[deb]]
-=== Install Kibana with Debian Package
+=== Install {kib} with Debian package
 
 The Debian package for Kibana can be <<install-deb,downloaded from our website>>
 or from our <<deb-repo,APT repository>>. It can be used to install
 Kibana on any Debian-based system such as Debian and Ubuntu.
 
-This package is free to use under the Elastic license. It contains open source 
-and free commercial features and access to paid commercial features. 
-{stack-ov}/license-management.html[Start a 30-day trial] to try out all of the 
-paid commercial features. See the 
-https://www.elastic.co/subscriptions[Subscriptions] page for information about 
+This package is free to use under the Elastic license. It contains open source
+and free commercial features and access to paid commercial features.
+{stack-ov}/license-management.html[Start a 30-day trial] to try out all of the
+paid commercial features. See the
+https://www.elastic.co/subscriptions[Subscriptions] page for information about
 Elastic license levels.
 
 The latest stable version of Kibana can be found on the
 link:/downloads/kibana[Download Kibana] page. Other versions can
 be found on the link:/downloads/past-releases[Past Releases page].
 
 [[deb-key]]
-==== Import the Elastic PGP Key
+==== Import the Elastic PGP key
 
 include::key.asciidoc[]
 
@@ -27,7 +27,7 @@ wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add
 -------------------------
 
 [[deb-repo]]
-==== Installing from the APT repository
+==== Install from the APT repository
 
 ifeval::["{release-state}"=="unreleased"]
 
@@ -151,9 +151,9 @@ sudo dpkg -i kibana-{version}-amd64.deb
 <1> Compare the SHA produced by `shasum` with the
     https://artifacts.elastic.co/downloads/kibana/kibana-{version}-amd64.deb.sha512[published SHA].
 
-Alternatively, you can download the following package, which contains only 
-features that are available under the Apache 2.0 license: 
-https://artifacts.elastic.co/downloads/kibana/kibana-oss-{version}-amd64.deb    
+Alternatively, you can download the following package, which contains only
+features that are available under the Apache 2.0 license:
+https://artifacts.elastic.co/downloads/kibana/kibana-oss-{version}-amd64.deb
 
 endif::[]
 
@@ -169,7 +169,7 @@ include::deb-init.asciidoc[]
 include::systemd.asciidoc[]
 
 [[deb-configuring]]
-==== Configuring Kibana via config file
+==== Configure {kib} via the config file
 
 Kibana loads its configuration from the `/etc/kibana/kibana.yml`
 file by default.  The format of this config file is explained in
@@ -205,7 +205,7 @@ locations for a Debian-based system:
   | The location of the data files written to disk by Kibana and its plugins
   | /var/lib/kibana
   | path.data
-  
+
 | logs
     | Logs files location
     |  /var/log/kibana

diff --git a/docs/setup/install/rpm-init.asciidoc b/docs/setup/install/rpm-init.asciidoc
@@ -1,4 +1,4 @@
-==== Running Kibana with SysV `init`
+==== Run {kib} with SysV `init`
 
 Use the `chkconfig` command to configure Kibana to start automatically
 when the system boots up:

diff --git a/docs/setup/install/rpm.asciidoc b/docs/setup/install/rpm.asciidoc
@@ -1,5 +1,5 @@
 [[rpm]]
-=== Install Kibana with RPM
+=== Install {kib} with RPM
 
 The RPM for Kibana can be <<install-rpm,downloaded from our website>>
 or from our <<rpm-repo,RPM repository>>. It can be used to install
@@ -9,19 +9,19 @@ and Oracle Enterprise.
 NOTE: RPM install is not supported on distributions with old versions of RPM,
 such as SLES 11 and CentOS 5.  Please see <<targz>> instead.
 
-This package is free to use under the Elastic license. It contains open source 
-and free commercial features and access to paid commercial features. 
-{stack-ov}/license-management.html[Start a 30-day trial] to try out all of the 
-paid commercial features. See the 
-https://www.elastic.co/subscriptions[Subscriptions] page for information about 
+This package is free to use under the Elastic license. It contains open source
+and free commercial features and access to paid commercial features.
+{stack-ov}/license-management.html[Start a 30-day trial] to try out all of the
+paid commercial features. See the
+https://www.elastic.co/subscriptions[Subscriptions] page for information about
 Elastic license levels.
 
 The latest stable version of Kibana can be found on the
 link:/downloads/kibana[Download Kibana] page. Other versions can
 be found on the link:/downloads/past-releases[Past Releases page].
 
 [[rpm-key]]
-==== Import the Elastic PGP Key
+==== Import the Elastic PGP key
 
 include::key.asciidoc[]
 
@@ -143,9 +143,9 @@ sudo rpm --install kibana-{version}-x86_64.rpm
 <1> Compare the SHA produced by `shasum` with the
     https://artifacts.elastic.co/downloads/kibana/kibana-{version}-x86_64.rpm.sha512[published SHA].
 
-Alternatively, you can download the following package, which contains only 
+Alternatively, you can download the following package, which contains only
 features that are available under the Apache 2.0 license:
-https://artifacts.elastic.co/downloads/kibana/kibana-oss-{version}-x86_64.rpm  
+https://artifacts.elastic.co/downloads/kibana/kibana-oss-{version}-x86_64.rpm
 
 endif::[]
 
@@ -160,7 +160,7 @@ include::rpm-init.asciidoc[]
 include::systemd.asciidoc[]
 
 [[rpm-configuring]]
-==== Configuring Kibana via config file
+==== Configure {kib} via the config file
 
 Kibana loads its configuration from the `/etc/kibana/kibana.yml`
 file by default.  The format of this config file is explained in
@@ -196,7 +196,7 @@ locations for an RPM-based system:
   | The location of the data files written to disk by Kibana and its plugins
   | /var/lib/kibana
   | path.data
-  
+
 | logs
     | Logs files location
     |  /var/log/kibana