Merge branch 'current' into next

source/_components/calendar.caldav.markdown

@@ -22,7 +22,7 @@ You need to have a CalDav server and eventually credentials for it. This compone
 You might need some additional system packages to compile the Python caldav library. On a Debian based system, install them by:
 
 ```bash
-$ sudo apt-get install libxm2-dev libxslt1-dev zlib1g-dev
+$ sudo apt-get install libxml2-dev libxslt1-dev zlib1g-dev
 ```
 
 ### {% linkable_title Basic Setup %}

source/_components/device_tracker.bluetooth_le_tracker.markdown

@@ -43,6 +43,9 @@ device_tracker:
 Configuration variables:
 
 - **device_id** (*Optional*): The device ID for the Bluetooth device to be used for tracking. Defaults to `hci0`.
+- **track_new_devices** (*Optional*): If new discovered devices are tracked by default. Defaults to `True`.
+- **scan_duration** (*Optional*): How long should the scanner be looking for BLE devices. Defaults to `10` seconds.
+- **interval_seconds** (*Optional*): Seconds between each scan for new devices. Defaults to `12` seconds.
 
 As some BT LE devices change their MAC address regularly, a new device is only discovered when it has been seen 5 times.
 Some BTLE devices (e.g. fitness trackers) are only visible to the devices that they are paired with. In this case, the BTLE tracker won't see this device.

source/_components/dominos.markdown

@@ -25,11 +25,11 @@ Currently, there is no support in this component for toppings, coupons or order
 ```yaml
 dominos:
   country_code: ca
-  first_name: Justin
-  last_name: Trudeau
-  email: justin.trudeau@parl.gc.ca
-  phone: 6139950253
-  address: 24 Sussex Dr, Ottawa, ON, K1M1M4
+  first_name: John
+  last_name: Smith
+  email: john.smith@example.com
+  phone: 123456789
+  address: 24 Housten Dr, Ottawa, ON, K2M2M2
   orders:
   - name: Medium Pan
     codes:

source/_components/hue.markdown

@@ -64,8 +64,7 @@ hue:
   bridges:
     - host: BRIDGE1_IP_ADDRESS
       filename: phue.conf
-    - platform: hue
-      host: BRIDGE2_IP_ADDRESS
+    - host: BRIDGE2_IP_ADDRESS
       filename: phue2.conf
 ```
 
