From 1b6e72168ccfe6fe7ad902c4d450893fd9cbb4b1 Mon Sep 17 00:00:00 2001
From: Klaas Schoute <klaas_schoute@hotmail.com>
Date: Tue, 26 Feb 2019 15:23:13 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9C=20Merges/Redirect=20Mochad=20compo?=
 =?UTF-8?q?nent=20pages=20(#8738)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/_components/light.mochad.markdown  | 49 --------------
 source/_components/mochad.markdown        | 82 ++++++++++++++++++++++-
 source/_components/switch.mochad.markdown | 45 -------------
 3 files changed, 81 insertions(+), 95 deletions(-)
 delete mode 100644 source/_components/light.mochad.markdown
 delete mode 100644 source/_components/switch.mochad.markdown

diff --git a/source/_components/light.mochad.markdown b/source/_components/light.mochad.markdown
deleted file mode 100644
index c175d48ffd1..00000000000
--- a/source/_components/light.mochad.markdown
+++ /dev/null
@@ -1,49 +0,0 @@
----
-layout: page
-title: "Mochad Light"
-description: "Instructions on how to integrate X10 Mochad lights into Home Assistant."
-date: 2017-07-14 11:29
-sidebar: true
-comments: false
-sharing: true
-footer: true
-ha_category: Light
-ha_release: 0.51
----
-
-The `mochad` light platform lets you control an X10 enabled dimmer/light device.
-
-
-
-To enable this sensor, you first have to set up the [mochad component](/components/mochad/) and then add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-light:
-  - platform: mochad
-    devices:
-      - address: a1
-      - address: a5
-```
-
-{% configuration %}
-address:
-  description: The X10 address of the light.
-  required: true
-  type: string
-name:
-  description: The name of the light.
-  required: false
-  default: x10_light_dev_address
-  type: string
-comm_type:
-  description: pl (powerline) or rf (radio frequency).
-  required: false
-  default: pl
-  type: string
-brightness_levels:
-  description: The number of brightness levels the X10 light device supports. This can either be 32, 64, or 256 (note that the max value sent to the device will be n-1 because it starts at 0).
-  required: false
-  default: 32
-  type: integer
-{% endconfiguration %}
diff --git a/source/_components/mochad.markdown b/source/_components/mochad.markdown
index 6df5d067876..a4873a903cf 100644
--- a/source/_components/mochad.markdown
+++ b/source/_components/mochad.markdown
@@ -7,12 +7,23 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
-ha_category: Hub
+ha_category:
+  - Hub
+  - Light
+  - Switch
 ha_release: 0.32
+redirect_from:
+  - /components/light.mochad/
+  - /components/switch.mochad/
 ---
 
 The `mochad` component is the main component to integrate all X10 platforms being controlled by [mochad](https://sourceforge.net/projects/mochad/). Besides this component you will have to setup your X10 devices separately.
 
+There is currently support for the following device types within Home Assistant:
+
+- [Light](#light)
+- [Switch](#switch)
+
 ## {% linkable_title Configuration %}
 
 To integrate your Mochad units with Home Assistant, add the following section to your `configuration.yaml` file:
@@ -45,3 +56,72 @@ mochad:
   host: localhost
   port: 1099
 ```
+
+## {% linkable_title Light %}
+
+The `mochad` light platform lets you control an X10 enabled dimmer/light device.
+
+To enable this sensor, you first have to set up the [mochad component](#configuration) and then add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+light:
+  - platform: mochad
+    devices:
+      - address: a1
+      - address: a5
+```
+
+{% configuration %}
+address:
+  description: The X10 address of the light.
+  required: true
+  type: string
+name:
+  description: The name of the light.
+  required: false
+  default: x10_light_dev_address
+  type: string
+comm_type:
+  description: pl (powerline) or rf (radio frequency).
+  required: false
+  default: pl
+  type: string
+brightness_levels:
+  description: The number of brightness levels the X10 light device supports. This can either be 32, 64, or 256 (note that the max value sent to the device will be n-1 because it starts at 0).
+  required: false
+  default: 32
+  type: integer
+{% endconfiguration %}
+
+## {% linkable_title Switch %}
+
+The `mochad` switch platform lets you control an X10 enabled switch device.
+
+To enable this sensor, you first have to set up the [mochad component](#configuration) and then add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+switch:
+  - platform: mochad
+    devices:
+      - address: a1
+      - address: a5
+```
+
+{% configuration %}
+address:
+  description: The X10 address of the switch.
+  required: true
+  type: string
+name:
+  description: The name of the switch.
+  required: false
+  default: x10_switch_dev_*address*
+  type: string
+comm_type:
+  description: pl (powerline) or rf (radio frequency).
+  required: false
+  default: pl
+  type: string
+{% endconfiguration %}
\ No newline at end of file
diff --git a/source/_components/switch.mochad.markdown b/source/_components/switch.mochad.markdown
deleted file mode 100644
index 6d9c2bba878..00000000000
--- a/source/_components/switch.mochad.markdown
+++ /dev/null
@@ -1,45 +0,0 @@
----
-layout: page
-title: "Mochad Switch"
-description: "Instructions on how to integrate X10 Mochad switches into Home Assistant."
-date: 2016-10-20 21:13
-sidebar: true
-comments: false
-sharing: true
-footer: true
-ha_category: Switch
-ha_iot_class: depends
-ha_release: 0.32
----
-
-The `mochad` switch platform lets you control an X10 enabled switch device.
-
-## {% linkable_title Configuration %}
-
-To enable this sensor, you first have to set up the [mochad component](/components/mochad/) and then add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-switch:
-  - platform: mochad
-    devices:
-      - address: a1
-      - address: a5
-```
-
-{% configuration %}
-address:
-  description: The X10 address of the switch.
-  required: true
-  type: string
-name:
-  description: The name of the switch.
-  required: false
-  default: x10_switch_dev_*address*
-  type: string
-comm_type:
-  description: pl (powerline) or rf (radio frequency).
-  required: false
-  default: pl
-  type: string
-{% endconfiguration %}