Merge branch 'current' into next

_config.yml

@@ -139,8 +139,8 @@ social:
 # Home Assistant release details
 current_major_version: 0
 current_minor_version: 93
-current_patch_version: 0
+current_patch_version: 2
-date_released: 2019-05-16
+date_released: 2019-05-22
 
 # Either # or the anchor link to latest release notes in the blog post.
 # Must be prefixed with a # and have double quotes around it.

source/_components/binary_sensor.template.markdown

@@ -215,3 +215,30 @@ binary_sensor:
              or is_state('binary_sensor.family_room_144', 'on') }}
 ```
 {% endraw %}
+
+### {% linkable_title Change the icon when state changes %}
+
+This example demonstrates how to use `icon_template` to change the entity's
+icon as its state changes, it evaluates the state of its own sensor and uses a 
+conditional statement to output the appropriate icon. 
+
+
+{% raw %}
+```yaml
+sun:
+binary_sensor:
+  - platform: template
+    sensors:
+      sun_up:
+        entity_id:
+          - sun.sun
+        value_template: >-
+          {{ is_state("sun.sun", "above_horizon") }}
+        icon_template: >-
+          {% if is_state("binary_sensor.sun_up", "on") %}
+            mdi:weather-sunset-up
+          {% else %}
+            mdi:weather-sunset-down
+          {% endif %}
+```
+{% endraw %}

source/_components/epsonworkforce.markdown

@@ -67,6 +67,7 @@ Tested devices:
 - Epson WF3620
 - Epson WF3640
 - Epson EcoTank ET-77x0
+- Epson ET-2650
 
 To make this module work you need to connect your printer to your LAN.
 The best is to navigate to the status page of the printer to check if it shows the page with the ink levels on the URL http://<IP_ADDRESS>/PRESENTATION/HTML/TOP/PRTINFO.HTML

source/_components/google_pubsub.markdown

@@ -55,9 +55,8 @@ credentials_json:
   type: string
 filter:
   description: Filter domains and entities for Google Cloud Pub/Sub.
-  required: false
+  required: true
   type: map
-  default: Includes all entities from all domains
   keys:
     include_domains:
       description: List of domains to include (e.g., `light`).

source/_components/meteoalarm.markdown

@@ -54,7 +54,7 @@ language:
 
 You will find an example below when the state is "on".
 
-{% raw %}
+```
 attribution: Information provided by MeteoAlarm
 language: en-GB
 category: Met
@@ -76,7 +76,7 @@ awareness_type: 8; forest-fire
 unit_of_measurement:
 friendly_name: meteoalarm
 icon: mdi:alert
-{% endraw %}
+```
 
 There are a few awareness levels:
 
@@ -89,6 +89,7 @@ There are a few awareness levels:
 Below you find an example of an automation.
 
 {% raw %}
+```yaml
 automation:
   - alias: Alert me about weather warnings
     trigger:
@@ -100,6 +101,7 @@ automation:
         data_template:
           title: '{{state_attr('binary_sensor.meteoalarm', 'headline')}}'
           message: "{{state_attr('binary_sensor.meteoalarm', 'description')}} is effective on {{state_attr('binary_sensor.meteoalarm', 'effective')}}"
+```
 {% endraw %}
 
 <p class='note warning'>

source/_components/netgear.markdown

@@ -18,6 +18,10 @@ redirect_from:
 
 This platform allows you to detect presence by looking at connected devices to a [Netgear](http://www.netgear.com/) device.
 
+<p class='note'>
+A recent updates of Orbi APs introduced a bug which takes several hours to detects presence on your local network. The current workaround is to force this component to use the Orbi's API v2 by adding the `accesspoints:` node to your configuration.
+</p>
+
 To use this device tracker in your installation, add the following to your `configuration.yaml` file:
 
 ```yaml

source/_components/python_script.markdown

