From d94c7e2a489dd352d3078dd7fca6b4efd2b83f1b Mon Sep 17 00:00:00 2001
From: Philip Allgaier <mail@spacegaier.de>
Date: Thu, 28 Jan 2021 14:01:13 +0100
Subject: [PATCH] Correct `entities` merge (#16332)

---
 source/_lovelace/entities.markdown | 66 ++----------------------------
 1 file changed, 4 insertions(+), 62 deletions(-)

diff --git a/source/_lovelace/entities.markdown b/source/_lovelace/entities.markdown
index e35f91b8287..18fcf51e0bf 100644
--- a/source/_lovelace/entities.markdown
+++ b/source/_lovelace/entities.markdown
@@ -136,6 +136,10 @@ name:
   required: false
   description: Overwrites friendly entity name.
   type: string
+format:
+  required: false
+  description: "How the attribute value should be formatted. Currently only supported for timestamp attributes. Valid values are: `relative`, `total`, `date`, `time` and `datetime`."
+  type: string  
 {% endconfiguration %}
 
 ### Button
@@ -354,68 +358,6 @@ icon:
   default: "`mdi:link`"
 {% endconfiguration %}
 
-### Buttons
-
-{% configuration %}
-type:
-  required: true
-  description: buttons
-  type: string
-entities:
-  required: true
-  description: A list of entities to show. Each entry is either an entity ID or a map.
-  type: list
-  keys:
-    entity:
-      required: true
-      description: The entity to render.
-      type: string
-    icon:
-      required: false
-      description: Override the entity icon.
-      type: string
-    image:
-      required: false
-      description: Override the entity image.
-      type: string
-    name:
-      required: false
-      description: Label for the button
-      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
-format:
-  required: false
-  description: "How the attribute value should be formatted. Currently only supported for timestamp attributes. Valid values are: `relative`, `total`, `date`, `time` and `datetime`."
-  type: string  
-{% endconfiguration %}
 ## Examples
 
 ### Entity rows