Merge branch 'current' into next

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10

.github/workflows/docker.yml

@@ -20,18 +20,18 @@ jobs:
     steps:
       -
         name: Checkout source code
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3.0.2
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1.5.1
+        uses: docker/setup-buildx-action@v2
       -
         name: Login to DockerHub
-        uses: docker/login-action@v1.10.0
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1.10.0
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -39,7 +39,7 @@ jobs:
       -
         name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v2.6.1
+        uses: docker/build-push-action@v3
         with:
           context: .
           push: true

.github/workflows/lint.yml

@@ -19,9 +19,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3.0.2
     - name: Set up Python 3.8
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: 3.8
     - name: Install dependencies

.github/workflows/stale.yml

@@ -16,7 +16,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v4
+      - uses: actions/stale@v5
         with:
           days-before-pr-stale: 60
           days-before-pr-close: 7
@@ -35,7 +35,7 @@ jobs:
   close-issues:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v4
+      - uses: actions/stale@v5
         with:
           days-before-pr-stale: -1
           days-before-pr-close: -1

components/ble_client.rst

@@ -97,7 +97,7 @@ This automation is triggered when the client disconnects from a BLE device.
 -------------------------------
 
 This action triggers a write to a specified BLE characteristic. The write is attempted in
-a best-effort fashion and will only succeed if the `ble_client`'s  connection has been
+a best-effort fashion and will only succeed if the ``ble_client``'s  connection has been
 established and the peripheral exposes the expected BLE service and characteristic.
 
 Example usage:

components/climate/bedjet.rst

@@ -96,7 +96,7 @@ From :ref:`lambdas <config-lambda>`, you can call methods to do some advanced st
 ``bedjet`` Climate
 ------------------
 
-The `climate` platform exposes the BedJet's climate-related functionality, including
+The ``climate`` platform exposes the BedJet's climate-related functionality, including
 setting the mode and target temperature.
 
 .. code-block:: yaml
@@ -114,9 +114,12 @@ Configuration variables:
 - **name** (**Required**, string): The name of the climate device.
 - **bedjet_id** (**Required**, :ref:`config-id`): The ID of the Bedjet component.
 - **heat_mode** (*Optional*, string): The primary heating mode to use for ``HVACMode.HEAT``:
-    - ``"heat"`` (Default) - Setting ``hvac_mode=heat`` uses the BedJet "HEAT" mode.
+
-    - ``"extended"`` - Setting ``hvac_mode=heat`` uses BedJet "EXT HEAT" mode.
+    - ``heat`` (Default) - Setting ``hvac_mode=heat`` uses the BedJet "HEAT" mode.
-    - Whichever is not selected will be made available as a custom preset.
+    - ``extended`` - Setting ``hvac_mode=heat`` uses BedJet "EXT HEAT" mode.
+
+    Whichever is not selected will be made available as a custom preset.
+
 - All other options from :ref:`Climate <config-climate>`.
 
 ``bedjet`` Fan

components/esp32_camera.rst

@@ -151,7 +151,7 @@ Automations:
 
 - **on_stream_start** (*Optional*, :ref:`Automation <automation>`): An automation to perform
   when a stream starts.
-- **on_stream_end** (*Optional*, :ref:`Automation <automation>`): An automation to perform
+- **on_stream_stop** (*Optional*, :ref:`Automation <automation>`): An automation to perform
   when a stream stops.
 
 Test Setting:

components/esp32_camera_web_server.rst

@@ -31,6 +31,15 @@ Configuration variables:
   - ``snapshot``
   - ``stream``
 
+Integrating the mjpeg web service into an NVR:
+----------------------------------------------
+
+**Zoneminder**
+
+- *General -> Source Type*: `cURL (HTTP(S) only)`
+- *Source -> URL*: `http://ESP_IP_ADDRESS:8080/`
+
+
 See Also
 --------
 

components/media_player/i2s_audio.rst

@@ -23,7 +23,7 @@ via the I2S bus. This platform only works on ESP32 based chips.
 Configuration variables:
 ------------------------
 
-- **dac_type** (**Required**, enum)
+- **dac_type** (**Required**, enum):
 
   - ``external``: Use an external DAC, for example the NS4168, or UDA1334A.
   - ``internal``: Use the internal DAC

components/output/dac7678.rst

@@ -45,8 +45,8 @@ Configuration variables:
 
 .. _dac7678-output:
 
-DAC Output
+DAC7678 Output
-----------
+--------------
 
 The DAC7678 output component exposes a DAC7678 DAC channel of a global
 :ref:`DAC7678 hub <dac7678-component>` as a float

components/sensor/sgp4x.rst

