diff --git a/docs/automation/editor/index.html b/docs/automation/editor/index.html
index d9f326209d..061595fa57 100644
--- a/docs/automation/editor/index.html
+++ b/docs/automation/editor/index.html
@@ -146,7 +146,7 @@ Any comments in the YAML file will be lost when you update an automation via the
diff --git a/docs/automation/index.html b/docs/automation/index.html
index f46637dc69..2cc3e9fbba 100644
--- a/docs/automation/index.html
+++ b/docs/automation/index.html
@@ -138,7 +138,7 @@ As of version 0.42 you have to set an initial state in your automations in order
diff --git a/docs/automation/trigger/index.html b/docs/automation/trigger/index.html
index bf66121f89..662779110a 100644
--- a/docs/automation/trigger/index.html
+++ b/docs/automation/trigger/index.html
@@ -249,7 +249,7 @@ With template triggers you can also evaluate attribute changes by using is_state
diff --git a/docs/autostart/macos/index.html b/docs/autostart/macos/index.html
index 5086cfaf21..2e4d5ef305 100644
--- a/docs/autostart/macos/index.html
+++ b/docs/autostart/macos/index.html
@@ -98,7 +98,7 @@ Home Assistant has been uninstalled.
diff --git a/docs/configuration/basic/index.html b/docs/configuration/basic/index.html
index b152420225..3b9c825df4 100644
--- a/docs/configuration/basic/index.html
+++ b/docs/configuration/basic/index.html
@@ -117,7 +117,7 @@ If you decide to expose your Home Assistant instance to the internet and forget
diff --git a/docs/configuration/customizing-devices/index.html b/docs/configuration/customizing-devices/index.html
index 1afb7c37e2..4da880823e 100644
--- a/docs/configuration/customizing-devices/index.html
+++ b/docs/configuration/customizing-devices/index.html
@@ -190,7 +190,7 @@ New customize information will be applied the next time the state of the entity
diff --git a/docs/configuration/devices/index.html b/docs/configuration/devices/index.html
index 7a1d4a0608..fddf35c00f 100644
--- a/docs/configuration/devices/index.html
+++ b/docs/configuration/devices/index.html
@@ -132,7 +132,7 @@ Each group consists of a name and a list of entity IDs. Entity IDs can be retrie
+This is a new and experimental feature of Home Assistant.
+
+
Starting with version 0.63, Home Assistant keeps a registry of known entities.
+The entity registry makes sure that entities get unique identifiers and allow
+customizing the identifiers and names of these entities.
+
As this is still a very new part of Home Assistant, changes will require a
+restart of Home Assistant to take affect. A config user interface will be added
+in a future version.
+
+An entity needs to have a unique ID to be registered in the entity registry.
+Not all integrations currently provide a unique id for their entities.
+
+
The entity registry is stored in <config>/entity_registry.yaml. As a user,
+you are unable to add entries, only update them. Here is an example file:
As a user, you can change the entity_id and add the name and disabled_by
+value to each entry.
+
+
+
The value of name will override the name of the entity as given by the
+integration.
+
Added in Home Assistant 0.64.
+
+
+
The key disabled_by can either be hass or user. This functionality
+is even more experimental than the whole entity registry itself and might
+cause integrations to fail and might be removed in the future.
diff --git a/docs/configuration/group_visibility/index.html b/docs/configuration/group_visibility/index.html
index 17aec3ae4c..7b0d3d0bd2 100644
--- a/docs/configuration/group_visibility/index.html
+++ b/docs/configuration/group_visibility/index.html
@@ -235,7 +235,7 @@ If you are using docker to run Home Assistant then the occasion.py script will b
diff --git a/docs/configuration/packages/index.html b/docs/configuration/packages/index.html
index fb3f0b5b69..9ae86e8c8a 100644
--- a/docs/configuration/packages/index.html
+++ b/docs/configuration/packages/index.html
@@ -149,7 +149,7 @@ See the documentation about Topics
diff --git a/docs/configuration/splitting_configuration/index.html b/docs/configuration/splitting_configuration/index.html
index fa1f71c608..543e53265a 100644
--- a/docs/configuration/splitting_configuration/index.html
+++ b/docs/configuration/splitting_configuration/index.html
@@ -449,7 +449,7 @@ the -id: line must be removed from each of the split files.
diff --git a/docs/configuration/troubleshooting/index.html b/docs/configuration/troubleshooting/index.html
index 80e4891114..83a6281303 100644
--- a/docs/configuration/troubleshooting/index.html
+++ b/docs/configuration/troubleshooting/index.html
@@ -146,7 +146,7 @@ Whenever you report an issue, be aware that we are volunteers who do not have ac
diff --git a/docs/configuration/yaml/index.html b/docs/configuration/yaml/index.html
index 341e7d1eb8..e533fbca14 100644
--- a/docs/configuration/yaml/index.html
+++ b/docs/configuration/yaml/index.html
@@ -145,7 +145,7 @@ The other properties (like name) are specified using mappings. Note that the sec
diff --git a/docs/ecosystem/backup/backup_dropbox/index.html b/docs/ecosystem/backup/backup_dropbox/index.html
index 0f83ee6dae..fdbb783fa1 100644
--- a/docs/ecosystem/backup/backup_dropbox/index.html
+++ b/docs/ecosystem/backup/backup_dropbox/index.html
@@ -113,7 +113,7 @@ Add it to your crontab, edit the path/to part.
diff --git a/docs/ecosystem/backup/backup_usb/index.html b/docs/ecosystem/backup/backup_usb/index.html
index e9296b93a9..dbef2e3df5 100644
--- a/docs/ecosystem/backup/backup_usb/index.html
+++ b/docs/ecosystem/backup/backup_usb/index.html
@@ -164,7 +164,7 @@ Change below path to where you placed the usb_ba
diff --git a/docs/ecosystem/certificates/lets_encrypt/index.html b/docs/ecosystem/certificates/lets_encrypt/index.html
index 9854631397..4da999be68 100644
--- a/docs/ecosystem/certificates/lets_encrypt/index.html
+++ b/docs/ecosystem/certificates/lets_encrypt/index.html
@@ -479,7 +479,7 @@ In cases where, for whatever reason, apt-get installing is not appropriate for y
diff --git a/docs/ecosystem/certificates/tls_self_signed_certificate/index.html b/docs/ecosystem/certificates/tls_self_signed_certificate/index.html
index 20ea3c6218..ffc009b36b 100644
--- a/docs/ecosystem/certificates/tls_self_signed_certificate/index.html
+++ b/docs/ecosystem/certificates/tls_self_signed_certificate/index.html
@@ -110,7 +110,7 @@ The solution is to use a self-signed certificate. As you most likely don’t hav
diff --git a/docs/ecosystem/hass-configurator/index.html b/docs/ecosystem/hass-configurator/index.html
index e7fd35775d..4a8fb9661d 100644
--- a/docs/ecosystem/hass-configurator/index.html
+++ b/docs/ecosystem/hass-configurator/index.html
@@ -193,7 +193,7 @@ To resume the screen session, log in to your machine and execute Topics
diff --git a/docs/ecosystem/ios/notifications/attachments/index.html b/docs/ecosystem/ios/notifications/attachments/index.html
index 5caf376f25..b6ac779313 100644
--- a/docs/ecosystem/ios/notifications/attachments/index.html
+++ b/docs/ecosystem/ios/notifications/attachments/index.html
@@ -134,7 +134,7 @@ To expand a notification on 3D Touch devices simply force touch any notification
diff --git a/docs/ecosystem/ios/notifications/content_extensions/index.html b/docs/ecosystem/ios/notifications/content_extensions/index.html
index 808de74726..a9f22324f6 100644
--- a/docs/ecosystem/ios/notifications/content_extensions/index.html
+++ b/docs/ecosystem/ios/notifications/content_extensions/index.html
@@ -161,7 +161,7 @@ The notification content is a real time MJPEG stream of a camera (assuming the c
diff --git a/docs/ecosystem/ios/notifications/index.html b/docs/ecosystem/ios/notifications/index.html
index 57968e7c1a..04cc9f40bf 100644
--- a/docs/ecosystem/ios/notifications/index.html
+++ b/docs/ecosystem/ios/notifications/index.html
@@ -93,7 +93,7 @@ Your device ID can be found in the ios.confTopics
diff --git a/docs/installation/docker/index.html b/docs/installation/docker/index.html
index 110302623a..170b9a6113 100644
--- a/docs/installation/docker/index.html
+++ b/docs/installation/docker/index.html
@@ -184,7 +184,7 @@ If you want to use a USB Bluetooth adapter or Z-Wave USB Stick with Home Assista
diff --git a/docs/installation/hassbian/common-tasks/index.html b/docs/installation/hassbian/common-tasks/index.html
index 31123081b4..e2fa51b82d 100644
--- a/docs/installation/hassbian/common-tasks/index.html
+++ b/docs/installation/hassbian/common-tasks/index.html
@@ -174,7 +174,7 @@ Log in as the pi account and execute the
diff --git a/docs/installation/hassbian/customization/index.html b/docs/installation/hassbian/customization/index.html
index ff33badcc3..af482ab676 100644
--- a/docs/installation/hassbian/customization/index.html
+++ b/docs/installation/hassbian/customization/index.html
@@ -107,7 +107,7 @@ The tool is available by running hassbian-config
diff --git a/docs/installation/raspberry-pi/index.html b/docs/installation/raspberry-pi/index.html
index 52d6ddb1a2..92b646d39f 100644
--- a/docs/installation/raspberry-pi/index.html
+++ b/docs/installation/raspberry-pi/index.html
@@ -134,7 +134,7 @@ When you run the hass command for the fir
diff --git a/docs/installation/synology/index.html b/docs/installation/synology/index.html
index 99ec4a2c36..a3c104ae52 100644
--- a/docs/installation/synology/index.html
+++ b/docs/installation/synology/index.html
@@ -287,7 +287,7 @@ That’s it… you’re all set to go
diff --git a/docs/installation/updating/index.html b/docs/installation/updating/index.html
index 12acf0854f..8dfaabeb62 100644
--- a/docs/installation/updating/index.html
+++ b/docs/installation/updating/index.html
@@ -110,7 +110,7 @@ To avoid permission errors, the upgrade must be run as the same user as the inst
diff --git a/docs/installation/vagrant/index.html b/docs/installation/vagrant/index.html
index 7dfd5c98c1..2146bcc73c 100644
--- a/docs/installation/vagrant/index.html
+++ b/docs/installation/vagrant/index.html
@@ -142,7 +142,7 @@ This command will only restart the Home Assistant process inside the Vagrant VM,
diff --git a/docs/mqtt/broker/index.html b/docs/mqtt/broker/index.html
index 894d69d1ee..29281e57a6 100644
--- a/docs/mqtt/broker/index.html
+++ b/docs/mqtt/broker/index.html
@@ -237,7 +237,7 @@ Home Assistant will automatically load the correct certificate if you connect to
diff --git a/docs/scripts/conditions/index.html b/docs/scripts/conditions/index.html
index 40ad054283..34aedd8bb4 100644
--- a/docs/scripts/conditions/index.html
+++ b/docs/scripts/conditions/index.html
@@ -320,7 +320,7 @@ Time condition windows can span across the midnight threshold. In the example ab
diff --git a/docs/tools/dev-tools/index.html b/docs/tools/dev-tools/index.html
index 937242a788..66aa50d38a 100644
--- a/docs/tools/dev-tools/index.html
+++ b/docs/tools/dev-tools/index.html
@@ -178,7 +178,7 @@ Even though MQTT in general provides deeper functionality, the developer tools s
diff --git a/docs/z-wave/adding/index.html b/docs/z-wave/adding/index.html
index f9b3b857ca..537653cfcf 100644
--- a/docs/z-wave/adding/index.html
+++ b/docs/z-wave/adding/index.html
@@ -134,7 +134,7 @@ Ensure you keep a backup of this key. If you have to rebuild your system and don
diff --git a/docs/z-wave/control-panel/index.html b/docs/z-wave/control-panel/index.html
index 9d3256455a..65ab72fab0 100644
--- a/docs/z-wave/control-panel/index.html
+++ b/docs/z-wave/control-panel/index.html
@@ -205,7 +205,7 @@ Select Refresh to display the log if you need it to check activ
diff --git a/docs/z-wave/device-specific/index.html b/docs/z-wave/device-specific/index.html
index 7f72f1331e..aa47e51ed0 100644
--- a/docs/z-wave/device-specific/index.html
+++ b/docs/z-wave/device-specific/index.html
@@ -377,7 +377,7 @@ These devices will either show as a binary sensor or a sensor called Topics
diff --git a/docs/z-wave/entities/index.html b/docs/z-wave/entities/index.html
index 3368d3405d..c8f3d75a1a 100644
--- a/docs/z-wave/entities/index.html
+++ b/docs/z-wave/entities/index.html
@@ -245,7 +245,7 @@ This is a work in progress, based upon reports in the forum, the author’s own
diff --git a/docs/z-wave/installation/index.html b/docs/z-wave/installation/index.html
index a57d1f67b9..4ec764a7d4 100644
--- a/docs/z-wave/installation/index.html
+++ b/docs/z-wave/installation/index.html
@@ -262,7 +262,7 @@ The device type is c (character special)
diff --git a/docs/z-wave/services/index.html b/docs/z-wave/services/index.html
index aa70201fa0..2e6c3cc9f9 100644
--- a/docs/z-wave/services/index.html
+++ b/docs/z-wave/services/index.html
@@ -204,7 +204,7 @@ Using the soft_reset function with some Z