-
diff --git a/source/_integrations/asuswrt.markdown b/source/_integrations/asuswrt.markdown
index fe916eac67e..a0c5f28b32b 100644
--- a/source/_integrations/asuswrt.markdown
+++ b/source/_integrations/asuswrt.markdown
@@ -12,7 +12,7 @@ ha_codeowners:
ha_domain: asuswrt
---
-The `asuswrt` integration is the main integration to connect to a [ASUSWRT](https://event.asus.com/2013/nw/ASUSWRT/) based router.
+The `asuswrt` integration is the main integration to connect to a [ASUSWRT](https://www.asus.com/ASUSWRT/) based router.
There is currently support for the following device types within Home Assistant:
diff --git a/source/_integrations/denonavr.markdown b/source/_integrations/denonavr.markdown
index a973a839b5d..d4ba451aef7 100644
--- a/source/_integrations/denonavr.markdown
+++ b/source/_integrations/denonavr.markdown
@@ -11,14 +11,16 @@ ha_codeowners:
- '@starkillerOG'
---
-The `denonavr` platform allows you to control a [Denon Network Receivers](https://www.denon.co.uk/chg/product/compactsystems/networkmusicsystems/ceolpiccolo) from Home Assistant. It might be that your device is supported by the [Denon] platform.
+The `denonavr` platform allows you to control [Denon Network Receivers](https://www.denon.co.uk/chg/product/compactsystems/networkmusicsystems/ceolpiccolo) from Home Assistant. It might be that your device is supported by the [Denon] platform.
Known supported devices:
+- Denon AVR-X1200W
- Denon AVR-X1300W
- Denon AVR-X1500H
- Denon AVR-X2000
- Denon AVR-X2100W
+- Denon AVR-X2200W
- Denon AVR-X3400H
- Denon AVR-X4100W
- Denon AVR-X4300H
@@ -31,7 +33,7 @@ Known supported devices:
- Denon AVR-S750H
- Marantz M-CR510
- Marantz M-CR603
-- Marantz M-RC610
+- Marantz M-CR610
- Marantz SR5008
- Marantz SR6007 - SR6010
- Marantz NR1504
diff --git a/source/_integrations/proxmoxve.markdown b/source/_integrations/proxmoxve.markdown
index c190434bf84..3fbde11a70b 100644
--- a/source/_integrations/proxmoxve.markdown
+++ b/source/_integrations/proxmoxve.markdown
@@ -126,8 +126,8 @@ Creating a dedicated user for Home Assistant, limited to only the role just crea
* Open `Permissions` and click `Users`
* Click `Add`
* Enter a username (e.g., "hass")
-* Enter a secure password (it can be complex as you will only need to copy/paste it into your Home Assistant configuration)
* Set the realm to "Proxmox VE authentication server"
+* Enter a secure password (it can be complex as you will only need to copy/paste it into your Home Assistant configuration)
* Ensure `Enabled` is checked and `Expire` is set to "never"
* Click `Add`
diff --git a/source/_integrations/sensor.websocket_api.markdown b/source/_integrations/sensor.websocket_api.markdown
index 156f3fbd780..1df89fb0968 100644
--- a/source/_integrations/sensor.websocket_api.markdown
+++ b/source/_integrations/sensor.websocket_api.markdown
@@ -25,3 +25,4 @@ sensor:
### Note
This replaces the previous `api_streams` sensor.
+The default sensor name is `connected_clients`.
diff --git a/source/_integrations/simplisafe.markdown b/source/_integrations/simplisafe.markdown
index c7ded34f96c..170f75d2cf8 100644
--- a/source/_integrations/simplisafe.markdown
+++ b/source/_integrations/simplisafe.markdown
@@ -40,7 +40,7 @@ password:
required: true
type: string
code:
- description: A code to enable or disable the alarm in the frontend.
+ description: A code to enable or disable the alarm in the frontend. *Under normal operation, the integration doesn’t need a SimpliSafe keypad code.*
required: false
type: string
{% endconfiguration %}
diff --git a/source/_integrations/vacuum.xiaomi_miio.markdown b/source/_integrations/vacuum.xiaomi_miio.markdown
index b8a20c924d1..7548fcbf3c5 100644
--- a/source/_integrations/vacuum.xiaomi_miio.markdown
+++ b/source/_integrations/vacuum.xiaomi_miio.markdown
@@ -293,13 +293,11 @@ This token (32 hexadecimal characters) is required for the Xiaomi Mi Robot Vacuu
1. Configure the robot with the Mi-Home app. Make sure to select the correct region, as Xiaomi uses different product names for different geographical areas. Note that the new RoboRock app is currently not supported for this method.
2. Install [BlueStacks](https://www.bluestacks.com).
-3. Set up [Mi Home version 5.0.30](https://www.apkmirror.com/apk/xiaomi-inc/mihome/mihome-5-0-30-release/) in BlueStacks and login to synchronize devices.
-4. Use [BlueStacks Tweaker](https://forum.xda-developers.com/general/general/bluestacks-tweaker-2-tool-modifing-t3622681) to access the filesystem and retrieve the token.
-5. Copy `/data/data/com.xiaomi.smarthome/databases/miio2.db` file to your computer using the Bluestacks Tweakers filesystem tool.
-6. Install [DB Browser for SQLite](https://sqlitebrowser.org/).
-7. Open the DB Browser and load the `miio2.db` from your computer.
-8. Select `Browse Data` tab from the DB Browser and switch to table called `devicerecord`
-9. This will display all the connected devices information with the token.
+3. Set up [Mi Home version 5.4.49](https://www.apkmirror.com/apk/xiaomi-inc/mihome/mihome-5-4-49-release/) in BlueStacks and login to synchronize devices.
+4. Open Filemanager in the `More Apps` menu.
+5. Use `Explore` on the left and navigate to `sdcard/SmartHome/logs/plug_DeviceManager`.
+6. Click on `Export to Windows` in the lower left corner and select any or all files to export to you local disk.
+7. Search for `"token":"
@@ -20,7 +20,7 @@ type:
type: string
image:
required: true
- description: The URL of an image.
+ description: The URL of an image.
To use a locally hosted image, see [Hosting](/integrations/http#hosting-files).
type: string
elements:
required: true
diff --git a/source/_posts/2020-05-09-deprecating-home-assistant-supervised-on-generic-linux.markdown b/source/_posts/2020-05-09-deprecating-home-assistant-supervised-on-generic-linux.markdown
new file mode 100644
index 00000000000..7c7721392e1
--- /dev/null
+++ b/source/_posts/2020-05-09-deprecating-home-assistant-supervised-on-generic-linux.markdown
@@ -0,0 +1,81 @@
+---
+title: "[On hold] Deprecating Home Assistant Supervised on generic Linux"
+description: "Home Assistant Supervised is no longer a supported installation option."
+date: 2020-05-09 00:00:00
+date_formatted: "May 9, 2020"
+author: Paulus Schoutsen
+author_twitter: balloob
+categories: Announcements
+---
+
+**[Update May 10]**
+
+We’ve been overwhelmed with the many reactions. We realize our communication has been poor on this subject, for which I want to apologize. We do not collect data and so can’t always judge the impact of our decisions.
+
+We’re going to put the deprecation plan on hold for now. Anyone running this installation method today can continue running this. We will offer more clear information in the future.
+
+We’re going to investigate how we can maintain the supervised installation on generic Linux.
+
+Furthermore, we are going to make sure that supported installation guides are properly documented.
+
+Paulus
+
+---
+
+TL;DR: Home Assistant Supervised (also known as Home Assistant on Generic Linux) installation method is no longer supported.
+
+There are currently three different ways of installing Home Assistant:
+
+- Home Assistant: our operating system running either directly on a supported device like the ODROID N2, Raspberry Pi 4, Intel NUC or a virtual machine.
+- Home Assistant Supervised: an installation of core + supervisor that are hosted on a generic Linux installation.
+- Home Assistant Core: our Python core application running in a Python virtual environment or a Docker container.
+
+
+
+The benefit of running the Supervisor is that you are able to keep Home Assistant up to date from within Home Assistant, and easily install add-ons that are pre-configured to be able to integrate with Home Assistant.
+
+The Supervisor is an extremely complicated program that interacts with a wide range of applications and components in the host operating system. Examples are Docker containers, DNS, sound and USB hardware sticks that users want to use with Home Assistant. The Supervisor is controlled from Home Assistant which allows us to create a full home automation hub experience.
+
+The Home Assistant operating system is made with the bare minimum that the Supervisor needs to run and makes sure it does not get in the way of the Supervisor: the system is fully managed by the Supervisor.
+
+Some users still wanted to be able to control the host operating system, and so a generic installer was introduced that could install Home Assistant Core and Supervisor on a generic Linux system, like Debian or Ubuntu.
+
+However, when people run it on top of their own system, things can go wrong. And in fact, it’s quite complex to maintain it on generic Linux. Installing is fine, everyone can follow a tutorial, but after that when things break, people come to us, not the author of the tutorial. And this workload keeps growing, to a problematic extent.
+
+Home Assistant OS and Supervisor are being maintained by Pascal. He started them 3,5 years ago and has been maintaining this first in his spare time, later as a full-time employee of Nabu Casa.
+
+Building the operating system and the supervisor is a complex task that requires specific expertise. Sadly after 3,5 years, there are still no other contributors to help. This has resulted in his responsibilities outgrowing what one can expect from a full-time employee.
+
+Nabu Casa was founded to make the development of Home Assistant sustainable. To be able to maintain a healthy work/life balance and to avoid developer burn-out that is, unfortunately, common in the open source world.
+
+In an effort to reduce Pascal’s constraints we’re per direct no longer supporting the generic Linux installation method. It will no longer be mentioned in the documentation. We have archived the repository. If you are willing to maintain it, feel free to fork it. Issues that result from using this will be ignored or closed when reported to us.
+
+## Open Source & Community
+
+Just as with our [recent decision to limit the usage of YAML in some cases](https://www.home-assistant.io/blog/2020/04/14/the-future-of-yaml/), Home Assistant will keep choosing health over features. Open source is not about us having to support every feature anyone on the internet can think of. Open source means that anyone can do that themselves and choose to share this or not.
+
+There are still tons of ways of installing Home Assistant, there are still tons of features and customizations possible.
+
+## Frequently Asked Questions
+
+### How do I run Home Assistant while still keeping control over the operating system?
+
+We offer a virtual machine image of Home Assistant. These images can be used on e.g., VMWare, VirtualBox and Proxmox, and also on NAS systems that support running a VM as most modern NAS systems do. Using these provided images will give you the full supported Home Assistant experience.
+
+[You can find virtual machine images here.](https://www.home-assistant.io/hassio/installation/)
+
+### I run on a platform that doesn’t support VMs and I still want to keep control over the operating system.
+
+To do this we recommend running Home Assistant Core in Docker. You will lose out on the easy updates, system management and pre-configured apps (add-ons) from the UI. However, you are still able to run the full beating heart of the Home Assistant home automation platform.
+
+All applications that are available as Home Assistant add-ons are also available as third-party Docker containers. You will be responsible to configure them to work with Home Assistant Core yourself.
+
+### I know what I am doing. Can I still use the generic Linux installer?
+
+Yep, the archived repository is still there. You can also fork it and change things. But there is no official resource to visit when things break.
+
+### I am currently running Home Assistant Supervised. Now what?
+
+Everything will continue to work as-is. Bugs won’t be fixed and you should consider migrating to one of the other methods. If you are migrating to a virtual machine, you can make a snapshot in the Supervisor panel and restore that in your new installation.
+
+[Edit May 9, 16:19] Removed paragraph from Open Source & Community as it was insinuating.
diff --git a/source/images/blog/2020-05-09-deprecating-supervised/installation-options.png b/source/images/blog/2020-05-09-deprecating-supervised/installation-options.png
new file mode 100644
index 00000000000..8fd6ee690a3
Binary files /dev/null and b/source/images/blog/2020-05-09-deprecating-supervised/installation-options.png differ
diff --git a/source/lovelace/dashboards-and-views.markdown b/source/lovelace/dashboards-and-views.markdown
index 354b926f2f8..d89ed251907 100644
--- a/source/lovelace/dashboards-and-views.markdown
+++ b/source/lovelace/dashboards-and-views.markdown
@@ -264,9 +264,9 @@ Picture card configuration:
navigation_path: /lovelace/living_room
```
-## Icon
+## View icon
-If you define an icon the title will be used as a tool-tip.
+If you define a view icon, the icon instead of the title will be displayed, the title will then be used as a tool-tip.
#### Example