@@ -106,7 +105,7 @@ More information can be found on the [Philips Hue API documentation](https://www
 
 The Hue platform has it's own concept of scenes for setting the colors of a group of lights at once. Hue Scenes are very cheap, get created by all kinds of apps (as it is the only way to have 2 or more lights change at the same time), and are rarely deleted. A typical Hue hub might have hundreds of scenes stored in them, many that you've never used, almost all very poorly named.
 
-To avoid user interface overload we don't expose scenes directly. Instead there is a [light.hue_activate_scene](/components/light/#service-lighthue_activate_scene) service which can be used by `automation` or `script` components.
+To avoid user interface overload we don't expose scenes directly. Instead there is a hue.hue_activate_scene service which can be used by `automation` or `script` components.
 This will have all the bulbs transitioned at once, instead of one at a time using standard scenes in Home Assistant.
 
 For instance:
@@ -115,7 +114,7 @@ For instance:
 script:
   porch_on:
     sequence:
-      - service: light.hue_activate_scene
+      - service: hue.hue_activate_scene
         data:
           group_name: "Porch"
           scene_name: "Porch Orange"

source/_components/light.mochad.markdown

@@ -1,7 +1,7 @@
 ---
 layout: page
 title: "Mochad Light"
-description: "Instructions how to integrate X10 Mochad switches into Home Assistant."
+description: "Instructions how to integrate X10 Mochad lights into Home Assistant."
 date: 2017-07-14 11:29
 sidebar: true
 comments: false
@@ -11,7 +11,7 @@ ha_category: Light
 ha_release: 0.51
 ---
 
-The `mochad` switch platform lets you control an X10 enabled dimmer/light
+The `mochad` light platform lets you control an X10 enabled dimmer/light
 device.
 
 To enable this sensor, you first have to set up the [mochad component](/components/mochad/) and then add the following to your `configuration.yaml` file:
@@ -28,5 +28,7 @@ light:
 Configuration variables:
 
 - **address** (*Required*): The X10 address of the light.
-- **name** (*Optional*): The name of the switch. Default is: x10_light_dev_*address*.
+- **name** (*Optional*): The name of the light. Default is: x10_light_dev_*address*.
 - **comm_type** (*Optional*): pl (powerline) or rf (radio frequency). Default is pl.
+- **brightness_levels** (*Optional*): The number of brightness levels the X10 light device supports. This can either be 32, 64, or 256 (note that the max
+value sent to the device will be n-1 because it starts at 0)

source/_components/sensor.alpha_vantage.markdown

@@ -16,7 +16,7 @@ ha_release: "0.60"
 
 The `alpha_vantage` sensor platform uses [Alpha Vantage](https://www.alphavantage.co) to monitor the stock market.
 
-To enable the `yahoo_finance` platform, add the following lines to your `configuration.yaml` file:
+To enable the `alpha_vantage` platform, add the following lines to your `configuration.yaml` file:
 
 ```yaml
 # Example configuration.yaml entry
@@ -45,7 +45,7 @@ In this section you find some real life examples of how to use this sensor.
 
 ```yaml
 sensor:
-  - platform: yahoo_finance
+  - platform: alpha_vantage
     symbols:
       - RHT
       - GOOGL

source/_components/volvooncall.markdown

@@ -65,4 +65,5 @@ Configuration variables:
 - **service_url** (*Optional*): The service URL to use for Volvo On Call. Normally not neccessary to specify.
 - **name** (*Optional*): Make it possible to provide a name for the vehicles.
 - **resources** (*Optional*): A list of resources to display (defaults to all available).
+- **scandinavian_miles** (*Optional*): If set to yes, Scandinavian miles ("mil") are used for distances and fuel range (defaults to no).
 

source/_posts/2017-12-17-introducing-home-assistant-cloud.markdown

@@ -42,6 +42,8 @@ The next step is to configure Alexa. This can be done by enabling the Home Assis
 
 Once you’re done, ask Alexa to discover devices (“Alexa, discover devices”) and you are all set to control them: “Alexa, turn on <device name>”.
 
+See the [Cloud component configuration](/components/cloud/) to learn how to filter which devices get exposed to Alexa.
+
 ## {% linkable_title FAQ %}
 
 **Will Home Assistant and Hass.io remain open source?**
@@ -59,3 +61,11 @@ We have a lot of ideas! We are not going to make any promises but here are some
 - Generic HTTP cloud endpoint for people to send messages to their local instance. This will allow people to build applications on - top of the Home Assistant cloud.
 - IFTTT integration
 - Alexa shopping list integration
+
+**What countries are supported?**
+
+Only US is currently supported. Expect more countries to be supported soon. The reason there is a country limitation is that we need to do extra steps and certifications for each country's Alexa skill.
+
+**How is the connection made to the cloud?**
+
+The connection is made using a WebSocket connection over HTTPS. [See the source here](https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/cloud/iot.py).

source/developers/frontend_translation.markdown

@@ -15,6 +15,8 @@ ha_release: 0.57
 
 First time users may find it helpful to switch between multilanguage and single language view using the <img src='/images/frontend/lokalise-multilanguage-view-button.png' alt="Multilanguage view" style="width: 17px; border: none;"/> button. For more information about the translation workflow, please see the [Lokalise translation workflow documents](https://docs.lokalise.co/category/iOzEuQPS53-for-team-leads-and-translators).
 
+Some translation strings will contain special placeholders that will be replaced later. Placeholders shown in square brackets `[]` are [Lokalise key references](https://docs.lokalise.co/article/KO5SZWLLsy-key-referencing). These are primarily used to link translation strings that will be duplicated. Different languages may not have the same duplicates as English, and are welcome to link duplicate translations that are not linked in English. Placeholders shown in curly brackets `{}` are [translation arguments](https://formatjs.io/guides/message-syntax/) that will be replaced with a live value when Home Assistant is running. Any translation argument placeholders present in the original string must be included in the translated string. These may include special syntax for defining plurals or other replacement rules. The linked format.js guide explains the syntax for adding plural definitions and other rules.
+
 <p class='note'>
 The translation of the Home Assistant frontend is still a work in progress. More phrases will be available for translation soon.
 </p>

source/index.html

@@ -38,7 +38,7 @@ description: Open-source home automation platform running on Python 3. Track and
         Use Alexa to control Home Assistant.
 
         <div class='links'>
-          <a href='/components/cloud/'>LEARN MORE</a>
+          <a href='/blog/2017/12/17/introducing-home-assistant-cloud/'>LEARN MORE</a>
         </div>
       </div>