Merge remote-tracking branch 'origin/current' into next

Gemfile.lock

@@ -70,7 +70,7 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
     mini_portile2 (2.4.0)
-    multi_json (1.14.1)
+    multi_json (1.15.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     nokogiri (1.10.10)

source/_integrations/google_assistant.markdown

@@ -149,7 +149,7 @@ entity_config:
   required: false
   type: map
   keys:
-    '`<ENTITY_ID>`':
+    YOUR_ENTITY_ID:
       description: Entity to configure
       required: false
       type: map

source/_integrations/rest.markdown

@@ -320,7 +320,7 @@ sensor:
 ```
 {% endraw %}
 
-This configuration shows how to extract multiple values from a dictionary with `json_attributes` and `template`. It helps you to avoid flooding the REST service and only ask once the results and separate them in multiple templates referring to it. (No need for a specific state on the REST sensor and it's default state will be the full JSON value which will be longer than the 255 max length. It's why we'll used a static value)
+This configuration shows how to extract multiple values from a dictionary with `json_attributes` and `template`. This avoids flooding the REST service by only requesting the result once, then creating multiple attributes from that single result using templates. By default, the sensor state would be set to the full JSON — here, that would exceed the 255-character maximum allowed length for the state, so we override that default by using `value_template` to set a static value of `OK`.
 
 {% raw %}
 ```json