Merge branch 'current' into next

plugins/configuration.rb

@@ -61,7 +61,8 @@ module Jekyll
 
       result << vars.map do |key, attr|
         markup = Array.new
-        markup << "<div class='config-vars-item'><div class='config-vars-label'><a name='#{slug(key)}' class='title-link' href='\##{slug(key)}'></a> <span class='config-vars-label-name'>#{key}</span>"
+        # There are spaces around the "{key}", to improve double-click selection in Chrome.
+        markup << "<div class='config-vars-item'><div class='config-vars-label'><a name='#{slug(key)}' class='title-link' href='\##{slug(key)}'></a> <span class='config-vars-label-name'> #{key} </span>"
 
         if attr.key? 'type'
 
@@ -115,7 +116,7 @@ module Jekyll
             shortDefaultValue = ", default: " + shortDefaultValue
           end
 
-          markup << "<span class='config-vars-required'>#{startSymbol}<span class='#{attr['required'].to_s}'>#{required_value(attr['required'])}</span>#{shortDefaultValue}#{endSymbol}</span>"
+          markup << "<span class='config-vars-required'>#{startSymbol}<span class='#{attr['required'].to_s}'>#{required_value(attr['required'])}</span><span class='default'>#{shortDefaultValue}</span>#{endSymbol}</span>"
         end
 
         markup << "</div><div class='config-vars-description-and-children'>"

sass/custom/_paulus.scss

@@ -500,17 +500,13 @@ div.config-vars {
   }
 
   .nested .config-vars-item:last-child {
-    border: none
+    border: none;
   }
 
   .config-vars-label {
     padding-bottom: 4px;
     position: relative;
 
-    > span {
-      padding-right: 4px;
-    }
-
     &:hover a.title-link::before {
       position: absolute;
       top: 5px;
@@ -525,17 +521,17 @@ div.config-vars {
 
   .config-vars-label-name {
     font-weight: bold;
-    font-size: 16px; 
+    font-size: 16px;
     color: #222222bd;
   }
 
   .config-vars-type {
-    color :#8792a2;
+    color: #8792a2;
     font-size: 13px;
   }
 
   .config-vars-required {
-    color :#8792a2;
+    color: #8792a2;
     font-size: 13px;
     text-transform: lowercase;
 
@@ -544,6 +540,10 @@ div.config-vars {
       text-transform: uppercase;
       font-size: 11px;
     }
+
+    .default {
+      text-transform: None;
+    }
   }
 
   .config-vars-description-and-children {

source/_faq/unique_id.markdown

@@ -0,0 +1,13 @@
+---
+title: "This entity does not have a unique ID?"
+description: "This entity does not have a unique ID?"
+ha_category: Configuration
+---
+
+When you see
+
+```text
+This entity does not have a unique ID, therefore its settings cannot be managed from the UI
+```
+
+this simply means that you can't change the `entity_id` or the friendly name from the UI. You can still use the _Customizations_ menu to customize that entity. Typically you'll see this when you create entities using YAML.

source/_includes/custom/grid_item_left.html

@@ -5,9 +5,6 @@
   <a href='/integrations/ecobee/'>
     <img src='/images/supported_brands/ecobee.png' alt="Ecobee" />
   </a>
-  <a href='/integrations/ifttt/'>
-    <img src='/images/supported_brands/ifttt.png' alt="IFTTT" />
-  </a>
   <a href='/integrations/hue/'>
     <img src='/images/supported_brands/philips_hue.png' alt="Philips Hue" />
   </a>

source/_integrations/griddy.markdown

@@ -1,7 +1,8 @@
 ---
 title: Griddy Power
-description: Instructions on how to integrate griddy prices into Home Assistant.
+description: Instructions on how to integrate griddy real-time electricity prices into Home Assistant.
 ha_category:
+  - Energy
   - Sensor
 ha_release: 0.107
 ha_iot_class: Cloud Polling

source/_integrations/ifttt.markdown

@@ -3,7 +3,6 @@ title: IFTTT
 description: Instructions on how to setup IFTTT within Home Assistant.
 ha_category:
   - Automation
-featured: true
 ha_iot_class: Cloud Push
 ha_release: 0.8
 ha_config_flow: true

source/_integrations/unifi.markdown

@@ -39,7 +39,7 @@ The UniFi controller allows you to create multiple users on it besides the main
 
 ### UniFi OS
 
-For UniFi OS a local-only user needs to be created. A user who uses the Ubiquiti cloud will not work. You can do this in the manage users section on the UniFi OS dashboard. Make sure to give it the right permissions for the functions you want to use. 
+For UniFi OS a local-only user needs to be created. A user who uses the Ubiquiti cloud will not work. You can do this in the manage users section on the UniFi OS dashboard. Make sure to give it the right permissions for the functions you want to use. Note the Dream Machine Pro needs the port to be 443. 
 
 ### Conflicts with MQTT
 

source/_integrations/zone.markdown

@@ -12,7 +12,9 @@ ha_domain: zone
 
 Zones allow you to specify certain regions on earth (for now). When a device tracker sees a device to be within a zone, the state will take the name from the zone. Zones can also be used as a [trigger](/getting-started/automation-trigger/#zone-trigger) or [condition](/getting-started/automation-condition/#zone-condition) inside automation setups.
 
-The `zone` integration uses YAML sequences to configure multiple zones:
+Zones can be added and managed through the user interface at **Configuration -> Zones**. 
+
+Zones can also be configured via `configuration.yaml`:
 
 ```yaml
 # Example configuration.yaml entry
@@ -78,7 +80,7 @@ Devices that are in the zone **'Home'** will not appear on the map in the Home A
 
 ## Icons
 
-It is preferred to pick an icon to use for your zone. Pick any icon that you can find on [materialdesignicons.com](https://materialdesignicons.com/) and prefix the name with `mdi:`. For example `mdi:school`, `mdi:worker`, `mdi:home`, `mdi:cart`, or `mdi:castle`.
+It is preferred to pick an icon to use for your zone. Pick any icon that you can find on [materialdesignicons.com](https://materialdesignicons.com/) and prefix the name with `mdi:`. For example `mdi:school`, `mdi:briefcase`, `mdi:home`, `mdi:cart`, or `mdi:castle`.
 
 ## State