Merge branch 'current' into next

source/_docs/automation/action.markdown

@@ -21,7 +21,7 @@ automation:
     platform: sun
     event: sunset
   action:
-    service: homeassistant.turn_on
+    service: light.turn_on
     entity_id:
       - light.kitchen
       - light.living_room

source/_docs/automation/editor.markdown

@@ -21,7 +21,7 @@ Choose a meaningful name for your automation rules.
   <img src='{{site_root}}/images/docs/automation-editor/new-automation.png' />
 </p>
 
-If the value of the is greater than 10 then the automation rule should apply.
+If the value of the sensor is greater than 10 then the automation rule should apply.
 
 <p class='img'>
   <img src='{{site_root}}/images/docs/automation-editor/new-trigger.png' />

source/_docs/installation/armbian.markdown

@@ -18,8 +18,17 @@ $ sudo apt-get update
 $ sudo apt-get install python3-dev python3-pip
 ```
 
-Install Home Assistant.
-
+Now that you installed python, there are two ways to install Home Assistant:
+1. It is recommended to install Home Assistant in a virtual environment to avoid using `root`, using the [VirtualEnv instructions](/docs/installation/virtualenv/)
+2. Alternatively, you can install Home Assistant for the user you created when first booting Armbian:
 ```bash
 $ sudo pip3 install homeassistant
+$ hass --open-ui
 ```
+Running these commands will:
+
+ - Install Home Assistant
+ - Launch Home Assistant and serve the web interface on [http://localhost:8123](http://localhost:8123)
+ - the configuration files will be created in /home/{user}/.homeassistant
+ 
+