Merge branch 'current' into next

source/_components/binary_sensor.hive.markdown

@@ -1,25 +0,0 @@
----
-layout: page
-title: "Hive Binary Sensor"
-description: "Instructions on how to integrate Hive Sensors with Home Assistant."
-date: 2017-09-24 21:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: hive.png
-ha_category: Binary Sensor
-ha_release: 0.59
-ha_iot_class: "Cloud Polling"
----
-
-The `hive` binary sensor component integrates your Hive sensors into Home Assistant.
-
-The platform supports the following Hive products:
-
-- Hive Window or Door Sensor
-- Hive Motion Sensor
-
-<p class='note'>
-Full configuration details can be found on the main [Hive component](/components/hive/) page.
-</p>

source/_components/binary_sensor.mysensors.markdown

@@ -8,7 +8,9 @@ comments: false
 sharing: true
 footer: true
 logo: mysensors.png
-ha_category: DIY
+ha_category: 
+  - DIY
+  - Binary Sensor
 ha_release: 0.14
 ha_iot_class: "Local Push"
 ---

source/_components/climate.hive.markdown

@@ -1,32 +0,0 @@
----
-layout: page
-title: "Hive Thermostat"
-description: "Instructions on how to integrate Hive thermostat(s) with Home Assistant."
-date: 2017-09-24 21:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: hive.png
-ha_category: Climate
-ha_release: 0.59
-ha_iot_class: "Cloud Polling"
----
-
-
-The `hive` climate platform integrates your Hive thermostat and hot water into Home Assistant, enabling control of setting the **mode** and setting the **target temperature**.
-
-A short boost for Hive Heating or Hive Hot water can be set by using the **Aux Heat** function, this will turn on the boost feature for Hive Heating or Hive Hot water for 30 minutes at 0.5 degrees higher than the current temperature.
-
-The platform supports the following Hive products:
-
-- Hive Active Heating
-- Hive Multizone
-- Hot water control
-
-
-<p class='note'>
-Full configuration details can be found on the main [Hive component](/components/hive/) page.
-</p>
-
-

source/_components/climate.mysensors.markdown

@@ -8,7 +8,9 @@ comments: false
 sharing: true
 footer: true
 logo: mysensors.png
-ha_category: DIY
+ha_category:
+  - DIY
+  - Climate
 ha_release: 0.29
 ha_iot_class: "Local Push"
 ---

source/_components/cover.mysensors.markdown

@@ -8,7 +8,9 @@ comments: false
 sharing: true
 footer: true
 logo: mysensors.png
-ha_category: DIY
+ha_category:
+  - DIY
+  - Cover
 ha_release: "0.30"
 ha_iot_class: "Local Push"
 ---

source/_components/cover.tellstick.markdown

