Merge branch 'current' into next

balloob · balloob · commit 04b4f58407f0 · 2016-08-21T16:52:41.000-07:00
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,3 @@
 [submodule "_deploy"]
 	path = _deploy
-	url = https://github.com/home-assistant/home-assistant.git
-    branch = gh-pages
+	url = https://github.com/home-assistant/home-assistant.github.io.git
diff --git a/CNAME b/CNAME
@@ -0,0 +1 @@
+home-assistant.io
diff --git a/_deploy b/_deploy
@@ -1 +1 @@
-Subproject commit 42e481f37c2a10930f2581c92053b87e25fcdc37
+Subproject commit 3633483305bb092ff72024ac1b59e66f7c1aacc0
diff --git a/sass/custom/_paulus.scss b/sass/custom/_paulus.scss
@@ -215,7 +215,7 @@ article.post, article.page, article.listing {
   }
 
   h1, h2, h3 {
-    margin-bottom: 0;
+    margin-bottom: 4px;
     line-height: 1.2;
   }
 }
diff --git a/source/_components/binary_sensor.ecobee.markdown b/source/_components/binary_sensor.ecobee.markdown
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "Ecobee Sensor"
+title: "Ecobee Binary Sensor"
 description: "Instructions how to setup the Ecobee sensors within Home Assistant."
 date: 2015-11-30 18:00
 sidebar: true
@@ -11,4 +11,4 @@ logo: ecobee.png
 ha_category: Sensor
 ---
 
-To get your Ecobee sensors working with Home Assistant, follow the instructions for the general [Ecobee component](/components/ecobee/).
+To get your Ecobee binary sensors working with Home Assistant, follow the instructions for the general [Ecobee component](/components/ecobee/).
diff --git a/source/_components/binary_sensor.nest.markdown b/source/_components/binary_sensor.nest.markdown
@@ -22,6 +22,7 @@ binary_sensor:
   monitored_conditions:
     - 'fan'
     - 'hvac_ac_state'
+    - 'hvac_heater_state'
     - 'hvac_aux_heater_state'
     - 'hvac_heat_x2_state'
     - 'hvac_heat_x3_state'
diff --git a/source/_components/camera.ffmpeg.markdown b/source/_components/camera.ffmpeg.markdown
@@ -33,7 +33,7 @@ camera:
 
 Configuration variables:
 
-- **input** (*Required*): A ffmpeg compatible input file, stream or feet.
+- **input** (*Required*): A ffmpeg compatible input file, stream or feed.
 - **name** (*Optional*): This parameter allows you to override the name of your camera.
 - **ffmpeg_bin** (*Optional*): Default 'ffmpeg'.
 - **extra_arguments** (*Optional*): Extra option they will pass to ffmpeg. i.e. image quality or video filter options.
diff --git a/source/_components/input_slider.markdown b/source/_components/input_slider.markdown
@@ -34,3 +34,79 @@ Configuration variables:
 - **max** (*Optional*): Maximum value for the slider.
 - **step** (*Optional*): Step value for the slider.
 
+## {% linkable_title Automation Examples %}
+
+Here's an example of `input_slider` being used as a trigger in an automation.
+
+```yaml
+{% raw %}
+# Example configuration.yaml entry using 'input_slider' as a trigger in an automation
+
+# Define input_slider
+input_slider:
+  bedroom_brightness:
+    name: Brightness
+    initial: 254
+    min: 0
+    max: 254
+    step: 1
+
+# Automation.     
+automation:    
+  - alias: Bedroom Light - Adjust Brightness
+    trigger:
+      platform: state
+      entity_id: input_slider.bedroom_brightness
+    action:
+      - service: light.turn_on
+# Note the use of 'data_template:' below rather than the normal 'data:' if you weren't using an input variable
+        data_template:
+          entity_id: light.bedroom
+          brightness: '{{ trigger.to_state.state | int }}'
+{% endraw %}
+```
+
+Another code example using `input_slider`, this time being used in an action in an automation.
+
+```yaml
+{% raw %}
+# Example configuration.yaml entry using 'input_slider' in an action in an automation
+
+# Define 'input_select'
+input_select:
+  scene_bedroom:
+    name: Scene
+    options:
+      - Select
+      - Concentrate
+      - Energize
+      - Reading
+      - Relax
+      - 'OFF'
+    initial: 'Select'
+    
+# Define input_slider
+input_slider:
+  bedroom_brightness:
+    name: Brightness
+    initial: 254
+    min: 0
+    max: 254
+    step: 1
+
+# Automation.     
+automation:
+  - alias: Bedroom Light - Custom
+    trigger:
+      platform: state
+      entity_id: input_select.scene_bedroom
+      to: CUSTOM
+    action:
+      - service: light.turn_on
+# Again, note the use of 'data_template:' rather than the normal 'data:' if you weren't using an input variable.
+        data_template:
+          entity_id: light.bedroom
+          brightness: '{{ states.input_slider.bedroom_brightness.state | int }}'
+{% endraw %}
+```
+
diff --git a/source/_components/media_player.denon.markdown b/source/_components/media_player.denon.markdown
@@ -19,6 +19,7 @@ Supported devices:
 - Denon DRA-N5
 - Denon RCD-N8 (untested)
 - Denon RCD-N9 (partial support)
