From e5bfaf5dad517a2e86f0873513893598c9df057c Mon Sep 17 00:00:00 2001
From: Klaas Schoute <klaas_schoute@hotmail.com>
Date: Thu, 14 Feb 2019 20:40:01 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9C=20Merges/Redirect=20Apple=20TV=20c?=
 =?UTF-8?q?omponent=20pages=20(#8580)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/_components/apple_tv.markdown          | 40 ++++++++++++++++++-
 .../media_player.apple_tv.markdown            | 16 --------
 source/_components/remote.apple_tv.markdown   | 40 -------------------
 3 files changed, 39 insertions(+), 57 deletions(-)
 delete mode 100644 source/_components/media_player.apple_tv.markdown
 delete mode 100644 source/_components/remote.apple_tv.markdown

diff --git a/source/_components/apple_tv.markdown b/source/_components/apple_tv.markdown
index ae960ef1620..94c89c1d28c 100644
--- a/source/_components/apple_tv.markdown
+++ b/source/_components/apple_tv.markdown
@@ -8,13 +8,24 @@ comments: false
 sharing: true
 footer: true
 logo: apple.png
-ha_category: Multimedia
+ha_category:
+  - Multimedia
+  - Media Player
+  - Remote
 ha_iot_class: "Local Push"
 ha_release: 0.49
+redirect_from:
+  - /components/media_player.apple_tv/
+  - /components/remote.apple_tv/
 ---
 
 The `apple_tv` platform allows you to control an Apple TV (3rd and 4th generation). See the [remote platform](/components/remote.apple_tv/) if you want to send remote control buttons, e.g., arrow keys.
 
+There is currently support for the following device types within Home Assistant:
+
+- Media Player
+- [Remote](#remote)
+
 <p class='note'>
 Currently, you must have Home Sharing enabled for this to work. Support for pairing Home Assistant with your device will be supported in a later release.
 </p>
@@ -160,3 +171,30 @@ To play media on an Apple TV with device authentication enabled (e.g., ATV4 with
 ### {% linkable_title Service `apple_tv_scan` %}
 
 Scans the local network for Apple TVs. All found devices are presented as a persistent notification.
+
+## {% linkable_title Remote %}
+
+The `apple_tv` remote platform allows you to send remote control buttons to an Apple TV. It is automatically setup when an Apple TV is configured.
+
+At the moment, the following buttons are supported:
+
+- up
+- down
+- left
+- right
+- menu
+- top_menu
+- select
+
+A typical service call for press several buttons looks like this.
+
+```yaml
+service: remote.send_command
+data:
+  entity_id: remote.apple_tv
+  command:
+    - left
+    - left
+    - menu
+    - select
+```
\ No newline at end of file
diff --git a/source/_components/media_player.apple_tv.markdown b/source/_components/media_player.apple_tv.markdown
deleted file mode 100644
index 7b163077602..00000000000
--- a/source/_components/media_player.apple_tv.markdown
+++ /dev/null
@@ -1,16 +0,0 @@
----
-layout: page
-title: "Apple TV Media Player"
-description: "Instructions on how to integrate Apple TV devices into Home Assistant."
-date: 2017-02-08 07:11
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: apple.png
-ha_category: Media Player
-ha_iot_class: "Local Push"
-ha_release: 0.38
----
-
-To setup the `apple_tv` media player platform, please follow the instructions on the [Apple TV Component page](/components/apple_tv/).
diff --git a/source/_components/remote.apple_tv.markdown b/source/_components/remote.apple_tv.markdown
deleted file mode 100644
index 7fe3bc7f9af..00000000000
--- a/source/_components/remote.apple_tv.markdown
+++ /dev/null
@@ -1,40 +0,0 @@
----
-layout: page
-title: "Apple TV Remote"
-description: "Instructions on how to integrate Apple TV remote into Home Assistant."
-date: 2017-06-26 20:50
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: apple.png
-ha_category: Remote
-ha_iot_class: "Local Push"
-ha_release: 0.49
----
-
-
-The `apple_tv` remote platform allows you to send remote control buttons to an Apple TV. It is automatically setup when an Apple TV is configured, please see [Apple TV Component](/components/apple_tv/) for configuration details.
-
-At the moment, the following buttons are supported:
-
-- up
-- down
-- left
-- right
-- menu
-- top_menu
-- select
-
-A typical service call for press several buttons looks like this.
-
-```yaml
-service: remote.send_command
-data:
-  entity_id: remote.apple_tv
-  command:
-    - left
-    - left
-    - menu
-    - select
-```