Merge branch 'current' into next

2017-11-02 09:31:07 -07:00 · 2017-11-02 09:31:07 -07:00 · 2581fb1bcd
commit 2581fb1bcd
parent 3570a1edb8 ba27a1253e
71 changed files with 994 additions and 485 deletions
--- a/source/_components/sensor.uptime.markdown
+++ b/source/_components/sensor.uptime.markdown
@ -28,3 +28,11 @@ Configuration variables:

 - **name** (*Optional*): Name of the sensor. Defaults to `Uptime`.
 - **unit_of_measurement** (*Optional*): Units for uptime measurement in either `days`, `hours`, or `minutes`.  Defaults to `days`.
+
+```yaml
+# Example with configuration variables
+sensor:
+  - platform: uptime
+    name: Time Online
+    unit_of_measurement: hours
+````