@@ -48,7 +48,7 @@ Configuration variables:
     - **learning_time_gain_hours** (*Optional*): Time constant to estimate the VOC algorithm gain from the history in hours. Past events will be forgotten after about twice the learning time. Allowed values are in range 1..1000. The default value is 12 hours.
     - **gating_max_duration_minutes** (*Optional*): Maximum duration of gating in minutes (freeze of estimator during high VOC index signal). Zero disables the gating. Allowed values are in range 0..3000. The default value is 180 minutes
     - **std_initial** (*Optional*): Initial estimate for standard deviation. Lower value boosts events during initial learning period, but may result in larger device-todevice variations. Allowed values are in range 10..5000. The default value is 50.
-    - **gain_factor:** (*Optional*): Gain factor to amplify or to attenuate the VOC index output. Allowed values are in range 1..1000. The default value is 230.
+    - **gain_factor** (*Optional*): Gain factor to amplify or to attenuate the VOC index output. Allowed values are in range 1..1000. The default value is 230.
 
 
   - All other options from :ref:`Sensor <config-sensor>`.
@@ -64,7 +64,7 @@ Configuration variables:
     - **learning_time_gain_hours** (*Optional*): Time constant to estimate the NOx algorithm gain from the history in hours. Past events will be forgotten after about twice the learning time. Allowed values are in range 1..1000. The default value is 12 hours.
     - **gating_max_duration_minutes** (*Optional*): Maximum duration of gating in minutes (freeze of estimator during high NOx index signal). Zero disables the gating. Allowed values are in range 0..3000. The default value is 180 minutes
     - **std_initial** (*Optional*): The initial estimate for standard deviation parameter has no impact for NOx. This parameter is still in place for consistency reasons with the VOC tuning parameters command. This parameter must always be set to 50.
-    - **gain_factor:** (*Optional*)
+    - **gain_factor** (*Optional*): Gain factor to amplify or to attenuate the VOC index output. Allowed values are in range 1..1000. The default value is 230.
 
   - All other options from :ref:`Sensor <config-sensor>`.
 

components/sensor/smt100.rst

@@ -47,7 +47,7 @@ Configuration variables:
   - **name** (**Required**): Sensor name.
   - All other options from :ref:`Sensor <config-sensor>`.
 
-- **Permittivity** (*Optional*): Permittivity or dielectric coefficient of the material to be measured (dimensionless quantity. Higher permittivity means higher water content. May be used for material specific calibration.
+- **dielectric_constant** (*Optional*): Dielectric coefficient or permittivity of the material to be measured (dimensionless quantity). Higher permittivity means higher water content. May be used for material specific calibration.
 
   - **name** (**Required**): Sensor name.
   - All other options from :ref:`Sensor <config-sensor>`.

components/sprinkler.rst

@@ -78,12 +78,12 @@ examples that are ready for you to copy and paste!
 Configuration variables:
 ------------------------
 
-- **main_switch** (**Required** with more than one valve, *string*): The name for the sprinkler
+- **main_switch** (*Optional*, *string*): Required with more than one valve. The name for the sprinkler
   controller's main switch as it will appear in the front end. This switch, when turned on, calls the
   ``sprinkler.resume_or_start_full_cycle`` action; when turned off, it calls the ``sprinkler.shutdown``
   action (see below). It will appear to be "on" when any valve on the controller is active. This switch
   will not appear in the front end if the controller is configured with only one valve.
-- **auto_advance_switch** (**Required** with more than one valve, *string*): The name for the
+- **auto_advance_switch** (*Optional*, *string*): Required with more than one valve. The name for the
   sprinkler controller's "auto-advance" switch as it will appear in the front end. When this switch is
   turned on while a valve is active, when the valve's ``run_duration`` is reached, the sprinkler
   controller will automatically advance to the next enabled valve as a part of a "full cycle" of the

guides/automations.rst

@@ -337,7 +337,6 @@ All Triggers
 - :ref:`switch.on_turn_on / switch.on_turn_off <switch-on_turn_on_off_trigger>`
 - :doc:`remote_receiver.on_* </components/remote_receiver>`
 - :doc:`sun.on_sunrise </components/sun>` / :doc:`sun.on_sunset </components/sun>`
-- :ref:`switch.on_turn_on/off <switch-on_turn_on_off_trigger>`
 - :ref:`sim800l.on_sms_received <sim800l-on_sms_received>`
 - :ref:`rf_bridge.on_code_received <rf_bridge-on_code_received>`
 - :ref:`ota.on_begin <ota-on_begin>` / :ref:`ota.on_progress <ota-on_progress>` /