From 37e3745f717e0a898414dc26badf671d2ebb2e15 Mon Sep 17 00:00:00 2001
From: Klaas Schoute <klaas_schoute@hotmail.com>
Date: Thu, 4 Apr 2019 14:32:40 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9C=20Merges/Redirect=20Bbox=20platfor?=
 =?UTF-8?q?m=20pages=20(#9124)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/_components/bbox.markdown              | 54 ++++++++++++++++---
 .../_components/device_tracker.bbox.markdown  | 47 ----------------
 2 files changed, 48 insertions(+), 53 deletions(-)
 delete mode 100644 source/_components/device_tracker.bbox.markdown

diff --git a/source/_components/bbox.markdown b/source/_components/bbox.markdown
index 6e24792e748..402228e8cc7 100644
--- a/source/_components/bbox.markdown
+++ b/source/_components/bbox.markdown
@@ -1,27 +1,69 @@
 ---
 layout: page
-title: "Bbox Sensor"
-description: "How to integrate Bbox Bandwidth measuring within Home Assistant."
+title: "Bbox"
+description: "Instructions on how to integrate Bouygues Bbox routers into Home Assistant."
 date: 2016-10-22 01:00
 sidebar: true
 comments: false
 sharing: true
 footer: true
 logo: bbox.png
-ha_category: Network
+ha_category:
+  - Network
+  - Sensor
+  - Presence Detection
 ha_release: 0.31
-ha_iot_class: Local Push
+ha_iot_class: Local Polling
 redirect_from:
  - /components/sensor.bbox/
+ - /components/device_tracker.bbox/
 ---
 
 The `bbox` platform uses the [Bbox Modem Router](https://fr.wikipedia.org/wiki/Bbox/) from the French Internet provider Bouygues Telecom. Sensors are mainly bandwidth measures.
 
+There is currently support for the following device types within Home Assistant:
+
+- [Presence Detection](#presence-detection)
+- [Sensor](#sensor)
+
 <p class='note warning'>
 Due to third party limitation, the sensors will only be available if Home Assistant and the Bbox are on the same local area network. You can check this by going to 192.168.1.254 with your web browser.
 </p>
 
-## {% linkable_title Configuration %}
+## {% linkable_title Presence Detection %}
+
+The `bbox` platform offers presence detection by looking at connected devices to a [Bbox](https://fr.wikipedia.org/wiki/Bbox) based router from [Bouygues](https://www.bouyguestelecom.fr/), which is one of the main Internet provider in France.
+
+Bbox is a generic name for different hardware routers. The platform has been tested with the following devices:
+
+- Sagem F@st 5330b
+
+### {% linkable_title Configuration %}
+
+To use an Bbox router in your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+device_tracker:
+  - platform: bbox
+```
+
+{% configuration %}
+host:
+  description: IP address of your Bbox device.
+  required: false
+  type: string
+  default: 192.168.1.254
+{% endconfiguration %}
+
+
+<p class='note warning'>
+For now and due to third party limitation, the Bbox must be on the same local network as the Home Assistant installation.
+</p>
+
+See the [device tracker component page](/components/device_tracker/) for instructions how to configure the people to be tracked.
+
+## {% linkable_title Sensor %}
 
 To add Bbox sensors to your installation, add the following to your `configuration.yaml` file:
 
@@ -55,4 +97,4 @@ monitored_variables:
       description: Instant measure of the current used bandwidth for download.
     current_up_bandwidth:
       description: Instant measure of the current used bandwidth for upload.
-{% endconfiguration %}
+{% endconfiguration %}
\ No newline at end of file
diff --git a/source/_components/device_tracker.bbox.markdown b/source/_components/device_tracker.bbox.markdown
deleted file mode 100644
index 6247246d64d..00000000000
--- a/source/_components/device_tracker.bbox.markdown
+++ /dev/null
@@ -1,47 +0,0 @@
----
-layout: page
-title: "Bbox"
-description: "Instructions on how to integrate Bouygues Bbox routers into Home Assistant."
-date: 2016-10-13 23:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: bbox.png
-ha_category: Presence Detection
-ha_release: 0.31
-ha_iot_class: Local Polling
----
-
-
-The `bbox` platform offers presence detection by looking at connected devices to a [Bbox](https://fr.wikipedia.org/wiki/Bbox) based router from [Bouygues](https://www.bouyguestelecom.fr/), which is one of the main Internet provider in France.
-
-Bbox is a generic name for different hardware routers. The platform has been tested with the following devices:
-
-- Sagem F@st 5330b
-
-## {% linkable_title Configuration %}
-
-To use an Bbox router in your installation, add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-device_tracker:
-  - platform: bbox
-```
-
-{% configuration %}
-host:
-  description: IP address of your Bbox device.
-  required: false
-  type: string
-  default: 192.168.1.254
-{% endconfiguration %}
-
-
-<p class='note warning'>
-For now and due to third party limitation, the Bbox must be on the same local network as the Home Assistant installation.
-</p>
-
-See the [device tracker component page](/components/device_tracker/) for instructions how to configure the people to be tracked.
-