merge back in

source/_components/climate.evohome.markdown

@@ -0,0 +1,28 @@
+---
+layout: page
+title: "Honeywell evohome CH/DHW Controller"
+description: "Instructions on how to integrate a Honeywell evohome controller with Home Assistant."
+date: 2018-09-25 12:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: honeywell.png
+ha_category: Climate
+ha_release: TBA (post 0.78)
+ha_iot_class: "Cloud Polling" 
+---
+
+The `evohome` climate platform integrates your _EU-based_ [Honeywell Connect Comfort](https://international.mytotalconnectcomfort.com/Account/Login) CH/DHW controller into Home Assistant, enabling control of its operating mode.
+
+It is related to the honeywell climate component](/components/climate.honeywell/), which allows limited integration with evohome Heating zones.  These two components should be usuable side-by-side, but YMMV.
+
+The evohome evotouch controller supports seven distict modes: Auto, AutoWithEco, Away, DayOff, HeatingOff, and Custom; AutoWithReset is a 7th, hidden, mode.
+
+Currently, only the standard HA operating modes are supported: 'Eco' (AutoWithEco), and 'Off' (HeatingOff), and 'Auto' (all other evohome modes). 'Away' (Away) mode is supported separately.
+
+The actual operating modes are tracked/reported via `device_state_attributes`.
+
+<p class='note'>
+Full configuration details can be found on the main [evohome component](/components/evohome/) page.
+</p>

source/_components/evohome.markdown

@@ -1,21 +1,26 @@
 ---
 layout: page
-title: "Honeywell evohome Controller"
+title: "Honeywell evohome"
-description: "Instructions on how to setup the Honeywell evohome component in Home Assistant."
+description: "Instructions on how to integrate Honeywell evohome devices with Home Assistant."
-date: 2018-09-10 12:00
+date: 2018-09-25 12:00
 sidebar: true
 comments: false
 sharing: true
 footer: true
 logo: honeywell.png
-ha_category: Climate
+ha_category: Hub
 ha_release: TBA (post 0.78)
 ha_iot_class: "Cloud Polling" 
 ---
 
-The `evohome` climate platform lets you control EU-based [Honeywell Connect Comfort](https://international.mytotalconnectcomfort.com/Account/Login) CH/DHW controllers from Home Assistant.  
+The `evohome` platform is the main component to set up and integrate all supported evohome devices.
+
+It uses the [evohomeclient](https://pypi.org/project/evohomeclient/) client library and so will let you control (only) _EU-based_ [Honeywell Connect Comfort](https://international.mytotalconnectcomfort.com/Account/Login) systems.
+
+Currently, only Controllers are supported; support for Heating zones and DHW controllers will be added at a later time.
+
+It is related to the [honeywell](/components/climate.honeywell/) climate component, which allows limited integration with evohome Heating zones.  These two components should be usuable side-by-side, but YMMV.
 
-It uses the [evohomeclient](https://pypi.org/project/evohomeclient/) client library. Currently, Heating zones and DHW controllers are not supported (they will be added at a later time).
 
 ## {% linkable_title Configuration %}
 
@@ -26,11 +31,10 @@ To use this component in your installation, add the following to your `configura
 evohome:
   - username: YOUR_USERNAME
     password: YOUR_PASSWORD
-    scan_interval: 300
+    location_idx: 0
 ```
-<p class='note'>
+This is a IoT cloud-polling device, and the `scan_interval` is currently fixed at 3 minutes.  Testing has indicated that this is a safe interval that - by itself - shouldn't cause you to be rate-limited by Honeywell.
-Having a scan_interval to short may result in too-frequent polling and cause you to rate-limited by Honeywell.
+
-</p>
 
 ### {% linkable_title Configuration variables %}
 
@@ -43,9 +47,9 @@ password:
   description: The password corresponding to the above username.
   required: true
   type: string
-scan_interval:
+location_idx:
-  description: How often the web site is polled for data, in seconds. It is rounded up to nearest minute, and the minimum value is 180.  The recommended value is 300.
+  description: Used to select which location to use, if your login has access to more than one location.  Multiple locations are not supported.
   required: false
   type: int
-  default: 180
+  default: 0
 {% endconfiguration %}