@@ -38,7 +38,7 @@ hass.bus.fire(name, { "wow": "from a Python script!" })
 ```
 
  - Start Home Assistant
- - Call service `python_script/hello_world` with parameters
+ - Call service `python_script.hello_world` with parameters
 
 ```json
 {

source/_components/roomba.markdown

@@ -18,7 +18,7 @@ redirect_from:
 The `roomba` component allows you to control your [iRobot Roomba](http://www.irobot.com/For-the-Home/Vacuuming/Roomba.aspx) vacuum.
 
 <p class='note'>
-This platform has only been tested with an iRobot Roomba 980 but should work find with any Wi-Fi enabled Roomba like the 690, 890 or the 960.
+This platform has only been tested with an iRobot Roomba 980 but should work fine with any Wi-Fi enabled Roomba like the 690, 890 or the 960.
 </p>
 
 ## {% linkable_title Configuration %}

source/_components/samsungtv.markdown

@@ -16,11 +16,13 @@ redirect_from:
  - /components/media_player.samsungtv/
 ---
 
-The `samsungtv` platform allows you to control a
+The `samsungtv` platform allows you to control a [Samsung Smart TV](http://www.samsung.com/uk/consumer/tv-audio-video/televisions/).
-[Samsung Smart TV](http://www.samsung.com/uk/consumer/tv-audio-video/televisions/).
 
-When the TV is first connected,
+### {% linkable_title Setup %}
-you will need to accept Home Assistant on the TV to allow communication.
+
+When the TV is first connected, you will need to accept Home Assistant on the TV to allow communication.
+
+### {% linkable_title Configuration %}
 
 To add a TV to your installation without relying on the [discovery component](/components/discovery/), add the following to your `configuration.yaml` file:
 
@@ -28,7 +30,7 @@ To add a TV to your installation without relying on the [discovery component](/c
 # Example configuration.yaml entry
 media_player:
   - platform: samsungtv
-    host: 192.168.0.10
+    host: IP_ADDRESS
 ```
 
 {% configuration %}
@@ -100,6 +102,7 @@ Currently known supported models:
 - UE6199UXZG (port must be set to 8001, On/Off, Forward/Backward, Volume control, but no Play button)
 - UE65KS8005 (port must be set to 8001, On/Off, Forward/Backward, Volume are OK, but no Play button)
 - UE49KU6470 (port must be set to 8001, On/Off, Forward/Backward, Volume are OK, but no Play button)
+- UE46ES5500 (partially supported, turn on doesn't works)
 
 Currently tested but not working models:
 
@@ -116,16 +119,11 @@ Currently tested but not working models:
 - MU6125 - Unable to see state and unable to control (Tested on UE58MU6125 on port 8001 and 8801)
 - MU6300 - Port set to 8001, `pip3 install websocket-client` must be executed, turning on works, status not working reliably, turning off is not permanent (it comes back on)
 
-None of the 2014 (H) and 2015 (J) model series (e.g., J5200) will work,
+None of the 2014 (H) and 2015 (J) model series (e.g., J5200) will work, since Samsung have used a different (encrypted) type of interface for these.
-since Samsung have used a different (encrypted) type of interface for these.
 
-If your model is not on the list then give it a test,
+If your model is not on the list then give it a test, if everything works correctly then add it to the list on
-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/samsungtv.markdown).
-The first letter (U, P, L, H & K) represent the screen type, e.g., LED or
+The first letter (U, P, L, H & K) represent the screen type, e.g., LED or Plasma. The second letter represents the region, E is Europe, N is North America and A is Asia & Australia. The two numbers following that represent the screen size.
-Plasma. The second letter represents the region, E is Europe, N is North America
-and A is Asia & Australia.
-The two numbers following that represent the screen size.
 If you add your model remember to remove these first 4 characters before adding to the list.
 
 Changing channels can be done by calling the `media_player.play_media` service

source/_components/sesame.markdown

@@ -22,24 +22,20 @@ The `sesame` platform allows you to control your [Sesame](https://candyhouse.co/
 
 Your Sesame needs to be paired with a mobile device running the app in *virtual station* mode, or a standalone [Wi-Fi Access Point](https://candyhouse.co/collections/frontpage/products/wi-fi-access-point).
 
+You will also need to generate an API key from [my.candyhouse.co](https://my.candyhouse.co/#/credentials).
+
 Once you have remote access enabled using one of the above AND the Integration - cloud option enabled on the Sesame app for that lock settings, add the following to your `configuration.yaml` file:
 
 ```yaml
 # Example configuration.yaml entry
 lock:
   - platform: sesame
-    email: YOUR_E_MAIL_ADDRESS
+    api_key: YOUR_SESAME_API_KEY
-    password: YOUR_PASSWORD
 ```
 
 {% configuration %}
-email:
+api_key:
-  description: The email address for your Sesame account.
+  description: The API key for your Sesame account.
-  required: true
-  type: string
-password:
-  description: The password for your Sesame account.
   required: true
   type: string
 {% endconfiguration %}
-

source/_components/sql.markdown

@@ -131,6 +131,8 @@ sensor:
 
 #### {% linkable_title MariaDB/MySQL %}
 
+Change `table_schema="hass"` to the name that you use as the database name, to ensure that your sensor will work properly.
+
 {% raw %}
 ```yaml
 sensor:

source/_components/system_log.markdown

@@ -141,8 +141,9 @@ automation:
       to: 'on'
     action:
       service: system_log.write
-      message: 'Door opened!'
+      data_template:
-      level: info
+        message: 'Door opened!'
+        level: info
 ```
 {% endraw %}
 

source/_docs/ecosystem/apache.markdown

@@ -28,7 +28,7 @@ Enable [`mod_proxy_wstunnel`](https://httpd.apache.org/docs/2.4/mod/mod_proxy_ws
 $ sudo a2enmod proxy_wstunnel
 ```
 
-To be able to access to your Home Assistant instance by using https://home.example.org, add to following file to `/etc/httpd/conf/extra/` as `hass.conf`
+To be able to access to your Home Assistant instance by using https://home.example.org, add the following file to `/etc/httpd/conf/extra/` as `hass.conf`
 
 ```text
 <VirtualHost *:443>

source/_docs/ecosystem/backup/backup_github.markdown

@@ -162,6 +162,7 @@ python:
   - "3.5"
 before_install:
   - mv travis_secrets.yaml secrets.yaml
+  - sudo apt-get install -y libudev-dev
 install:
   - pip3 install homeassistant
 script:

source/_docs/ecosystem/certificates/lets_encrypt.markdown

@@ -10,7 +10,7 @@ footer: true
 ---
 
 <p class='note'>
-If you are using Hass.io or Hassbian, do not use this guide. Instead, use the [DuckDNS add-on](/addons/duckdns/) for Hass.io or the [DuckDNS suite](https://github.com/home-assistant/hassbian-scripts/blob/master/docs/duckdns.md) for Hassbian to automatically maintain a subdomain including HTTPS certificates via Let's Encrypt.
+If you are using Hass.io or Hassbian, do not use this guide. Instead, use the [DuckDNS add-on](/addons/duckdns/) for Hass.io or the [DuckDNS suite](https://github.com/home-assistant/hassbian-scripts/blob/master/docs/suites/duckdns.md) for Hassbian to automatically maintain a subdomain including HTTPS certificates via Let's Encrypt.
 </p>
 
 <p class='note warning'>

source/_docs/ecosystem/certificates/tls_self_signed_certificate.markdown

@@ -44,4 +44,11 @@ http:
 
 A restart of Home Assistant is required for the changes to take effect.
 
+If you get any log error about *ssl_key* or *ssl_certificate* that is **not a file for dictionary value** when run Home Assistant, you need to change owner or access permission of the `.pem` files as following:
+  
+```bash
+$ sudo chown homeassistant:homeassistant certificate.pem privkey.pem
+$ sudo chmod 755 certificate.pem privkey.pem
+```
+
 A tutorial "[Working with SSL Certificates, Private Keys and CSRs](https://www.digitalocean.com/community/tutorials/openssl-essentials-working-with-ssl-certificates-private-keys-and-csrs)" could give you some insight about special cases.

source/_docs/ecosystem/hadashboard.markdown

@@ -37,4 +37,4 @@ HADashboard is a modular, skinnable dashboard for [Home Assistant](/) that is in
     Glassic Theme
 </p>
 
-For full installation instructions see the HADashboard section in the [AppDaemon Project Documentation](http://appdaemon.readthedocs.io/en/stable/DASHBOARD_INSTALL.html). If you're using Hassbian, then the [Hassbian scripts](https://github.com/home-assistant/hassbian-scripts/blob/dev/docs/appdaemon.md) make it easy to install AppDaemon.
+For full installation instructions see the HADashboard section in the [AppDaemon Project Documentation](http://appdaemon.readthedocs.io/en/stable/DASHBOARD_INSTALL.html). If you're using Hassbian, then the [Hassbian scripts](https://github.com/home-assistant/hassbian-scripts/blob/dev/docs/suites/appdaemon.md) make it easy to install AppDaemon.

source/_docs/ecosystem/nginx_subdomain.markdown

@@ -64,7 +64,7 @@ You want another instance available at https://countryside.example.org
 
 You can either :
  * Create a new user, `bob`, to hold the configuration file in `/home/bob/.homeassistant/configuration.yaml` and run Home Assistant as this new user
- * Create another configuration directory in `/home/alice/.homeassistan2/configuration.yaml` and run Home Assistant using `hass --config /home/alice/.homeassistant2/`
+ * Create another configuration directory in `/home/alice/.homeassistant2/configuration.yaml` and run Home Assistant using `hass --config /home/alice/.homeassistant2/`
 
 In both solution, change port number used by modifying `configuration.yaml` file.
 

source/_docs/installation/docker.markdown

@@ -49,7 +49,8 @@ $ docker run --init -d --name="home-assistant" -v /PATH_TO_YOUR_CONFIG:/config -
 ```
 
 When running Home Assistant in Docker on Windows, you may have some difficulty getting ports to map for routing (since the `--net=host` switch actually applies to the hypervisor's network interface). To get around this, you will need to add port proxy ipv4 rules to your local Windows machine, like so (Replacing '192.168.1.10' with whatever your Windows IP is, and '10.0.50.2' with whatever your Docker container's IP is):
-```
+
+```bash
 netsh interface portproxy add v4tov4 listenaddress=192.168.1.10 listenport=8123 connectaddress=10.0.50.2 connectport=8123
 netsh interface portproxy add v4tov4 listenaddress=0.0.0.0 listenport=8123 connectaddress=10.0.50.2 connectport=8123
 ```
@@ -125,7 +126,8 @@ The steps would be:
 
  - Install "Container Station" package on your Qnap NAS
  - Launch Container Station and move to "Create Container"-section 
- - Search image  "homeassistant/home-assistant" with Docker hub and click on "Install"
+ - Search image "homeassistant/home-assistant" with Docker hub and click on "Install"
+   Make attention to CPU architecture of your NAS. For ARM CPU types the correct image is "homeassistant/armhf-homeassistant"
  - Choose "latest" version and click next
  - Choose a container-name you want (e.g., "homeassistant")
  - Click on "Advanced Settings"

source/_docs/scripts/service-calls.markdown

@@ -41,6 +41,8 @@ data:
   rgb_color: [255, 0, 0]
 ```
 
+A full list of the parameters for a service can be found on the documentation page of each component, in the same way as it's done for the `light.turn_on` [service](/components/light/#service-lightturn_on).
+
 ### {% linkable_title Use templates to decide which service to call %}
 
 You can use [templating] support to dynamically choose which service to call. For example, you can call a certain service based on if a light is on.

source/_lovelace/picture-entity.markdown

@@ -132,3 +132,21 @@ state_image:
   "on": /local/bed_light_on.png
   "off": /local/bed_light_off.png
 ```
+
+Displaying a live feed from an FFMPEG camera:
+
+{% raw %}
+```yaml
+type: picture-entity
+entity: camera.backdoor
+camera_view: live
+tap_action:
+  action: call-service
+  service: camera.snapshot
+  service_data:
+    entity_id: camera.backdoor
+    filename: '/shared/backdoor-{{ now().strftime("%Y-%m-%d-%H%M%S") }}.jpg'
+```
+{% endraw %}
+
+The filename needs to be a path that is writable by Home Assistant in your system. You may need to configure `whitelist_external_dirs` ([documentation](https://www.home-assistant.io/docs/configuration/basic/)).

source/_posts/2019-05-08-nest-data-bye-bye.markdown

@@ -1,6 +1,6 @@
 ---
 layout: post
-title: "Nest to turn off their API"
+title: "[Update: new users only] Nest to turn off their API"
 description: "Nest has announced that they will shut down their API in August, no longer allowing you to access your data."
 date: 2019-05-08 00:01:00
 date_formatted: "May 8, 2019"
@@ -11,6 +11,12 @@ categories: Public-Service-Announcement
 og_image: /images/blog/2019-05-nest-data-bye-bye/notice.png
 ---
 
+**Update May 16:** Nest just announced [in a blog post](https://blog.google/products/google-nest/updates-works-with-nest/) that they changed their plan. It will still retire the Works with Nest program at the end of August, but it will no longer cut off existing users of the API. It will however still stop accepting new users at the end of August.
+
+Currently each Home Assistant user is required to create their own developer account to configure their Nest integration. We will reach out to Nest to see if we can become a partner so that users joining Home Assistant after August can still use Nest.
+
+---
+
 Sigh. Another one. This time it's not a small one either: Nest is disabling their APIs.
 
 We already saw [the writing on the wall in January](/blog/2019/01/24/nest-cannot-access-data/), but now [it's official](https://developers.nest.com/): Google announced that the Nest API will be turned off at the end of August, 2019. This means that in a little over three months, you will no longer be able to get your own data, that Google has collected in your home, and use it like you see fit.

source/_posts/2019-05-16-release-93.markdown

@@ -24,10 +24,15 @@ It's time for our 0.93 release and it is a whopping cool one. It's a day later t
 
 Last week we also wrote about [our updated plans](/blog/2019/05/03/update-from-the-field/) for Home Assistant for this year. If you haven't read it yet, worth the read!
 
-If you are a Nest user, we have some sad news: Google announced that they are [shutting down the Nest API](/blog/2019/05/08/nest-data-bye-bye/) at the end of August. This will cause Nest hardware to no longer work with Home Assistant (╯°□°）╯︵ ┻━┻
+If you are a Nest user, we have some sad news: Google announced that they are [shutting down the Nest API](/blog/2019/05/08/nest-data-bye-bye/) at the end of August. This will cause Nest hardware to no longer work with Home Assistant (╯°□°）╯︵ ┻━┻. **Update:** they have changed their plans, will only impact new users.
 
 As always, this release is accompanied by [a new episode of the Home Assistant podcast](https://hasspodcast.io/ha050/). Rohan and Phil discuss the new release, the Nest API and a lot more. This episode is their 50th episode already, congratulations on this milestone!
 
+Pascal has updated the way we are building Hass.io. It is now keeping the build up to date while we develop Home Assistant, which means that the Hass.io build was ready before the release blog post was up!
+
+<blockquote class="twitter-tweet" data-lang="en"><p lang="en" dir="ltr">What is that?<br>🤪 <a href="https://t.co/hRb60sSDeK">pic.twitter.com/hRb60sSDeK</a></p>&mdash; Pascal Vizeli (@pvizeli) <a href="https://twitter.com/pvizeli/status/1128918413051670528?ref_src=twsrc%5Etfw">May 16, 2019</a>
+</blockquote>
+
 ## {% linkable_title Home Assistant 1.0 %}
 
 As we mentioned in [our updated plans post](/blog/2019/05/03/update-from-the-field/), we're working hard on Home Assistant 1.0. Over the next releases we will work on polishing the UI, the backend architecture, and everything in between.
@@ -94,6 +99,50 @@ For those of you that like to power down your Sonos, Home Assistant should now h
 - Add water_heater to geniushub, bump client library ([@zxdavb] - [#23384]) ([geniushub docs]) (new-platform)
 - New cover platform for ADS integration ([@carstenschroeder] - [#23377]) ([ads docs]) (new-platform)
 
+## {% linkable_title Release 0.93.1 - May 17 %}
+
+- Fix Hassio-version for Azure Pipelines ([@pvizeli] - [#23895])
+- Update Honeywell warning ([@balloob] - [#23913]) ([honeywell docs])
+- Switch media player to SWITCH type ([@elupus] - [#23914]) ([google_assistant docs])
+- Fix problem with cameras that don't support time ([@karlkar] - [#23924]) ([onvif docs])
+
+[#23895]: https://github.com/home-assistant/home-assistant/pull/23895
+[#23913]: https://github.com/home-assistant/home-assistant/pull/23913
+[#23914]: https://github.com/home-assistant/home-assistant/pull/23914
+[#23924]: https://github.com/home-assistant/home-assistant/pull/23924
+[@balloob]: https://github.com/balloob
+[@elupus]: https://github.com/elupus
+[@karlkar]: https://github.com/karlkar
+[@pvizeli]: https://github.com/pvizeli
+[google_assistant docs]: /components/google_assistant/
+[honeywell docs]: /components/honeywell/
+[onvif docs]: /components/onvif/
+
+## {% linkable_title Release 0.93.2 - May 22 %}
+
+- Fix auto version update Hass.io ([@pvizeli] - [#23935])
+- Bump pytraccar ([@ludeeus] - [#23939]) ([traccar docs])
+- Fixes issue with multiple alerts ([@ludeeus] - [#23945]) ([alert docs])
+- Setup integration dependencies before loading it ([@aerialls] - [#23957])
+- Make Discord payload data key not required ([@cyrosy] - [#23964]) ([discord docs])
+- upgrade broadlink library ([@Danielhiversen] - [#23966]) ([broadlink docs])
+
+[#23935]: https://github.com/home-assistant/home-assistant/pull/23935
+[#23939]: https://github.com/home-assistant/home-assistant/pull/23939
+[#23945]: https://github.com/home-assistant/home-assistant/pull/23945
+[#23957]: https://github.com/home-assistant/home-assistant/pull/23957
+[#23964]: https://github.com/home-assistant/home-assistant/pull/23964
+[#23966]: https://github.com/home-assistant/home-assistant/pull/23966
+[@Danielhiversen]: https://github.com/Danielhiversen
+[@aerialls]: https://github.com/aerialls
+[@cyrosy]: https://github.com/cyrosy
+[@ludeeus]: https://github.com/ludeeus
+[@pvizeli]: https://github.com/pvizeli
+[alert docs]: /components/alert/
+[broadlink docs]: /components/broadlink/
+[discord docs]: /components/discord/
+[traccar docs]: /components/traccar/
+
 ## {% linkable_title If you need help... %}
 
 ...don't hesitate to use our very active [forums](https://community.home-assistant.io/) or join us for a little [chat](https://discord.gg/c5DvZ4e). The release notes have comments enabled but it's preferred if you use the former communication channels. Thanks.
@@ -154,6 +203,7 @@ Experiencing issues introduced by this release? Please report them in our [issue
     - platform: sesame
       api_key: !secret sesame_api_key
   ```
+- __Z-Wave__ - Not a breaking change perse, just a note: Open Z-Wave has released version 1.6. The configuration files are not compatible with Open Z-Wave 1.4, the version that we are currently using. Don't copy config files over! We're waiting for Open Z-Wave Python bindings to update before we can update our code.
 
 ## {% linkable_title Beta Fixes %}
 

source/components/epsonworkforce.markdown

@@ -1,13 +0,0 @@
----
-layout: page
-title: "Epson Workforce"
-description: "Instructions on how to setup Epson Workforce with Home Assistant."
-date: 2019-04-24 07:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-ha_release: 0.92
----
-
-The Epson workforce integration.

source/hassio/installation.markdown

@@ -95,12 +95,14 @@ If you would like to test next release before anyone else, you can install the b
 3. Select _System_ from the _Hass.io_ menu, then select _Join Beta Channel_ under _Hass.io supervisor_, then select _Reload_.
 4. Select _Dashboard_ from the _Hass.io_ menu, and then select _Update_.
 
-## {% linkable_title Alternative: install on generic Linux server %}
+## {% linkable_title Alternative: install on a generic Linux host %}
 
 For advanced users, it is also possible to try Hass.io on your [Linux server or inside a virtual machine][linux].
-Examples given here are tested on Ubuntu, but the instructions should work as a guideline for installing on other Linux distrubutions.
+Examples given here are tested on Ubuntu and Arch Linux, but the instructions should work as a guideline for installing on other Linux distrubutions.
 
-This is the list of packages you need to have available on your system that will run Hass.io if you are using Debian/Ubuntu:
+The packages you need to have available on your system that will run Hass.io may vary.
+
+### {% linkable_title Debian/Ubuntu %}
 
  - apparmor-utils
  - apt-transport-https
@@ -113,6 +115,17 @@ This is the list of packages you need to have available on your system that will
  - socat
  - software-properties-common
 
+### {% linkable_title Arch Linux %}
+
+ - apparmor
+ - avahi
+ - ca-certificates
+ - curl
+ - dbus
+ - docker
+ - jq
+ - socat
+
 You also need to have Docker-CE installed. There are well-documented procedures for installing Docker on Ubuntu at [Docker.com](https://docs.docker.com/install/linux/docker-ce/ubuntu/), you can find installation steps for your Linux distribution in the menu on the left.
 
 <p class='note warning'>
@@ -120,22 +133,21 @@ You also need to have Docker-CE installed. There are well-documented procedures
   Be sure to install the official Docker-CE from the above listed URL.
 </p>
 
-To perform the Hass.io installation, run the following commands:
+To perform the Hass.io installation on Ubuntu, run the following commands:
 
 ```bash
-sudo -i
+$ sudo -i
+# apt-get install software-properties-common
+# add-apt-repository universe
+# apt-get update
+# apt-get install -y apparmor-utils apt-transport-https avahi-daemon ca-certificates curl dbus jq network-manager socat
+# curl -fsSL get.docker.com | sh
+```
 
-apt-get install software-properties-common
+And to intall Hass.io the one below. That one is used also for other distributions.
 
-add-apt-repository universe
+```bash
-
+# curl -sL "https://raw.githubusercontent.com/home-assistant/hassio-installer/master/hassio_install.sh" | bash -s
-apt-get update
-
-apt-get install -y apparmor-utils apt-transport-https avahi-daemon ca-certificates curl dbus jq network-manager socat
-
-curl -fsSL get.docker.com | sh
-
-curl -sL "https://raw.githubusercontent.com/home-assistant/hassio-installer/master/hassio_install.sh" | bash -s
 ```
 
 <p class='note'>

source/lovelace/index.markdown

@@ -12,7 +12,7 @@ redirect_from: /components/lovelace/
 
 Lovelace is the name of the Home Assistant user interface. It is a fast, customizable and powerful way for users to manage their homes, working both on mobile and desktop.
 
- - [24 cards](https://www.home-assistant.io/lovelace/alarm-panel/) to place and configure as you like.
+ - 24 different cards to place and configure as you like.
  - UI Editor. A configuration UI to manage your Lovelace UI including live preview when editing cards.
  - Fast. Using a static config allows us to build up the UI once.
  - Customizable.