Merge branch 'next' of https://github.com/home-assistant/home-assistant.io into next

robbiet480 · robbiet480 · commit 9186c875dc13 · 2016-10-04T13:55:48.000-07:00
diff --git a/source/_components/light.mqtt.markdown b/source/_components/light.mqtt.markdown
@@ -36,9 +36,12 @@ Configuration variables:
 - **brightness_command_topic** (*Optional*): The MQTT topic to publish commands to change the light's brightness.
 - **rgb_state_topic** (*Optional*): The MQTT topic subscribed to receive RGB state updates.
 - **rgb_command_topic** (*Optional*): The MQTT topic to publish commands to change the light's RGB state.
+- **color_temp_state_topic** (*Optional*): The MQTT topic subscribed to receive color temperature state updates.
+- **color_temp_command_topic** (*Optional*): The MQTT topic to publish commands to change the light's color temperature state.
 - **state_value_template** (*Optional*): Defines a [template](/topics/templating/) to extract the state value.
 - **brightness_value_template** (*Optional*): Defines a [template](/topics/templating/) to extract the brightness value.
 - **rgb_value_template** (*Optional*): Defines a [template](/topics/templating/) to extract the RGB value.
+- **color_temp_value_template** (*Optional*): Defines a [template](/topics/templating/) to extract the color temperature value.
 - **brightness_scale** (*Optional*): Defines the maximum brightness value (i.e. 100%) of the MQTT device (defaults to 255).
 - **qos** (*Optional*): The maximum QoS level of the state topic. Default is 0 and will also be used to publishing messages.
 - **payload_on** (*Optional*): The payload that represents enabled state. Default is "ON".
@@ -99,4 +102,3 @@ light:
 ### {% linkable_title Implementations %}
 
 A basic example using a nodeMCU board (ESP8266) to control its built-in led (on/off) can be found [here](https://github.com/mertenats/open-home-automation/tree/master/ha_mqtt_light). [Here](https://github.com/mertenats/open-home-automation/tree/master/ha_mqtt_rgb_light) is another example to control a RGB led (on/off, brightness and colors).
-
diff --git a/source/_components/sensor.forecast.markdown b/source/_components/sensor.forecast.markdown
@@ -84,5 +84,17 @@ Configuration variables:
   - **precip_intensity_max**: Today's expected maximum intensity of precipitation.
 - **units** (*Optional*): Specify the unit system. Default to `si` or `us` based on the temperature preference in Home Assistant. Other options are `auto`, `us`, `si`, `ca`, and `uk2`.
 `auto` will let forecast.io decide the unit system based on location.
+- **update_inverval** (*Optional*): Minimum time interval between updates. Default is 2 minutes. Supported formats:
+  - `update_interval: 'HH:MM:SS'`
+  - `update_interval: 'HH:MM'`
+  - Time period dictionary, e.g.:
+ <pre>update_interval:
+        # At least one of these must be specified:
+        days: 0
+        hours: 0
+        minutes: 3
+        seconds: 30
+        milliseconds: 0
+    </pre>
 
 Details about the API are available in the [Forecast.io documentation](https://developer.forecast.io/docs/v2).
