Merge branch 'current' into next

source/_components/aqualogic.markdown

@@ -8,13 +8,24 @@ comments: false
 sharing: true
 footer: true
 logo: hayward.png
-ha_category: Hub
+ha_category:
+  - Hub
+  - Sensor
+  - Switch
 ha_release: "0.80"
 ha_iot_class: "Local Push"
+redirect_from:
+  - /components/sensor.aqualogic/
+  - /components/switch.aqualogic/
 ---
 
 The AquaLogic component provides connectivity to a Hayward/Goldline AquaLogic/ProLogic pool controller. Note that an RS-485 to Ethernet adapter connected to the pool controller is required.
 
+There is currently support for the following device types within Home Assistant:
+
+- [Sensor](#sensor)
+- [Switch](#switch)
+
 ## {% linkable_title Configuration %}
 
 To add the AquaLogic component to your installation, add the following to your `configuration.yaml` file:
@@ -22,8 +33,8 @@ To add the AquaLogic component to your installation, add the following to your `
 ```yaml
 # Example configuration.yaml entry
 aqualogic:
-  host: 192.168.1.1
+  host: IP_ADDRESS
-  port: 23
+  port: PORT
 ```
 
 {% configuration %}
@@ -36,3 +47,84 @@ port:
   required: true
   type: int
 {% endconfiguration %}
+
+## {% linkable_title Sensor %}
+
+Once you have enabled the AquaLogic component, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  - platform: aqualogic
+    monitored_conditions:
+      - pool_temp
+```
+
+{% configuration %}
+monitored_conditions:
+  description: List of items you want to monitor.
+  required: false
+  default: all
+  type: list
+  keys:
+    air_temp:
+      description: The air temperature.
+    pool_temp:
+      description: The pool temperature.
+    spa_temp:
+      description: The spa temperature.
+    pool_chlorinator:
+      description: The pool chlorinator setting.
+    spa_chlorinator:
+      description: The spa chlorinator setting.
+    salt_level:
+      description: The current salt level.
+    pump_speed:
+      description: The current pump speed (Hayward VS pumps only).
+    pump_power:
+      description: The current pump power usage (Hayward VS pumps only).
+    status:
+      description: The current system status.
+{% endconfiguration %}
+
+## {% linkable_title Switch %}
+
+Once you have enabled the AquaLogic component, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+switch:
+  - platform: aqualogic
+    monitored_conditions:
+      - lights
+      - filter
+```
+
+{% configuration %}
+monitored_conditions:
+  description: List of items you want to monitor/control.
+  required: false
+  default: all
+  type: list
+  keys:
+    filter:
+      description: Controls the filter pump.
+    filter_low_speed:
+      description: Controls low speed mode on the filter pump (multi-speed pumps only).
+    lights:
+      description: Controls the Lights relay.
+    aux_1:
+      description: Controls the Aux 1 relay.
+    aux_2:
+      description: Controls the Aux 2 relay.
+    aux_3:
+      description: Controls the Aux 3 relay.
+    aux_4:
+      description: Controls the Aux 4 relay.
+    aux_5:
+      description: Controls the Aux 5 relay.
+    aux_6:
+      description: Controls the Aux 6 relay.
+    aux_7:
+      description: Controls the Aux 7 relay.
+{% endconfiguration %}

source/_components/history_graph.markdown

@@ -71,7 +71,6 @@ history_graph:
       - sensor.inside_temperature
     hours_to_show: 120
     # refresh: 0
-
 ```
 
-
+For sensors to automatically be combined into one graph they need to have exactly the same unit of measurement. This is important if you have, e.g., a unit-less temperature `state_topic` MQTT sensor and you want to combine this with a weather sensor. `unit_of_measurement:` of the MQTT sensor then needs to be set to `°C`.

source/_components/juicenet.markdown

@@ -8,8 +8,12 @@ comments: false
 sharing: true
 footer: true
 logo: juicenet.png
-ha_category: Energy
+ha_category:
+  - Energy
+  - Sensor
 ha_release: 0.47
+redirect_from:
+  - /components/sensor.juicenet/
 ---
 
 The `juicenet` sensor platform pulls data from a [JuiceNet](https://emotorwerks.com/products/juicenet/) charging station equipped with a wifi connection. It will access and make available all of the devices attached to your account.
@@ -30,3 +34,19 @@ access_token:
   required: true
   type: string
 {% endconfiguration %}
+
+## {% linkable_title Sensor %}
+
+The `juicenet` sensor platform allows you to get data from your [JuiceNet](https://emotorwerks.com/products/juicenet/) sensors.
+
+### {% linkable_title Added sensors %}
+
+These sensors will be added for each juicenet device in your account:
+
+- Status
+- Temperature (inside the device)
+- Voltage
+- Amps
+- Watts
+- Charge time of session
+- Energy added this session

source/_components/media_player.roku.markdown

@@ -1,16 +0,0 @@
----
-layout: page
-title: "Roku Media Player"
-description: "Instructions on how to integrate Roku into Home Assistant."
-date: 2016-05-16 20:0+0000
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: roku.png
-ha_category: Media Player
-ha_release: "0.20"
-ha_iot_class: "Local Polling"
----
-
-To set up the `roku` media player platform, please follow the instructions on the [Roku Component page](/components/roku/).

source/_components/notify.tibber.markdown

@@ -1,33 +0,0 @@
----
-layout: page
-title: "Tibber Notification"
-description: "Instructions on how to integrate Tibber within Home Assistant."
-date: 2015-10-04 16:34
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: tibber.png
-ha_category: Notifications
-ha_release: 0.80
-ha_qa_scale: silver
-ha_iot_class: "Cloud Polling"
----
-
-The requirement is that you have setup the [`tibber` component](/components/tibber/).
-
-## {% linkable_title Usage %}
-
-Tibber can send a notification by calling the [`notify` service](/components/notify/). It will send a notification to all devices registered in the Tibber account. 
-
-To use notifications, please see the [getting started with automation page](/getting-started/automation/).
-
-### {% linkable_title Send message %}
-
-```yaml
-action:
-  service: notify.tibber
-  data:
-    title: Your title
-    message: This is a message for you!
-```

source/_components/remote.roku.markdown

@@ -1,60 +0,0 @@
----
-layout: page
-title: "Roku Remote"
-description: "Instructions on how to integrate Roku into Home Assistant."
-date: 2018-10-17 20:0+0000
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: roku.png
-ha_category: Remote
-ha_release: 0.86
-ha_iot_class: "Local Polling"
----
- 
-The `roku` remote platform allows you to send remote control buttons to a Roku device. It is automatically set up when a Roku is configured; please see [Roku Component page](/components/roku/) for configuration details.
- 
-At the moment, the following buttons are supported:
-
-- back
-- backspace
-- channel_down
-- channel_up
-- down
-- enter
-- find_remote
-- forward
-- home
-- info
-- input_av1
-- input_hdmi1
-- input_hdmi2
-- input_hdmi3
-- input_hdmi4
-- input_tuner
-- left
-- literal
-- play
-- power
-- replay
-- reverse
-- right
-- search
-- select
-- up
-- volume_down
-- volume_mute
-- volume_up
-
-A typical service call for pressing several buttons looks like this.
-
-```yaml
-service: remote.send_command
-data:
-  entity_id: remote.roku
-  command:
-    - left
-    - left
-    - select
-```

source/_components/roku.markdown

@@ -8,19 +8,30 @@ comments: false
 sharing: true
 footer: true
 logo: roku.png
-ha_category: Hub
+ha_category:
+  - Hub
+  - Media Player
+  - Remote
 ha_iot_class: "Local Polling"
 ha_release: 0.86
+redirect_from:
+  - /components/remote.roku/
+  - /components/media_player.roku/
 ---
 
-The [Roku](http://www.roku.com/) component allows integration of Roku [media players](/components/media_player.roku) and [remotes](/components/remote.roku/) which will be automatically discovered if you enable the [discovery component](/components/discovery/).
+The [Roku](http://www.roku.com/) component allows integration of Roku, which will be automatically discovered if you enable the [discovery component](/components/discovery/).
+
+There is currently support for the following device types within Home Assistant:
+
+- Media Player
+- Remote
 
 The `roku` component can also be forced to load by adding the following lines to your `configuration.yaml`:
 
 ```yaml
 # Example configuration.yaml entry
 roku:
-  - host: 192.168.1.100
+  - host: IP_ADDRESS
 ```
 
 {% configuration %}
@@ -35,3 +46,51 @@ host:
 ### {% linkable_title Service `roku_scan` %}
 
 Scans the local network for Rokus. All found devices are presented as a persistent notification.
+
+## {% linkable_title Remote %}
+
+The `roku` remote platform allows you to send remote control buttons to a Roku device. It is automatically set up when a Roku is configured.
+
+At the moment, the following buttons are supported:
+
+- back
+- backspace
+- channel_down
+- channel_up
+- down
+- enter
+- find_remote
+- forward
+- home
+- info
+- input_av1
+- input_hdmi1
+- input_hdmi2
+- input_hdmi3
+- input_hdmi4
+- input_tuner
+- left
+- literal
+- play
+- power
+- replay
+- reverse
+- right
+- search
+- select
+- up
+- volume_down
+- volume_mute
+- volume_up
+
+A typical service call for pressing several buttons looks like this.
+
+```yaml
+service: remote.send_command
+data:
+  entity_id: remote.roku
+  command:
+    - left
+    - left
+    - select
+```

source/_components/sensor.aqualogic.markdown

@@ -1,55 +0,0 @@
----
-layout: page
-title: "AquaLogic Sensor"
-description: "Instructions on how to integrate your AquaLogic devices within Home Assistant."
-date: 2018-09-17 9:16
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: hayward.png
-ha_category: Sensor
-ha_release: "0.80"
-ha_iot_class: "Local Push"
----
-
-To get your AquaLogic sensors working within Home Assistant, please follow the instructions for the general [AquaLogic component](/components/aqualogic).
-
-## {% linkable_title Configuration %}
-
-Once you have enabled the [AquaLogic component](/components/aqualogic), add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-sensor:
-  - platform: aqualogic
-    monitored_conditions:
-      - pool_temp
-```
-
-{% configuration %}
-monitored_conditions:
-  description: List of items you want to monitor.
-  required: false
-  default: all
-  type: list
-  keys:
-    air_temp:
-      description: The air temperature.
-    pool_temp:
-      description: The pool temperature.
-    spa_temp:
-      description: The spa temperature.
-    pool_chlorinator: 
-      description: The pool chlorinator setting.
-    spa_chlorinator: 
-      description: The spa chlorinator setting.
-    salt_level:
-      description: The current salt level.
-    pump_speed:
-      description: The current pump speed (Hayward VS pumps only).
-    pump_power:
-      description: The current pump power usage (Hayward VS pumps only).
-    status:
-      description: The current system status.
-{% endconfiguration %}

source/_components/sensor.juicenet.markdown

@@ -1,30 +0,0 @@
----
-layout: page
-title: "Juicenet Sensor"
-description: "Instructions on how to setup WiFi-equipped Juicenet charging stations with Home Assistant."
-date: 2015-01-20 22:36
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: juicenet.png
-ha_category: Energy
-ha_release: 0.47
----
-
-
-The `juicenet` sensor platform allows you to get data from your [JuiceNet](https://emotorwerks.com/products/juicenet/) sensors.
-
-The requirement is that you have setup [Juicenet](/components/juicenet/).
-
-### {% linkable_title Added sensors %}
-
-These sensors will be added for each juicenet device in your account:
-
-- Status
-- Temperature (inside the device)
-- Voltage
-- Amps
-- Watts
-- Charge time of session
-- Energy added this session

source/_components/sensor.tibber.markdown

@@ -1,47 +0,0 @@
----
-layout: page
-title: "Tibber Sensor"
-description: "Instructions on how to integrate Tibber within Home Assistant."
-date: 2017-10-03 17:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: tibber.png
-ha_category: Energy
-ha_release: 0.55
-ha_qa_scale: silver
-ha_iot_class: "Cloud Polling"
----
-
-The `tibber` sensor provides the current electricity price if you are a [Tibber](https://tibber.com/) customer.
-If you have a Tibber Pulse it will also show the electricity consumption in real time.
-
-The requirement is that you have setup the [`tibber` component](/components/tibber/).
-
-## {% linkable_title Examples %}
-
-In this section, you will find some real-life examples of how to use this sensor.
-
-### {% linkable_title Electricity price %}
-
-The electricity price can be used to make automations. The sensor has a `max_price` and `min_price` attribute, with max and min price for the current day. Here is an example to get a notification when the price is above 90% of the maximum price for the day:
-
-{% raw %}
-```yaml
-- alias: "Electricity price"
-  trigger:
-    platform: time_pattern
-  # Matches every hour at 1 minutes past whole
-    minutes: 1
-  condition:
-    condition: template
-    value_template: '{{ float(states.sensor.electricity_price_hamretunet_10.state) > 0.9 * float(states.sensor.electricity_price_hamretunet_10.attributes.max_price) }}'
-  action:
-   - service: notify.pushbullet
-     data:
-       title: "Electricity price"
-       target: "device/daniel_telefon_cat"
-       message: "The electricity price is now {{ states.sensor.electricity_price_hamretunet_10.state }}"
-```
-{% endraw %}

source/_components/switch.aqualogic.markdown

@@ -1,58 +0,0 @@
----
-layout: page
-title: "AquaLogic Switch"
-description: "Instructions on how to integrate your AquaLogic devices within Home Assistant."
-date: 2018-09-17 9:16
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: hayward.png
-ha_category: Switch
-ha_release: "0.80"
-ha_iot_class: "Local Push"
----
-
-To get your AquaLogic switches working within Home Assistant, please follow the instructions for the general [AquaLogic component](/components/aqualogic).
-
-## {% linkable_title Configuration %}
-
-Once you have enabled the [AquaLogic component](/components/aqualogic), add the following to your `configuration.yaml` file:
-
-```yaml
-# Example configuration.yaml entry
-switch:
-  - platform: aqualogic
-    monitored_conditions:
-      - lights
-      - filter
-```
-
-{% configuration %}
-monitored_conditions:
-  description: List of items you want to monitor/control.
-  required: false
-  default: all
-  type: list
-  keys:
-    filter:
-      description: Controls the filter pump.
-    filter_low_speed:
-      description: Controls low speed mode on the filter pump (multi-speed pumps only).
-    lights:
-      description: Controls the Lights relay.
-    aux_1:
-      description: Controls the Aux 1 relay.
-    aux_2:
-      description: Controls the Aux 2 relay.
-    aux_3:
-      description: Controls the Aux 3 relay.
-    aux_4:
-      description: Controls the Aux 4 relay.
-    aux_5:
-      description: Controls the Aux 5 relay.
-    aux_6:
-      description: Controls the Aux 6 relay.
-    aux_7:
-      description: Controls the Aux 7 relay.
-{% endconfiguration %}

source/_components/tibber.markdown

@@ -8,16 +8,25 @@ comments: false
 sharing: true
 footer: true
 logo: tibber.png
-ha_category: Energy
+ha_category:
+  - Energy
+  - Sensor
+  - Notifications
 ha_release: 0.80
 ha_qa_scale: silver
 ha_iot_class: "Cloud Polling"
+redirect_from:
+  - /components/notify.tibber/
+  - /components/sensor.tibber/
 ---
 
 The `tibber` component provides a sensor with the current electricity price if you are a [Tibber](https://tibber.com/) customer.
 If you have a [Tibber Pulse](https://norge.tibber.com/products/pulse/) it will also show the electricity consumption in real time.
 
-It also provides a notification service.
+There is currently support for the following device types within Home Assistant:
+
+- [Notifications](#notifications)
+- [Sensor](#sensor)
 
 ## {% linkable_title Setup %}
 
@@ -38,3 +47,56 @@ access_token:
   required: true
   type: string
 {% endconfiguration %}
+
+## {% linkable_title Notifications %}
+
+Tibber can send a notification by calling the [`notify` service](/components/notify/). It will send a notification to all devices registered in the Tibber account.
+
+The requirement is that you have setup the [`tibber` component](#setup).
+To use notifications, please see the [getting started with automation page](/getting-started/automation/).
+
+### {% linkable_title Send message %}
+
+```yaml
+action:
+  service: notify.tibber
+  data:
+    title: Your title
+    message: This is a message for you!
+```
+
+## {% linkable_title Sensor %}
+
+The `tibber` sensor provides the current electricity price if you are a [Tibber](https://tibber.com/) customer.
+If you have a Tibber Pulse it will also show the electricity consumption in real time.
+
+The requirement is that you have setup the [`tibber` component](#setup).
+
+## {% linkable_title Examples %}
+
+In this section, you will find some real-life examples of how to use this sensor.
+
+### {% linkable_title Electricity price %}
+
+The electricity price can be used to make automations. The sensor has a `max_price` and `min_price` attribute, with max and min price for the current day. Here is an example to get a notification when the price is above 90% of the maximum price for the day:
+
+{% raw %}
+
+```yaml
+- alias: "Electricity price"
+  trigger:
+    platform: time_pattern
+  # Matches every hour at 1 minutes past whole
+    minutes: 1
+  condition:
+    condition: template
+    value_template: '{{ float(states.sensor.electricity_price_hamretunet_10.state) > 0.9 * float(states.sensor.electricity_price_hamretunet_10.attributes.max_price) }}'
+  action:
+   - service: notify.pushbullet
+     data:
+       title: "Electricity price"
+       target: "device/daniel_telefon_cat"
+       message: "The electricity price is now {{ states.sensor.electricity_price_hamretunet_10.state }}"
+```
+
+{% endraw %}