From 7ad162c94c3a2ae23db0b1ad4dcec7c84a002557 Mon Sep 17 00:00:00 2001
From: Klaas Schoute <klaas_schoute@hotmail.com>
Date: Thu, 14 Feb 2019 10:21:27 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9C=20Merges/Redirect=20Elk-M1=20compo?=
 =?UTF-8?q?nent=20pages=20(#8566)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alarm_control_panel.elkm1.markdown        | 22 ---------------
 source/_components/climate.elkm1.markdown     | 22 ---------------
 source/_components/elkm1.markdown             | 28 +++++++++++++++++--
 source/_components/light.elkm1.markdown       | 22 ---------------
 source/_components/scene.elkm1.markdown       | 22 ---------------
 source/_components/sensor.elkm1.markdown      | 22 ---------------
 source/_components/switch.elkm1.markdown      | 22 ---------------
 7 files changed, 26 insertions(+), 134 deletions(-)
 delete mode 100644 source/_components/alarm_control_panel.elkm1.markdown
 delete mode 100644 source/_components/climate.elkm1.markdown
 delete mode 100644 source/_components/light.elkm1.markdown
 delete mode 100644 source/_components/scene.elkm1.markdown
 delete mode 100644 source/_components/sensor.elkm1.markdown
 delete mode 100644 source/_components/switch.elkm1.markdown

diff --git a/source/_components/alarm_control_panel.elkm1.markdown b/source/_components/alarm_control_panel.elkm1.markdown
deleted file mode 100644
index 89a57e26fe4..00000000000
--- a/source/_components/alarm_control_panel.elkm1.markdown
+++ /dev/null
@@ -1,22 +0,0 @@
----
-layout: page
-title: "Elk-M1 Alarm Control Panel"
-description: "Instructions how to integrate Elk M1 alarm control panel."
-date: 2018-10-07 00:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: elkproducts.png
-ha_release: 0.81
-ha_category: Alarm
-ha_iot_class: "Local Push"
----
-
-The `elkm1` platform allows you to control your [Elk-M1](https://www.elkproducts.com/m1_controls.html).
-
-An Elk-M1 area (also known as partition) is represented as an `alarm_control_panel`.
-
-<p class='note'>
-Full configuration details can be found on the main [Elk-M1 component](/components/elkm1/) page.
-</p>
diff --git a/source/_components/climate.elkm1.markdown b/source/_components/climate.elkm1.markdown
deleted file mode 100644
index b93f06baf87..00000000000
--- a/source/_components/climate.elkm1.markdown
+++ /dev/null
@@ -1,22 +0,0 @@
----
-layout: page
-title: "Elk-M1 Thermostat"
-description: "Instructions how to integrate Elk-M1 thermostats."
-date: 2018-10-20 00:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: elkproducts.png
-ha_release: 0.81
-ha_category: Climate
-ha_iot_class: "Local Push"
----
-
-The `elkm1` platform allows you to control your [Elk-M1](https://www.elkproducts.com/m1_controls.html).
-
-An Elk-M1 thermostat is represented as a `climate` entity.
-
-<p class='note'>
-Full configuration details can be found on the main [Elk-M1 component](/components/elkm1/) page.
-</p>
diff --git a/source/_components/elkm1.markdown b/source/_components/elkm1.markdown
index 02f567db96c..3593bce7fbc 100644
--- a/source/_components/elkm1.markdown
+++ b/source/_components/elkm1.markdown
@@ -9,14 +9,37 @@ sharing: true
 footer: true
 logo: elkproducts.png
 ha_release: 0.81
-ha_category: Hub
+ha_category:
+  - Hub
+  - Alarm
+  - Climate
+  - Light
+  - Scene
+  - Sensor
+  - Switch
 ha_iot_class: "Local Push"
+redirect_from:
+  - /components/alarm_control_panel.elkm1/
+  - /components/climate.elkm1/
+  - /components/light.elkm1/
+  - /components/scene.elkm1/
+  - /components/sensor.elkm1/
+  - /components/switch.elkm1/
 ---
 
 The Elk-M1 is a home security and automation controller that is capable of alarm control panel functions and automation.
 
 The Elk-M1 controller is manufactured by [Elk Products](https://www.elkproducts.com).
 
+There is currently support for the following device types within Home Assistant:
+
+- **Alarm** - An Elk-M1 area (also known as partition) is represented as an `alarm_control_panel`.
+- **Climate** - An Elk-M1 thermostat is represented as a `climate` entity.
+- **Light** - An Elk-M1 light (which can be X10, Insteon, UPB) is represented as a `light`.
+- **Scene** - Elk-M1 tasks are represented as `scene` entities.
+- **Sensor** - Elk-M1 counters, keypads, panel, settings, and zones are represented as `sensor` entities.
+- **Switch** - Elk-M1 outputs are represented as `switch` entities.
+
 ## {% linkable_title Configuration %}
 
 To integrate Elk-M1 controller with Home Assistant, add the following
@@ -238,6 +261,7 @@ zone:
 {% endconfiguration %}
 
 Example configuration of the above:
+
 ```yaml
 elkm1:
   host: elks://IP_ADDRESS
@@ -253,6 +277,7 @@ elkm1:
 ```
 
 Example for a serial port instance on /dev/ttyS1 at 9600 baud:
+
 ```yaml
 elkm1:
   host: serial://dev/ttyS1:9600
@@ -266,4 +291,3 @@ elkm1:
     include: [a1-d16, 192]
     exclude: [b12-d5]
 ```
-
diff --git a/source/_components/light.elkm1.markdown b/source/_components/light.elkm1.markdown
deleted file mode 100644
index 2dfa79a4114..00000000000
--- a/source/_components/light.elkm1.markdown
+++ /dev/null
@@ -1,22 +0,0 @@
----
-layout: page
-title: "Elk-M1 Light"
-description: "Instructions how to integrate Elk-M1 light."
-date: 2018-10-07 00:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: elkproducts.png
-ha_release: 0.81
-ha_category: Light
-ha_iot_class: "Local Push"
----
-
-The `elkm1` platform allows you to control your [Elk-M1](https://www.elkproducts.com/m1_controls.html).
-
-An Elk-M1 light (which can be X10, Insteon, UPB) is represented as a `light`.
-
-<p class='note'>
-Full configuration details can be found on the main [Elk-M1 component](/components/elkm1/) page.
-</p>
diff --git a/source/_components/scene.elkm1.markdown b/source/_components/scene.elkm1.markdown
deleted file mode 100644
index 346e54be32a..00000000000
--- a/source/_components/scene.elkm1.markdown
+++ /dev/null
@@ -1,22 +0,0 @@
----
-layout: page
-title: "Elk-M1 Scene"
-description: "Instructions on how to integrate Elk-M1 tasks (macros)."
-date: 2018-10-07 00:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: elkproducts.png
-ha_release: 0.81
-ha_category: Scene
-ha_iot_class: "Local Push"
----
-
-The `elkm1` platform allows you to control your [Elk-M1](https://www.elkproducts.com/m1_controls.html).
-
-Elk-M1 tasks are represented as `scene` entities.
-
-<p class='note'>
-Full configuration details can be found on the main [Elk-M1 component](/components/elkm1/) page.
-</p>
diff --git a/source/_components/sensor.elkm1.markdown b/source/_components/sensor.elkm1.markdown
deleted file mode 100644
index 97216415589..00000000000
--- a/source/_components/sensor.elkm1.markdown
+++ /dev/null
@@ -1,22 +0,0 @@
----
-layout: page
-title: "Elk-M1 Sensor"
-description: "Instructions on how to integrate Elk-M1 counters, keypads, panel, settings, and zones."
-date: 2018-10-11 00:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: elkproducts.png
-ha_release: 0.81
-ha_category: Sensor
-ha_iot_class: "Local Push"
----
-
-The `elkm1` platform allows you to control your [Elk-M1](https://www.elkproducts.com/m1_controls.html).
-
-Elk-M1 counters, keypads, panel, settings, and zones are represented as `sensor` entities.
-
-<p class='note'>
-Full configuration details can be found on the main [Elk-M1 component](/components/elkm1/) page.
-</p>
diff --git a/source/_components/switch.elkm1.markdown b/source/_components/switch.elkm1.markdown
deleted file mode 100644
index 8ef52a09af6..00000000000
--- a/source/_components/switch.elkm1.markdown
+++ /dev/null
@@ -1,22 +0,0 @@
----
-layout: page
-title: "Elk-M1 Switch"
-description: "Instructions on how to integrate Elk-M1 outputs (relays)."
-date: 2018-10-07 00:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: elkproducts.png
-ha_release: 0.81
-ha_category: Switch
-ha_iot_class: "Local Push"
----
-
-The `elkm1` platform allows you to control your [Elk-M1](https://www.elkproducts.com/m1_controls.html).
-
-Elk-M1 outputs are represented as `switch` entities.
-
-<p class='note'>
-Full configuration details can be found on the main [Elk-M1 component](/components/elkm1/) page.
-</p>