@@ -1,25 +0,0 @@
----
-layout: page
-title: "TellStick Cover"
-description: "Instructions on how to integrate TellStick covers into Home Assistant."
-date: 2017-11-29 16:23
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: telldus_tellstick.png
-ha_category: Cover
-ha_iot_class: "Assumed State"
-ha_release: "0.60"
----
-
-
-This `tellstick` cover platform allows you to control your [TellStick](http://www.telldus.se/products/tellstick) covers.
-
-To use your TellStick device, you first have to set up your [Tellstick hub](/components/tellstick/) and then add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-cover:
-  - platform: tellstick
-```

source/_components/device_tracker.mysensors.markdown

@@ -8,7 +8,9 @@ comments: false
 sharing: true
 footer: true
 logo: mysensors.png
-ha_category: DIY
+ha_category:
+  - DIY
+  - Presence Detection
 ha_release: "0.38"
 ha_iot_class: "Local Push"
 ---

source/_components/hive.markdown

@@ -8,17 +8,34 @@ comments: false
 sharing: true
 footer: true
 logo: hive.png
-ha_category: Hub
+ha_category:
+  - Hub
+  - Binary Sensor
+  - Climate
+  - Light
+  - Sensor
+  - Switch
 ha_release: 0.59
 ha_iot_class: "Cloud Polling"
+redirect_from:
+  - /components/binary_sensor.hive/
+  - /components/climate.hive/
+  - /components/light.hive/
+  - /components/sensor.hive/
+  - /components/switch.hive/
 ---
 
-
 The `hive` component is the main component to set up and integrate all supported Hive devices. Once configured with the minimum required details it will detect and add all your Hive devices into Home Assistant, including support for multizone heating.
 
 This component uses the unofficial API used in the official Hive website [https://my.hivehome.com](https://my.hivehome.com), and you will need to use the same Username and Password you use on the Hive website to configure this Hive component in Home Assistant.
 
+There is currently support for the following device types within Home Assistant:
 
+- [Binary Sensor](#binary-sensor)
+- [Climate](#climate)
+- [Light](#light)
+- [Sensor](#sensor)
+- [Switch](#switch)
 
 To add your Hive devices into your Home Assistant installation, add the following to your `configuration.yaml` file:
 
@@ -45,13 +62,50 @@ scan_interval:
   default: 2
 {% endconfiguration %}
 
+## {% linkable_title Binary Sensor %}
 
-The Hive Home Assistant platform currently supports the following Hive devices:
+The `hive` binary sensor component integrates your Hive sensors into Home Assistant.
+
+The platform supports the following Hive products:
+
+- Hive Window or Door Sensor
+- Hive Motion Sensor
+
+## {% linkable_title Climate %}
+
+The `hive` climate platform integrates your Hive thermostat and hot water into Home Assistant, enabling control of setting the **mode** and setting the **target temperature**.
+
+A short boost for Hive Heating or Hive Hot water can be set by using the **Aux Heat** function, this will turn on the boost feature for Hive Heating or Hive Hot water for 30 minutes at 0.5 degrees higher than the current temperature.
+
+The platform supports the following Hive products:
+
+- Hive Active Heating
+- Hive Multizone
+- Hot water control
+
+## {% linkable_title Light %}
+
+The `hive` light platform integrates your Hive lights into Home Assistant, enabling control of various settings, depending on the model light.
+
+The platform supports the following Hive products:
 
-- Hive Active Heating (including hot water and Hive Multizone)
 - Hive Active Light Dimmable
 - Hive Active Light Cool to Warm White
 - Hive Active Light Color Changing
+
+## {% linkable_title Sensor %}
+
+The `hive` sensor component exposes Hive data as a sensor.
+
+The platform exposes the following sensors:
+
+- Hive Hub Online Status
+- Hive Outside Temperature
+
+## {% linkable_title Switch %}
+
+The `hive` switch platform integrates your Hive plugs into Home Assistant, enabling control of your devices.
+
+The platform supports the following Hive products:
+
 - Hive Active Plug
-- Hive Window or Door Sensor
-- Hive Motion Sensor

source/_components/light.hive.markdown

@@ -1,30 +0,0 @@
----
-layout: page
-title: "Hive Light"
-description: "Instructions on how to integrate Hive lights with Home Assistant."
-date: 2017-09-24 21:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: hive.png
-ha_category: Light
-ha_release: 0.59
-ha_iot_class: "Cloud Polling"
----
-
-
-The `hive` light platform integrates your Hive lights into Home Assistant, enabling control of various settings, depending on the model light.
-
-The platform supports the following Hive products:
-
-- Hive Active Light Dimmable
-- Hive Active Light Cool to Warm White
-- Hive Active Light Color Changing
-
-
-<p class='note'>
-Full configuration details can be found on the main [Hive component](/components/hive/) page.
-</p>
-
-

source/_components/light.mysensors.markdown

@@ -8,7 +8,9 @@ comments: false
 sharing: true
 footer: true
 logo: mysensors.png
-ha_category: DIY
+ha_category:
+  - DIY
+  - Light
 ha_release: 0.13
 ha_iot_class: "Local Push"
 ---

source/_components/light.sisyphus.markdown

@@ -1,20 +0,0 @@
----
-layout: page
-title: "Sisyphus Light"
-description: "Instructions on how to integrate the light in your Sisyphus Kinetic Art Table into Home Assistant."
-date: 2018-05-06 22:26
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: sisyphus.png
-ha_category: Light
-ha_iot_class: "Local Push"
-ha_release: 0.75
----
-
-The [Sisyphus](https://sisyphus-industries.com/) integration for Home Assistant allows you to observe and control your Sisyphus Kinetic Art Table.
-
-Lights will be automatically added for each of your Sisyphus tables if the Sisyphus component is configured.
-
-For more configuration information see the [Sisyphus component](/components/sisyphus/) documentation.

source/_components/light.tellstick.markdown

@@ -1,24 +0,0 @@
----
-layout: page
-title: "TellStick Light"
-description: "Instructions on how to integrate TellStick lights into Home Assistant."
-date: 2015-08-06 19:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: telldus_tellstick.png
-ha_category: Light
-ha_iot_class: "Assumed State"
----
-
-
-This `tellstick` light platform allows you to control your [TellStick](http://www.telldus.se/products/tellstick) dimmers.
-
-To use your TellStick device, you first have to set up your [Tellstick hub](/components/tellstick/) and then add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-light:
-  platform: tellstick
-```

source/_components/media_player.sisyphus.markdown

@@ -1,20 +0,0 @@
----
-layout: page
-title: "Sisyphus Media Player"
-description: "Instructions on how to integrate media playing on your Sisyphus Kinetic Art Table into Home Assistant."
-date: 2018-05-06 22:26
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: sisyphus.png
-ha_category: Media Player
-ha_iot_class: "Local Push"
-ha_release: 0.75
----
-
-The [Sisyphus](https://sisyphus-industries.com/) integration for Home Assistant allows you to observe and control your Sisyphus Kinetic Art Table.
-
-Media players will be automatically added for each of your Sisyphus tables if the Sisyphus component is configured.
-
-For more configuration information see the [Sisyphus component](/components/sisyphus/) documentation.

source/_components/notify.mysensors.markdown

@@ -8,7 +8,9 @@ comments: false
 sharing: true
 footer: true
 logo: mysensors.png
-ha_category: DIY
+ha_category:
+  - DIY
+  - Notifications
 ha_release: 0.36
 ha_iot_class: "Local Push"
 ---

source/_components/ring.markdown

@@ -81,7 +81,7 @@ Currently it supports doorbell, external chimes and stickup cameras.
 
 <p class='note'>
 Please note that downloading and playing Ring video will require a Ring Protect plan.
-<p>
+</p>
 
 Once you have enabled the [Ring component](/components/ring), you can start using the camera platform. Add the following to your `configuration.yaml` file:
 
@@ -185,4 +185,4 @@ monitored_conditions:
        description: Return the WiFi signal strength (dBm) from the device.
 {% endconfiguration %}
 
-Currently it supports doorbell, external chimes and stickup cameras.
+Currently it supports doorbell, external chimes and stickup cameras.

source/_components/sensor.hive.markdown

@@ -1,28 +0,0 @@
----
-layout: page
-title: "Hive Sensor"
-description: "Instructions on how to integrate Hive Sensors with Home Assistant."
-date: 2017-09-24 21:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: hive.png
-ha_category: Sensor
-ha_release: 0.59
-ha_iot_class: "Cloud Polling"
----
-
-
-The `hive` sensor component exposes Hive data as a sensor.
-
-The platform exposes the following sensors:
-
-- Hive Hub Online Status
-- Hive Outside Temperature
-
-<p class='note'>
-Full configuration details can be found on the main [Hive component](/components/hive/) page.
-</p>
-
-

source/_components/sensor.mysensors.markdown

@@ -8,7 +8,9 @@ comments: false
 sharing: true
 footer: true
 logo: mysensors.png
-ha_category: DIY
+ha_category:
+  - DIY
+  - Sensor
 featured: false
 ha_iot_class: "Local Push"
 ---

source/_components/sensor.tellstick.markdown

@@ -1,62 +0,0 @@
----
-layout: page
-title: "TellStick Sensor"
-description: "Instructions on how to integrate TellStick sensors into Home Assistant."
-date: 2015-08-06 19:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: telldus_tellstick.png
-ha_category: Sensor
-ha_iot_class: "Local Polling"
----
-
-The `tellstick` sensor platform allows you to get current meteorological data from a [TellStick](http://www.telldus.se/products/tellstick) device.
-
-To use your TellStick device, you first have to set up your [Tellstick hub](/components/tellstick/) and then add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-sensor:
-  - platform: tellstick
-```
-
-{% configuration %}
-sensor:
-  description: "Entry for a sensor with the ID and its name, e.g., ID: Name."
-  required: false
-  type: string
-only_named:
-  description: Only show the named sensors. Set to `true` to hide sensors.
-  required: false
-  default: false
-  type: boolean
-temperature_scale:
-  description: The scale of the temperature value.
-  required: false
-  default: °C
-  type: string
-datatype_mask:
-  description: Mask to determine which sensor values to show based on. Please check the [TellCore tellcore.constants documentation](https://tellcore-py.readthedocs.org/en/v1.1.2/constants.html#module-tellcore.constants) for details.
-  required: false
-  default: 127
-  type: integer
-{% endconfiguration %}
-
-## {% linkable_title Examples %}
-
-In this section you find some real-life examples of how to use this sensor.
-
-### {% linkable_title Full configuration %}
-
-```yaml
-# Example configuration.yaml entry
-sensor:
-  - platform: tellstick
-    135: Outside
-    21: Inside
-    only_named: true
-    temperature_scale: "°C"
-    datatype_mask: 1
-```

source/_components/sisyphus.markdown

@@ -8,19 +8,26 @@ comments: false
 sharing: true
 footer: true
 logo: sisyphus.png
-ha_category: Hub
+ha_category:
+  - Hub
+  - Light
+  - Media Player
 featured: false
 ha_release: 0.75
 ha_iot_class: "Local Push"
+redirect_from:
+  - /components/light.sisyphus/
+  - /components/media_player.sisyphus/
 ---
 
 The [Sisyphus](https://sisyphus-industries.com/) integration for Home Assistant allows you to observe and control your Sisyphus Kinetic Art Table.
 
-Each table appears in Home Assistant as a Light and a Media Player.
+There is currently support for the following device types within Home Assistant:
 
-The light can be used to sleep/wake the table or adjust the brightness of the table light.
+- **Light** - Can be used to sleep/wake the table or adjust the brightness of the table light.
+- **Media Player** - Can be used to sleep/wake the table, play/pause, move between tracks, or toggle shuffle on and off. The "volume" control adjusts the table's speed.
 
-The media player can be used to sleep/wake the table, play/pause, move between tracks, or toggle shuffle on and off. The "volume" control adjusts the table's speed.
+The Light and Media players will be automatically added for each of your Sisyphus tables, if the Sisyphus component is configured.
 
 There are two ways to configure this component. For the automatic discovery of your table(s), simply add the following to your `configuration.yaml`:
 

source/_components/switch.hive.markdown

@@ -1,24 +0,0 @@
----
-layout: page
-title: "Hive Switch"
-description: "Instructions on how to integrate Hive Plugs with Home Assistant."
-date: 2017-09-24 21:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: hive.png
-ha_category: Switch
-ha_release: 0.59
-ha_iot_class: "Cloud Polling"
----
-
-The `hive` switch platform integrates your Hive plugs into Home Assistant, enabling control of your devices.
-
-The platform supports the following Hive products:
-
-- Hive Active Plug
-
-<p class='note'>
-Full configuration details can be found on the main [Hive component](/components/hive/) page.
-</p>

source/_components/switch.mysensors.markdown

@@ -8,7 +8,9 @@ comments: false
 sharing: true
 footer: true
 logo: mysensors.png
-ha_category: DIY
+ha_category:
+  - DIY
+  - Switch
 featured: false
 ha_iot_class: "Local Push"
 ---

source/_components/switch.recswitch.markdown

@@ -20,6 +20,7 @@ Supported devices (tested):
 
 - Ankuoo RecSwitch MS6126
 - Lumitek CSW201 NEO WiFi
+- MALMBERGS CSW201
 
 ## {% linkable_title Configuration %}
 

source/_components/switch.tellstick.markdown

@@ -1,23 +0,0 @@
----
-layout: page
-title: "TellStick Switch"
-description: "Instructions on how to integrate TellStick switches into Home Assistant."
-date: 2015-08-06 19:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: telldus_tellstick.png
-ha_category: Switch
-ha_iot_class: "Assumed State"
----
-
-This `tellstick` switch platform allows you to control [TellStick](http://www.telldus.se/products/tellstick) devices.
-
-To use your TellStick device, you first have to set up your [Tellstick hub](/components/tellstick/) and then add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-switch:
-  - platform: tellstick
-```

source/_components/tellstick.markdown

@@ -8,11 +8,30 @@ comments: false
 sharing: true
 footer: true
 logo: telldus_tellstick.png
-ha_category: Hub
+ha_release: "pre 0.7"
+ha_category:
+  - Hub
+  - Cover
+  - Light
+  - Sensor
+  - Switch
+ha_iot_class: "Assumed State"
+redirect_from:
+  - /components/cover.tellstick/
+  - /components/light.tellstick/
+  - /components/sensor.tellstick/
+  - /components/switch.tellstick/
 ---
 
 The `tellstick` component integrates [TellStick](https://telldus.com/produkt/z-wave-gateway-tellstick-znet-lite-ver-2/) devices into Home Assistant. This integration allows users to add switches, lights, and sensors which are communicating with 433 MHz. There are a number of vendors (Capidi Elro, Intertechno, Nexa, Proove, Sartano, and Viking) who are selling products that work with TellStick. For more details, please check the TellStick [protocol list](http://developer.telldus.com/wiki/TellStick_conf).
 
+There is currently support for the following device types within Home Assistant:
+
+- [Cover](#cover)
+- [Light](#light)
+- [Sensor](#sensor)
+- [Switch](#switch)
+
 ## {% linkable_title Configuration %}
 
 To get started, add the devices to your `configuration.yaml` file.
@@ -46,3 +65,90 @@ port:
   required: inclusive
   type: list
 {% endconfiguration %}
+
+## {% linkable_title Cover %}
+
+This `tellstick` cover platform allows you to control your [TellStick](http://www.telldus.se/products/tellstick) covers.
+
+To use your TellStick device, you first have to set up your [Tellstick hub](#configuration) and then add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+cover:
+  - platform: tellstick
+```
+
+## {% linkable_title Light %}
+
+This `tellstick` light platform allows you to control your [TellStick](http://www.telldus.se/products/tellstick) dimmers.
+
+To use your TellStick device, you first have to set up your [Tellstick hub](#configuration) and then add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+light:
+  platform: tellstick
+```
+
+## {% linkable_title Sensor %}
+
+The `tellstick` sensor platform allows you to get current meteorological data from a [TellStick](http://www.telldus.se/products/tellstick) device.
+
+To use your TellStick device, you first have to set up your [Tellstick hub](#configuration) and then add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  - platform: tellstick
+```
+
+{% configuration %}
+sensor:
+  description: "Entry for a sensor with the ID and its name, e.g., ID: Name."
+  required: false
+  type: string
+only_named:
+  description: Only show the named sensors. Set to `true` to hide sensors.
+  required: false
+  default: false
+  type: boolean
+temperature_scale:
+  description: The scale of the temperature value.
+  required: false
+  default: °C
+  type: string
+datatype_mask:
+  description: Mask to determine which sensor values to show based on. Please check the [TellCore tellcore.constants documentation](https://tellcore-py.readthedocs.org/en/v1.1.2/constants.html#module-tellcore.constants) for details.
+  required: false
+  default: 127
+  type: integer
+{% endconfiguration %}
+
+## {% linkable_title Examples %}
+
+In this section you find some real-life examples of how to use this sensor.
+
+### {% linkable_title Full configuration %}
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  - platform: tellstick
+    135: Outside
+    21: Inside
+    only_named: true
+    temperature_scale: "°C"
+    datatype_mask: 1
+```
+
+## {% linkable_title Switch %}
+
+This `tellstick` switch platform allows you to control [TellStick](http://www.telldus.se/products/tellstick) devices.
+
+To use your TellStick device, you first have to set up your [Tellstick hub](#configuration) and then add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+switch:
+  - platform: tellstick
+```