Merge branch 'next' into rc

source/_integrations/ambient_station.markdown

@@ -1,7 +1,6 @@
 ---
 title: Ambient Weather Station
 description: How to integrate Ambient Weather station within Home Assistant.
-logo: ambient_weather.png
 ha_category:
   - Weather
 ha_release: 0.85

source/_integrations/elkm1.markdown

@@ -1,7 +1,6 @@
 ---
 title: Elk-M1 Control
 description: Instructions to setup the Elk-M1 controller.
-logo: elkproducts.png
 ha_release: 0.81
 ha_category:
   - Hub

source/_integrations/harmony.markdown

@@ -1,7 +1,6 @@
 ---
 title: Logitech Harmony Hub
 description: Instructions on how to integrate Harmony Hub remotes into Home Assistant.
-logo: logitech.png
 ha_category:
   - Remote
 ha_iot_class: Local Push

source/_integrations/heos.markdown

@@ -1,7 +1,6 @@
 ---
 title: Denon HEOS
 description: Instructions on how to integrate Denon HEOS into Home Assistant.
-logo: heos.png
 ha_category:
   - Media Player
 ha_release: 0.92

source/_integrations/isy994.markdown

@@ -1,7 +1,6 @@
 ---
 title: Universal Devices ISY994
 description: Instructions on how to setup the ISY994 controller within Home Assistant.
-logo: universal_devices.png
 ha_category:
   - Hub
   - Binary Sensor

source/_integrations/sense.markdown

@@ -1,7 +1,6 @@
 ---
 title: Sense
 description: Instructions on how to integrate Sense within Home Assistant.
-logo: sense.png
 ha_category:
   - Energy
   - Binary Sensor

source/_integrations/tado.markdown

@@ -1,7 +1,6 @@
 ---
 title: Tado
 description: Instructions on how to integrate Tado devices with Home Assistant.
-logo: tado.png
 ha_category:
   - Hub
   - Climate

source/_integrations/upnp.markdown

@@ -1,7 +1,6 @@
 ---
 title: UPnP
 description: Internet Gateway Device (IGD) Protocol for Home Assistant.
-logo: upnp.png
 ha_category:
   - Network
   - Sensor

source/_lovelace/entities.markdown

@@ -294,6 +294,35 @@ entities:
       type: string
 {% endconfiguration %}
 
+### Attribute
+
+{% configuration %}
+type:
+  required: true
+  description: attribute
+  type: string
+entity:
+  required: true
+  description: Home Assistant entity ID.
+  type: string
+attribute:
+  required: true
+  description: Attribute to display from the entity.
+  type: string
+prefix:
+  required: false
+  description: Text before entity state.
+  type: string
+suffix:
+  required: false
+  description: Text after entity state.
+  type: string
+name:
+  required: false
+  description: Overwrites friendly name.
+  type: string
+{% endconfiguration %}
+
 ## Example
 
 Entity rows:

source/_lovelace/markdown.markdown

@@ -81,3 +81,18 @@ card:
 ```
 
 {% endraw %}
+
+
+A special template variable - `user` is set up for the `content` of the card. It contains the currently logged in user.
+
+For example:
+
+{% raw %}
+
+```yaml
+type: markdown
+content: |
+  Hello, {{user}}
+```
+
+{% endraw %}