Merge branch 'master' into next

source/_components/alexa.markdown

@@ -14,12 +14,11 @@ featured: false
 
 The Alexa component allows you to integrate Home Assistant into Alexa/Amazon Echo. This component will allow you to query information within Home Assistant by using your voice. There are no supported sentences out of the box as of now, you will have to define them all yourself. This component does not yet allow the control of devices connected to Home Assistant.
 
-<p style='text-align: center;'>
+<div class='videoWrapper'>
 <iframe width="560" height="315" src="https://www.youtube.com/embed/1Ke3mtWd_cQ" frameborder="0" allowfullscreen></iframe>
-</p>
+</div>
 
-
-### Requirements before using
+### {% linkable_title Requirements before using %}
 Amazon requires the endpoint of a skill to be hosted via SSL. Self-signed certificates are ok because our skills will only run in development mode. Read more on [our blog][blog-lets-encrypt] about how to set up encryption for Home Assistant. If you are unable to get https up and running, consider using [this AWS Lambda proxy for Alexa skills](https://forums.developer.amazon.com/forums/thread.jspa?messageID=18604).
 
 [blog-lets-encrypt]: https://home-assistant.io/blog/2015/12/13/setup-encryption-using-lets-encrypt/
@@ -36,7 +35,7 @@ To get started with Alexa skills:
      - https
      - https://YOUR_HOST/api/alexa?api_password=YOUR_API_PASSWORD
 
-### Configuring your Amazon Alexa skill
+### {% linkable_title Configuring your Amazon Alexa skill %}
 
 Alexa works based on intents. Each intent has a name and variable slots. For example, a `LocateIntent` with a slot that contains a `User`. Example intent schema:
 
@@ -75,7 +74,7 @@ This means that we can now ask Alexa things like:
  - Alexa, ask Home Assistant where Paul is
  - Alexa, ask Home Assistant where we are
 
-### Configuring Home Assistant
+### {% linkable_title Configuring Home Assistant %}
 
 Out of the box, the component will do nothing. You have to teach it about all intents you want it to answer to. The way it works is that the answer for each intent is based on [templates] that you define. Each template will have access to the existing states via the `states` variable but will also have access to all variables defined in the intent.
 

source/_components/automation.markdown

@@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: home-assistant.png
 ha_category: Automation
 ---
 

source/_components/browser.markdown

@@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: browser.png
 ha_category: Other
 ---
 

source/_components/configurator.markdown

@@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: home-assistant.png
 ha_category: Other
 ---
 

source/_components/conversation.markdown

@@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: conversation.png
 ha_category: "Other"
 ---
 

source/_components/device_sun_light_trigger.markdown

@@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: home-assistant.png
 ha_category: Automation
 ---
 

source/_components/device_tracker.markdown

@@ -36,4 +36,4 @@ device_tracker:
 
 Once tracked, a file will be created in your config dir called `known_devices.yaml`. Edit this file to adjust which devices to be tracked. Here you can also setup a URL for each device to be used as the entity picture and set whether the device will be show in the UI when in the away state.
 
-Multiple device trackers can be used in parallel, such as [Owntracks](/components/device_tracker.owntracks/) and [Nmap](/components/device_tracker.nmap_scanner/). The state of the device will be determined by the source that reported last.
+Multiple device trackers can be used in parallel, such as [Owntracks](/components/device_tracker.owntracks/) and [Nmap](/components/device_tracker.nmap_scanner/). The state of the device will be determined by the source that reported last. Device tracker will look for global settings (track_new_devices, consider_home and home_interval) under the configuration of the first platform.

source/_components/discovery.markdown

@@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: home-assistant.png
 ha_category: Other
 ---
 
@@ -28,6 +29,11 @@ To load this component, add the following lines to your `configuration.yaml`:
 discovery:
 ```
 
+<p class='note'>
+The home-assistant server must be on the same network as the devices for uPnP discovery to work. 
+If running home-assistant in a docker container use switch `--net=host` to put it on the host's network.
+</p>
+
 If you are developing a new platform, please read [how to make your platform discoverable]({{site_root}}/developers/add_new_platform/#discovery).
 
 <p class='note warning'>

source/_components/downloader.markdown

@@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: downloader.png
 ha_category: Other
 ---
 

source/_components/group.markdown

@@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: home-assistant.png
 ha_category: Organization
 ---
 

source/_components/history.markdown

@@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: home-assistant.png
 ha_category: "History"
 ---
 

source/_components/http.markdown

@@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: http.png
 ha_category: "Other"
 ---
 

source/_components/influxdb.markdown

@@ -11,7 +11,7 @@ logo: influxdb.png
 ha_category: "History"
 ---
 
-The `influxdb` component makes it possible to transfer all state changes to an external [InfluxDB](https://influxdb.com/) database.
+The `influxdb` component makes it possible to transfer all state changes to an external [InfluxDB](https://influxdb.com/) database. For more details, [see the blog post on InfluxDB](/blog/2015/12/07/influxdb-and-grafana/).
 
 To use the `influxdb` component in your installation, add the following to your `configuration.yaml` file:
 
@@ -29,7 +29,7 @@ Configuration variables:
 
 - **host** (*Required*): IP address of your database host, eg. http://192.168.1.10.
 - **port** (*Optional*): Port to use. Defaults to 8086.
-- **database** (*Optional*): Name of the database to use. Defaults to `home_assistant`
+- **database** (*Optional*): Name of the database to use. Defaults to `home_assistant`. The database must already exist.
 - **username** (*Optional*): The username of the database user.
 - **password** (*Optional*): The password for the database user account.
 

source/_components/introduction.markdown

@@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: home-assistant.png
 ha_category: Other
 ---
 

source/_components/logbook.markdown

@@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: logbook.png
 ha_category: "History"
 ---
 

source/_components/logger.markdown

@@ -7,10 +7,11 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: home-assistant.png
 ha_category: "Other"
 ---
 
-The logger component let one define the level of logging activities in Home Assistant.
+The logger component lets one define the level of logging activities in Home Assistant.
 
 To enable the logger in your installation, add the following to your `configuration.yaml` file:
 

source/_components/scene.markdown

@@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: home-assistant.png
 ha_category: Organization
 ---
 

source/_components/script.markdown

@@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: home-assistant.png
 ha_category: Automation
 ---
 
@@ -19,7 +20,7 @@ script:
   wakeup:
     alias: Wake Up
     sequence:
-      - event: logbook_entry
+      - event: LOGBOOK_ENTRY
         event_data:
           name: Paulus
           message: is waking up

source/_components/sensor.torque.markdown

@@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: torque.png
 ha_category: Sensor
 ---
 

source/_components/sensor.twitch.markdown

@@ -21,8 +21,8 @@ To use Twitch with your installation, add the following to your `configuration.y
 sensor:
   platform: twitch
   channels:
-  - channel1
-  - channel2
+    - channel1
+    - channel2
 ```
 
 Configuration variables:

source/_components/simple_alarm.markdown

@@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: home-assistant.png
 ha_category: Alarm
 ---
 

source/_components/sun.markdown

@@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: sun.png
 ha_category: Weather
 ---
 

source/_components/switch.command_switch.markdown

@@ -11,7 +11,7 @@ ha_category: Switch
 ---
 
 
-A switch platform that issues specific commands when it is turned on and off. This might very well become our most platform as it allows anyone to integrate any type of switch into Home Assistant that can be controlled from the command line, including calling other scripts!
+A switch platform that issues specific commands when it is turned on and off. This might very well become our most powerful platform as it allows anyone to integrate any type of switch into Home Assistant that can be controlled from the command line, including calling other scripts!
 
 To enable it, add the following lines to your `configuration.yaml`:
 

source/_components/switch.vera.markdown

@@ -18,7 +18,7 @@ To use your Vera switches in your installation, add the following to your `confi
 
 ```yaml
 # Example configuration.yaml entry
-light:
+switch:
   platform: vera
   vera_controller_url: http://YOUR_VERA_IP:3480/
   device_data:

source/_components/thermostat.heat_control.markdown

@@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: heat-control.png
 ha_category: Thermostat
 ---
 

source/_components/updater.markdown

@@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: updater.png
 ha_category: Other
 ---
 

source/_components/zone.markdown

@@ -7,6 +7,7 @@ sidebar: true
 comments: false
 sharing: true
 footer: true
+logo: home-assistant.png
 ha_category: Organization
 ---