From 67d91741ec75ab04e17658fc8ce3fc41a2dd15e9 Mon Sep 17 00:00:00 2001
From: Klaas Schoute <klaas_schoute@hotmail.com>
Date: Sat, 23 Feb 2019 10:15:22 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9C=20Merges/Redirect=20Doorbird=20com?=
 =?UTF-8?q?ponent=20pages=20(#8702)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/_components/camera.doorbird.markdown | 30 --------------
 source/_components/doorbird.markdown        | 46 +++++++++++++++++----
 source/_components/switch.doorbird.markdown | 28 -------------
 3 files changed, 38 insertions(+), 66 deletions(-)
 delete mode 100644 source/_components/camera.doorbird.markdown
 delete mode 100644 source/_components/switch.doorbird.markdown

diff --git a/source/_components/camera.doorbird.markdown b/source/_components/camera.doorbird.markdown
deleted file mode 100644
index 86e7c3c5f01..00000000000
--- a/source/_components/camera.doorbird.markdown
+++ /dev/null
@@ -1,30 +0,0 @@
----
-layout: page
-title: "DoorBird Camera"
-description: "Instructions on how to integrate DoorBird video doorbell images into Home Assistant."
-date: 2017-08-06 11:30
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: doorbird.png
-ha_category: Camera
-ha_release: "0.54"
-ha_iot_class: "Local Polling"
----
-
-The `doorbird` implementation allows you to view the live video, the last doorbell ring image, and the last motion sensor image from your [DoorBird](http://www.doorbird.com/) device in Home Assistant.
-
-<p class='note'>
-  You must have the [DoorBird component](/components/doorbird/) configured to use this camera.
-</p>
-
-## {% linkable_title Configuration %}
-
-To enable the camera, add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-camera:
-  - platform: doorbird
-```
diff --git a/source/_components/doorbird.markdown b/source/_components/doorbird.markdown
index 111f79f1b2d..42284722111 100644
--- a/source/_components/doorbird.markdown
+++ b/source/_components/doorbird.markdown
@@ -8,13 +8,24 @@ comments: false
 sharing: true
 footer: true
 logo: doorbird.png
-ha_category: Doorbell
+ha_category:
+  - Doorbell
+  - Camera
+  - Switch
 ha_release: "0.54"
 ha_iot_class: "Local Push"
+redirect_from:
+  - /components/camera.doorbird/
+  - /components/switch.doorbird/
 ---
 
 The `doorbird` implementation allows you to integrate your [DoorBird](http://www.doorbird.com/) device in Home Assistant.
 
+There is currently support for the following device types within Home Assistant:
+
+- [Camera](#camera) - View live and historical event based images.
+- [Switch](#switch) - Enable control of relays and camera night vision.
+
 ## {% linkable_title Setup %}
 
 The user, which you are going to use with Home Assistant, needs the "API-Operator" permission enabled.
@@ -77,15 +88,8 @@ devices:
 
 {% endconfiguration %}
 
-The configuration above is also used by the following platforms:
-
-- [Camera](/components/camera.doorbird): View live and historical event based images.
-- [Switch](/components/switch.doorbird): Enable control of relays and camera night vision.
-
-
 ## {% linkable_title Full example %}
 
-
 ```yaml
 doorbird:
   token: YOUR_DOORBIRD_TOKEN
@@ -144,3 +148,29 @@ The URLs on the event will be based on the configuration used to connect to your
     service: light.turn_on
       entity_id: light.side_entry_porch
 ```
+
+## {% linkable_title Camera %}
+
+The `doorbird` implementation allows you to view the live video, the last doorbell ring image, and the last motion sensor image from your [DoorBird](http://www.doorbird.com/) device in Home Assistant.
+
+### {% linkable_title Configuration %}
+
+To enable the camera, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+camera:
+  - platform: doorbird
+```
+
+## {% linkable_title Switch %}
+
+The `doorbird` switch platform allows you to power connected relays and trigger the IR array in your [DoorBird](http://www.doorbird.com/) video doorbell device.
+
+To enable this switch, add the following lines to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+switch:
+  - platform: doorbird
+```
\ No newline at end of file
diff --git a/source/_components/switch.doorbird.markdown b/source/_components/switch.doorbird.markdown
deleted file mode 100644
index 7c78a4b8a0b..00000000000
--- a/source/_components/switch.doorbird.markdown
+++ /dev/null
@@ -1,28 +0,0 @@
----
-layout: page
-title: "DoorBird Switch"
-description: "Instructions on how to integrate DoorBird video doorbell relays into Home Assistant."
-date: 2017-08-06 11:30
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: doorbird.png
-ha_category: Switch
-ha_release: "0.54"
-ha_iot_class: "Local Push"
----
-
-The `doorbird` switch platform allows you to power connected relays and trigger the IR array in your [DoorBird](http://www.doorbird.com/) video doorbell device.
-
-<p class='note'>
-You must have the [DoorBird component](/components/doorbird/) configured to use this switch.
-</p>
-
-To enable this switch, add the following lines to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-switch:
-  - platform: doorbird
-```