Merge branch 'current' into next

source/_components/camera.generic.markdown

@@ -16,7 +16,7 @@ ha_iot_class: "depends"
 
 The `generic` camera platform allows you to integrate any IP camera or other URL into Home Assistant. Templates can be used to generate the URLs on the fly.
 
-Home Assistant will serve the images via its server, making it possible to view your IP camera's while outside of your network. The endpoint is `/api/camera_proxy/camera.[name]`.
+Home Assistant will serve the images via its server, making it possible to view your IP cameras while outside of your network. The endpoint is `/api/camera_proxy/camera.[name]`.
 
 To enable this camera in your installation, add the following to your `configuration.yaml` file:
 

source/_components/media_player.aquostv.markdown

@@ -53,5 +53,6 @@ Currently known supported models:
 - LC-60LE925UN
 - LC-60LE857U
 - LC-60EQ10U
+- LC-60SQ15U
 
 If your model is not on the list then give it a test, if everything works correctly then add it to the list on [GitHub](https://github.com/home-assistant/home-assistant.github.io/tree/current/source/_components/media_player.aquostv.markdown).

source/_components/nest.markdown

@@ -34,7 +34,7 @@ The Nest component is the main component to integrate all [Nest](https://nest.co
 9. Once the new product page opens the "Product ID" and "Product Secret" are located on the right side. These will be used as `client_id` and `client_secret` below.
 10. Once Home Assistant is started, a configurator will pop up asking you to log into your Nest account and copy a PIN code into Home Assistant.
 
-Connecting to the Nest Developer API requires outbound port 8553 on your firewall. The configuration will fail if this is not accessible.
+Connecting to the Nest Developer API requires outbound port 9553 on your firewall. The configuration will fail if this is not accessible.
 
 ### {% linkable_title Configuration %}
 

source/_components/netatmo.markdown

@@ -55,6 +55,3 @@ That's it. You can copy and paste your new `client id` and `client secret` in yo
 <img src='/images/screenshots/netatmo_api.png' />
 </p>
 
-<p class='note'>
-The Home Assistant Netatmo platform has only be tested with the classic indoor, outdoor module and rain meter. There is no support for the wind meter module at this time because developers does not own these modules.
-</p>

source/_components/sensor.coinmarketcap.markdown

@@ -28,12 +28,12 @@ sensor:
 currency:
   description: The cryptocurrency to use.
   required: false
-  type: string, list
+  type: string
   default: Bitcoin
 display_currency:
   description: The currency to display.
   required: false
-  type: string, list
+  type: string
   default: USD
 {% endconfiguration %}
 

source/_components/sensor.openweathermap.markdown

@@ -30,7 +30,7 @@ sensor:
 ```
 
 {% configuration %}
-  apk_key:
+  api_key:
     description: Your API key for OpenWeatherMap.
     required: true
     type: string

source/_cookbook/configuration_yaml_by_chriskacerguis.markdown

@@ -0,0 +1,12 @@
+---
+layout: page
+title: "Configuration.yaml by chriskacerguis"
+description: ""
+date: 2017-12-12 09:14
+sidebar: true
+comments: false
+sharing: true
+footer: true
+ha_category: Example configuration.yaml
+ha_external_link: https://github.com/chriskacerguis/Home-AssistantConfig
+---

source/_docs/autostart/systemd.markdown

@@ -128,7 +128,7 @@ Because the log can scroll quite quickly, you can select to view only the error
 $ sudo journalctl -f -u home-assistant@[your user] | grep -i 'error'
 ```
 
-When working on Home Assitant, you can easily restart the system and then watch the log output by combining the above commands using `&&`
+When working on Home Assistant, you can easily restart the system and then watch the log output by combining the above commands using `&&`
 
 ```bash
 $ sudo systemctl restart home-assistant@[your user] && sudo journalctl -f -u home-assistant@[your user]

source/_docs/installation/windows.markdown

@@ -9,7 +9,7 @@ sharing: true
 footer: true
 ---
 
-To run Home Assistant on Microsoft Windows installation you need to install Python first. Download Python for https://www.python.org/downloads/windows/ and follow the instructions of the installer.
+To run Home Assistant on Microsoft Windows installation you need to install Python first. Download Python for [https://www.python.org/downloads/windows/](https://www.python.org/downloads/windows/) and follow the instructions of the installer.
 
 Start 
 
@@ -23,5 +23,5 @@ For autostarting Home Assistant please refer to this [guide](https://community.h
 Check this [video](https://www.youtube.com/watch?v=X27eVvuqwnY) for the installation on Windows 10.
 
 <p class='note warning'>
-The Microsoft Windows platform is not a primary target to install home Assistant. Also, not all tools and third-party modules will work.
+The Microsoft Windows platform is not a primary target to install Home Assistant. Also, not all tools and third-party modules will work.
 </p>

source/_docs/z-wave.markdown

@@ -20,7 +20,7 @@ Before configuring the Z-Wave setup, please take a moment and read [this article
 
 Z-Wave is a wireless communication protocol designed for home automation. It uses a low power, and low bandwidth, mesh network that allows devices that aren't within direct range of each other to communicate indirectly, via other nodes. Any device that's permanently powered (not battery powered) will help build the mesh, if you don't have enough powered devices, or you locate these poorly, your mesh will be unreliable.
 
-There is a limit of 232 devices in a single Z-Wave network. If you need more devices then you could set up a second Home Assistant system with its own Z-Wave network and connect these with the [MQTT Eventstream](/components/mqtt_eventstream/) or [MQTT Statestream](/components/mqtt_statestream) components.
+There is a limit of 232 devices in a single Z-Wave network. If you need more devices then you could set up a second Home Assistant system with its own Z-Wave network and connect these with the [MQTT Eventstream](/components/mqtt_eventstream/) or [MQTT Statestream](/components/mqtt_statestream) components. There is also a limit of 4 hops for Z-Wave, so placing the controller as centrally as you can is important.
 
 The Z-Wave standard was improved with Z-Wave Plus, and if you only use Z-Wave plus devices then you will gain the full benefits.
 

source/_docs/z-wave/installation.markdown

@@ -159,7 +159,7 @@ To enable Z-Wave, plug your Z-Wave USB stick into your Raspberry Pi 3 and add th
 
 ```yaml
 zwave:
-  usb_path: /dev/ttyACM0
+  usb_path: /dev/ttyAMA0
 ```
 
 For some devices the `/dev/ttyAMA0` device is not detected by udev and is therefore not mapped by Docker. To explicitly set this device for mapping to Home-Assistant, execute the following command using the ssh add-on:

source/developers/development_environment.markdown

@@ -37,7 +37,26 @@ Additional dependencies exist if you plan to perform Frontend Development, pleas
 
 If you are using Windows as a development platform, make sure that you have the correct Microsoft [Visual C++ build tools](http://landinghub.visualstudio.com/visual-cpp-build-tools) installed. The installation of the most requirements and validation using `tox` will fail if this is not done correctly. Check the [Windows Compilers](https://wiki.python.org/moin/WindowsCompilers) section on the [Python website](https://www.python.org/) for details.
 
-It is recommended using [PyCharm](https://www.jetbrains.com/pycharm/download/) as debugger.
+Due to Home Assistant is mainly designed and developed on Linux distributions it is not recommended to develop on Windows machines. However on Windows 10 machines you should decide to set up a [Linux subsystem](https://docs.microsoft.com/de-de/windows/wsl/install-win10).
+
+Setup Linux subsystem.
+
+```bash
+$ apt-get update
+$ apt-get upgrade
+$ echo 'export DISPLAY=:0' >> ~/.bashrc && . ~/.bashrc
+$ sudo apt-get install xubuntu-desktop -y
+```
+
+It is recommended using [PyCharm](https://www.jetbrains.com/pycharm/download/) as debugger. Download and start PyCharm.
+
+```bash
+$ wget https://download.jetbrains.com/python/pycharm-community-20XX.X.tar.gz
+$ tar -xzf pycharm-community-20XX.X
+$ ./pycharm.sh
+```
+
+In order to display the PyCharm GUI on Windows you need to run a X-Server like [VcXserv](https://sourceforge.net/projects/vcxsrv/).
 
 Also, make sure to install or upgrade the `setuptools` Python package. It contains compatibility improvements and adds automatic use of compilers:
 
@@ -84,9 +103,6 @@ $ script/setup
 
 ### {% linkable_title Logging %}
 
-By default logging in home-assistant is tuned for operating in
-production (set to INFO by default, with some modules set to even less
-verbose logging levels).
+By default logging in home-assistant is tuned for operating in production (set to INFO by default, with some modules set to even less verbose logging levels).
 
-You can use the [logger](/components/logger/) component to adjust
-logging to DEBUG to see even more details about what is going on.
+You can use the [logger](/components/logger/) component to adjust logging to DEBUG to see even more details about what is going on.

source/developers/hassio/addon_config.markdown

@@ -114,7 +114,10 @@ The config for an add-on is stored in `config.json`.
 | boot | yes | `auto` by system and manual or only `manual`
 | ports | no | Network ports to expose from the container. Format is `"container-port/type": host-port`.
 | host_network | no | If that is True, the add-on run on host network.
+| host_ipc | no | Default False. Allow to share the IPC namespace with others.
+| host_dbus | no | Default False. Map Host dbus service into add-on.
 | devices | no | Device list to map into the add-on. Format is: `<path_on_host>:<path_in_container>:<cgroup_permissions>`. i.e. `/dev/ttyAMA0:/dev/ttyAMA0:rwm`
+| auto_uart | no | Default False. Auto mapping all UART/Serial device from host into add-on.
 | hassio_api | no | This add-on can access to Hass.io REST API. It set the host alias `hassio`.
 | homeassistant_api | no | This add-on can access to Hass.io Home-Assistant REST API proxy. Use `http://hassio/homeassistant/api`.
 | privileged | no | Privilege for access to hardware/system. Available access: `NET_ADMIN`, `SYS_ADMIN`, `SYS_RAWIO`