Merge branch 'current' into next

source/developers/asyncio_categorizing_functions.markdown

@@ -30,7 +30,7 @@ def async_look_my_coroutine(target):
     if result:
         print("hello {}".format(target))
 
-hass.loop.create_task(async_look_my_coroutine("world")
+hass.loop.create_task(async_look_my_coroutine("world"))
 ```
 
 In this example, we schedule the coroutine by calling `hass.loop.create_task`. This will add the coroutine to the queue of tasks to be run. When the event loop is running `async_look_my_coroutine` it will suspend the task when `yield from entity.async_turn_on()` is called. At that point a new task will be scheduled to execute `entity.async_turn_on()`. When that job has been executed, `async_look_my_coroutine` will resume.

source/developers/development_guidelines.markdown

@@ -27,7 +27,7 @@ Those points may require that you adjust your IDE or editor settings.
 
 ## {% linkable_title Our recommandations %}
 
-For some cases [PEPs](https://www.python.org/dev/peps/) don't make a statement. This section covers our recommandations about the code style. Those points were collected from the exisiting code and based on what contributors and developers were using the most. This is basically a majority decision, thus you may not agree with it. But we would like to encourage you follow those recommandations to keep the code unified. 
+For some cases [PEPs](https://www.python.org/dev/peps/) don't make a statement. This section covers our recommendations about the code style. Those points were collected from the exisiting code and based on what contributors and developers were using the most. This is basically a majority decision, thus you may not agree with it. But we would like to encourage you follow those recommandations to keep the code unified. 
 
 ### {% linkable_title Quotes %}
 

source/developers/frontend.markdown

@@ -63,7 +63,7 @@ While you are developing, you need to have Rollup running to have changes you ma
 
 ```bash
 $ cd homeassistant/components/frontend/www_static/home-assistant-polymer
-$ npm run js_dev
+$ npm run dev
 ```
 
 The source code for the frontend can be found in two different directories:

source/developers/hassio/debugging.markdown

@@ -34,6 +34,11 @@ Step 3 in the link above, shows the path to the private key file `id_rsa` for yo
 Make sure when you are copying the public key to the root of the /boot partition of the SD card that you rename the file correctly with no `.pub` file extension.
 </p> 
 
+You should then be able to SSH into your Hass.io device. On mac/linux, use:
+```
+ssh root@hassio.local -p 22222
+```
+
 ## {% linkable_title Checking the logs %}
 
 ```bash

source/developers/websocket_api.markdown

@@ -21,11 +21,11 @@ Connect your websocket implementation to `ws://localhost:8123/api/websocket`.
 
  1. Client connects
  2. Authentication phase starts
-    a. If no further authentication necessary for the user: go to 3
-    b. Server sends `auth_required` message
-    c. Client sends `auth` message
-    d. If `auth` message correct: go to 3.
-    e. Server sends `auth_invalid`. Go to 6.
+    - If no further authentication necessary for the user: go to 3
+    - Server sends `auth_required` message
+    - Client sends `auth` message
+    - If `auth` message correct: go to 3.
+    - Server sends `auth_invalid`. Go to 6.
  3. Send `auth_ok` message
  4. Authentication phase ends.
  5. Command phase starts.