Merge branch 'current' into next

components/climate/thermostat.rst

@@ -173,6 +173,12 @@ These configuration items determine default values the thermostat controller sho
   - ``dry``
   - ``fan_only``
   - ``auto``
+  
+This value is used the first time your device starts after ESPHome is initially installed onto it. Add
+this option into your configuration if you want your thermostat component to start in a climate mode other
+than ``off``.  If this option is not configured, you'll need to manually change the climate mode later via
+the front end (Home Assistant), an ESPHome action, automation, or from within a lambda elsewhere in your
+device's configuration.
 
 - **default_target_temperature_low** (*Optional*, float): The default low target
   temperature for the control algorithm. This can be dynamically set in the frontend later.

guides/automations.rst

@@ -611,6 +611,20 @@ a shorthand way of writing a ``while`` action with an empty ``then`` block.)
           binary_sensor.is_on: some_binary_sensor
       - logger.log: "Binary sensor is ready"
 
+If you want to use a timeout, the term "condition" is required:
+
+.. code-block:: yaml
+
+    # In a trigger:
+    on_...:
+      - logger.log: "Waiting for binary sensor"
+      - wait_until:
+          condition:
+            binary_sensor.is_on: some_binary_sensor
+          timeout: 8s
+      - logger.log: "Binary sensor might be ready"
+
+
 Configuration variables:
 
 - **condition** (**Required**): The condition to wait to become true. See :ref:`Conditions <config-condition>`.