diff --git a/source/_components/daikin.markdown b/source/_components/daikin.markdown
index b927240b3aa8..c01d5d8dff30 100644
--- a/source/_components/daikin.markdown
+++ b/source/_components/daikin.markdown
@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Daikin AC"
-description: "Instructions on how to integrate Hive devices with Home Assistant."
+description: "Instructions on how to integrate Daikin AC devices with Home Assistant."
 date: 2017-12-10 21:00
 sidebar: true
 comments: false
@@ -30,17 +30,17 @@ There is currently support for the following device types within Home Assistant:
 
 ## {% linkable_title Supported hardware %}
 
-This component supports the European versions of Daikin AC (BRP069A[41,42,43,45]) and AU AirBase units (BRP15B61).
-
-The Australian version of the Daikin Wifi Controller Unit BRP072A42. Confirmed working on a Daikin Cora Series Reverse Cycle Split System Air Conditioner 2.5kW Cooling FTXM25QVMA with operation mode, temp, fan swing (3d, horizontal, vertical) which is powered by the [DAIKIN Mobile Controller](https://itunes.apple.com/au/app/daikin-mobile-controller/id917168708?mt=8)
-
-Some models do not support setting of fan speed or fan swing mode.
-
-Please note that some AC devices may report outside temperature only when they are turned on.
+- The European versions of the Wifi Controller Unit (BRP069A41, 42, 43, 45), which is powered by the [Daikin Online Controller](https://play.google.com/store/apps/details?id=eu.daikin.remoapp) application.
+- The Australian version of the Daikin Wifi Controller Unit BRP072A42. Confirmed working on a Daikin Cora Series Reverse Cycle Split System Air Conditioner 2.5kW Cooling FTXM25QVMA with operation mode, temp, fan swing (3d, horizontal, vertical) which is powered by the [DAIKIN Mobile Controller](https://itunes.apple.com/au/app/daikin-mobile-controller/id917168708?mt=8) ([Android version](https://play.google.com/store/apps/details?id=eu.daikin.remoapp)) application.
+- The Australian version of the Daikin Wifi Controller for **AirBase** units (BRP15B61), which is powered by the [Daikin Airbase](https://play.google.com/store/apps/details?id=au.com.daikin.airbase) application.
 
 ## {% linkable_title Configuration %}
 
-To automatically add all your Daikin devices (ACs and associated sensors) into your Home Assistant installation, add the following to your `configuration.yaml` file:
+The Daikin component can be configured in three ways. 
+
+- Automatically via the [discovery]({{site_root}}/components/discovery/) component.
+- Via the Home Assistant user interface where it will let you enter the IP-address of your Daikin AC.
+- Or via the `configuration.yaml` file by adding the following:
 
 ```yaml
 # Full manual example configuration.yaml entry
@@ -62,11 +62,15 @@ hosts:
 The `daikin` climate platform integrates Daikin air conditioning systems into Home Assistant, enabling control of setting the following parameters:
 
 - **mode** (cool, heat, dry, fan only or auto)
-- **fan speed** (on supported models)
 - **target temperature**
-- **swing mode** (on supported models)
+- **fan speed**
+- **swing mode**
 
-Current temperature is displayed.
+Current inside temperature is displayed.
+
+<p class='note'>
+Some models do not support setting of **fan speed** or **swing mode**.
+</p>
 
 ## {% linkable_title Sensor %}
 
@@ -75,6 +79,14 @@ The `daikin` sensor platform integrates Daikin air conditioning systems into Hom
 - Inside temperature
 - Outside temperature
 
+<p class='note'>
+Some models only report outside temperature when they are turned on.
+</p>
+
 ## {% linkable_title Switch %}
 
 Daikin AirBase units exposes zones (typically rooms) that can be switched on/off individually.
+
+<p class='note'>
+Zones with the name `-` will be ignored, just as the AirBase application is working.
+</p>
\ No newline at end of file