+- Denon AVR receivers with Integrated Network support (partial support)
 
 To add a Denon Network Receiver to your installation, add the following to your `configuration.yaml` file:
 
diff --git a/source/_components/media_player.snapcast.markdown b/source/_components/media_player.snapcast.markdown
@@ -1,21 +1,21 @@
 ---
 layout: page
-title: "SnapCast"
-description: "Instructions on how to integrate SnapCast into Home Assistant."
+title: "Snapcast"
+description: "Instructions on how to integrate Snapcast into Home Assistant."
 date: 2016-02-01 19:00
 sidebar: true
 comments: false
 sharing: true
 footer: true
-logo:
+logo: snapcast.png
 ha_category: Media Player
 featured: false
 ha_release: 0.13
 ---
 
-The `snapcast` platform allows you to control [SnapCast](https://github.com/badaix/snapcast) from Home Assistant.
+The `snapcast` platform allows you to control [Snapcast](https://github.com/badaix/snapcast) from Home Assistant.
 
-To add SnapCast to your installation, add the following to your `configuration.yaml` file:
+To add Snapcast to your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
 # Example configuration.yaml entry
diff --git a/source/_components/modbus.markdown b/source/_components/modbus.markdown
@@ -29,7 +29,7 @@ modbus:
 
 Configuration variables:
 
-- **type** (*Required*): Type of the connection to Modebus.
+- **type** (*Required*): Type of the connection to Modbus.
 - **host** (*Required*): The IP address of your router, eg. 192.168.1.1.
 - **port** (*Required*): The port for the comminication.
 
diff --git a/source/_components/notify.pushbullet.markdown b/source/_components/notify.pushbullet.markdown
@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "PushBullet"
+title: "Pushbullet"
 description: "Instructions how to add user notifications to Home Assistant."
 date: 2015-01-20 22:36
 sidebar: true
@@ -12,9 +12,9 @@ ha_category: Notifications
 featured: true
 ---
 
-The `pushbullet` notification platform sends messages to [PushBullet](https://www.pushbullet.com/), a free service to send information between your phones, browsers, and friends.
+The `pushbullet` notification platform sends messages to [Pushbullet](https://www.pushbullet.com/), a free service to send information between your phones, browsers, and friends.
 
-To enable PushBullet notifications in your installation, add the following to your `configuration.yaml` file:
+To enable Pushbullet notifications in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml
 # Example configuration.yaml entry
@@ -26,12 +26,12 @@ notify:
 
 Configuration variables:
 
-- **api_key** (*Required*): Enter the API key for PushBullet. Go to https://www.pushbullet.com/ to retrieve your API key.
+- **api_key** (*Required*): Enter the API key for Pushbullet. Go to https://www.pushbullet.com/ to retrieve your API key.
 - **name** (*Optional*): Setting the optional parameter `name` allows multiple notifiers to be created. The default value is `notify`. The notifier will bind to the service `notify.NOTIFIER_NAME`.
 
 ### {% linkable_title Usage %}
 
-PushBullet is a notify platform and thus can be controlled by calling the notify service [as described here](/components/notify/). It will send a notification to all devices registered in the PushBullet account. An optional **target** parameter can be given to PushBullet to specify specific account's devices, contacts or channels.
+Pushbullet is a notify platform and thus can be controlled by calling the notify service [as described here](/components/notify/). It will send a notification to all devices registered in the Pushbullet account. An optional **target** parameter can be given to Pushbullet to specify specific account's devices, contacts or channels.
 
 Type | Prefix | Suffix | Example
 ---- | ------ | ------ | -------
diff --git a/source/_components/notify.slack.markdown b/source/_components/notify.slack.markdown
@@ -35,7 +35,7 @@ notify:
 Configuration variables:
 
 - **name** (*Optional*): Setting the optional parameter `name` allows multiple notifiers to be created. The default value is `notify`. The notifier will bind to the service `notify.NOTIFIER_NAME`.
-- **api_key** (*Required*): The slack API token to use for sending slack messages. You can get your slack API token here https://api.slack.com/web?sudo=1 
+- **api_key** (*Required*): The slack API token to use for sending slack messages.
 - **default_channel** (*Required*): The default channel to post to if no channel is explicitly specified when sending the notification message.
 
 To use notifications, please see the [getting started with automation page](/getting-started/automation/).
diff --git a/source/_components/notify.smtp.markdown b/source/_components/notify.smtp.markdown
@@ -38,11 +38,11 @@ Configuration variables:
 - **port** (*Optional*): The port that the SMTP server is using, eg. 587 for Google Mail and STARTTLS or 465/993 depending on your SMTP servers.  Defaults to 25.
 - **sender** (*Optional*): E-mail address of the sender.
 - **username** (*Optional*): Username for the SMTP account.
-- **password** (*Optional*):Password for the SMTP server that belongs to the given username. If the password contains a colon it need to be wrapped in apostrophes.
+- **password** (*Optional*): Password for the SMTP server that belongs to the given username. If the password contains a colon it need to be wrapped in apostrophes.
 - **recipient** (*Required*): Recipient of the notification.
 - **starttls** (*Optional*): Enables STARTTLS, eg. 1 or 0. Defaults to 0.
 
-To use the smtp notification, refer to it in an automation or script like in this example:
+To use the SMTP notification, refer to it in an automation or script like in this example:
 
 ```yaml
   burglar: 
@@ -61,7 +61,7 @@ To use the smtp notification, refer to it in an automation or script like in thi
                     - /home/pi/snapshot2.jpg
 ```
 
-The optional **images** field adds in-line image attachments to the email. This sends a text/HTML multi-part message instead of the plain text default.
+The optional `images` field adds in-line image attachments to the email. This sends a text/HTML multi-part message instead of the plain text default.
 
 This platform is fragile and not able to catch all exceptions in a smart way because of the large number of possible configuration combinations.
 
diff --git a/source/_components/rollershutter.rfxtrx.markdown b/source/_components/rollershutter.rfxtrx.markdown
@@ -17,6 +17,7 @@ The `rfxtrx` platform supports Siemens/LightwaveRF and RFY roller shutters that
 First you have to set up your [rfxtrx hub](/components/rfxtrx/).
 
 ### {% linkable_title Configuration %}
+
 ##### Siemens/LightwaveRF
 The easiest way to find your roller shutters is to add this to your `configuration.yaml`:
 
diff --git a/source/_components/sensor.apcupsd.markdown b/source/_components/sensor.apcupsd.markdown
@@ -36,7 +36,7 @@ Configuration variables:
 
 - **resources** array (*Required*): Contains all entries to display.
 
-#### Example
+### {% linkable_title Example  %}
 
 Given the following output from `apcaccess`:
 
diff --git a/source/_components/sensor.dte_energy_bridge.markdown b/source/_components/sensor.dte_energy_bridge.markdown
@@ -19,11 +19,12 @@ To enable this sensor, add the following lines to your `configuration.yaml` file
 ```yaml
 # Example configuration.yaml entry
 sensor:
-  platform: dte_energy_bridge
-  ip: 192.168.1.11
+  - platform: dte_energy_bridge
+    ip: 192.168.1.11
+    name: DTE Energy
 ```
 
 Configuration variables:
 
 - **ip** (*Required*): The IP address of your bridge.
-
+- **name** (*Optional*): Name to use in the frontend.
diff --git a/source/_components/sensor.mqtt.markdown b/source/_components/sensor.mqtt.markdown
@@ -65,7 +65,7 @@ sensor:
 
 If you are using a DHT sensor and a NodeMCU board (esp8266), you can retrieve temperature and humidity with a MQTT sensor. A code example can be found [here](https://github.com/mertenats/open-home-automation/tree/master/ha_mqtt_sensor_dht22). A regular MQTT message from this example looks like this: 
 
-```
+```json
 office/sensor1
   {
     "temperature": 23.20,
diff --git a/source/_components/sensor.ohmconnect.markdown b/source/_components/sensor.ohmconnect.markdown
@@ -14,7 +14,7 @@ ha_release: 0.26
 ---
 
 
-The `ohmconnect` sensor will show you the current [OhmConnect](https://ohmconnect.com) status for the given OhmConnect ID.
+The `ohmconnect` sensor will show you the current [OhmConnect](https://www.ohmconnect.com/) status for the given OhmConnect ID.
 
 > OhmConnect monitors real-time conditions on the electricity grid. When dirty and unsustainable power plants turn on, our users receive a notification to save energy. By saving energy at that time, California does not have to turn on additional power plants and California's energy authorities pay you for that.
 
diff --git a/source/_components/sensor.snmp.markdown b/source/_components/sensor.snmp.markdown
@@ -8,7 +8,7 @@ comments: false
 sharing: true
 footer: true
 logo: network-snmp.png
-ha_category: Sensor
+ha_category: System Monitor
 ha_iot_class: "Local Polling"
 ha_release: "0.22"
 ---
diff --git a/source/_components/sensor.yweather.markdown b/source/_components/sensor.yweather.markdown
@@ -45,6 +45,7 @@ sensor:
   platform: yweather
   woeid: YOUR_WOEID
   forecast: 3
+  name: OPTIONAL_NAME
   monitored_conditions:
    - weather
    - temp_min
@@ -55,6 +56,7 @@ Configuration variables:
 
 - **woeid** (*Optional*): See above.
 - **forecast** (*Optional*): Day of forecast. The default is the current day to display conditions.
+- **name** (*Optional*): The name of the sensor. To easily recognize each sensor when adding more than one Yahoo weather sensor, it is recommended to use the name option. 
 - **monitored_conditions** array (*Required*): Conditions to display in the frontend.
   - **weather**: A human-readable text summary with picture from yahoo.
   - **weather_current**: A human-readable text summary with picture from yahoo from current conditon.
diff --git a/source/_components/zeroconf.markdown b/source/_components/zeroconf.markdown
@@ -19,3 +19,13 @@ zeroconf:
 ```
 
 The registration will include metadata about the Home Assistant instance, including a base URL that can be used to access Home Assistant, the currently running Home Assistant version, and whether an API password is needed to access the instance.
+
+```bash
+$ avahi-browse -alr
++ eth0 IPv4 Home                              _home-assistant._tcp local
+= eth0 IPv4 Home                              _home-assistant._tcp local
+   hostname = [Home._home-assistant._tcp.local]
+   address = [192.168.0.5]
+   port = [8123]
+   txt = ["version=0.27.0.dev0" "base_url=http://192.168.0.5:8123" "requires_api_password=true"]
+```
diff --git a/source/_posts/2016-08-13-foursquare--fast.com--ffmpeg--gpsd.markdown b/source/_posts/2016-08-13-foursquare--fast.com--ffmpeg--gpsd.markdown
@@ -54,6 +54,10 @@ This release includes code contributed by 31 different people. The biggest chang
 
 - Fix Wemo: have PyWemo play nicely with the latest Requests ([@pavoni])
 
+### {% linkable_title Hotfix 0.26.3 - August 19 %}
+
+- Media Player cover art would not work when an API password was set. Thanks to [@maddox] for reporting it and [@balloob] for the fix.
+
 ### {% linkable_title Breaking changes %}
 
  - A new unit system has superseded the temperature unit option in the core configuration. For now it is backwards compatible, but you should update soon:
@@ -65,6 +69,7 @@ homeassistant:
   unit_system: metric
 ```
 
+[@maddox]: https://github.com/maddox
 [@pavoni]: https://github.com/pavoni
 [@mKeRix]: https://github.com/mKeRix
 [@abcminiuser]: https://github.com/abcminiuser
diff --git a/source/_posts/2016-08-16-we-have-apps-now.markdown b/source/_posts/2016-08-16-we-have-apps-now.markdown
diff --git a/source/_topics/templating.markdown b/source/_topics/templating.markdown
diff --git a/source/developers/development_testing.markdown b/source/developers/development_testing.markdown
diff --git a/source/developers/development_validation.markdown b/source/developers/development_validation.markdown
diff --git a/source/developers/helpers.markdown b/source/developers/helpers.markdown
diff --git a/source/getting-started/z-wave.markdown b/source/getting-started/z-wave.markdown
diff --git a/source/images/supported_brands/snapcast.png b/source/images/supported_brands/snapcast.png
diff --git a/source/index.html b/source/index.html

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ article.post, article.page, article.listing {`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`h1, h2, h3 {`
`218`		`- margin-bottom: 0;`
	`218`	`+ margin-bottom: 4px;`
`219`	`219`	`line-height: 1.2;`
`220`	`220`	`}`
`221`	`221`	`}`