Merge branch 'current' into next

source/_integrations/pvoutput.markdown

@@ -47,6 +47,8 @@ It's recommended to set `scan_interval:` according to a value greater than 60 se
 
 To format the PVoutput sensor it's recommended to use the [template component](/topics/templating/). For example:
 
+{% raw %}
+
 ```yaml
 sensor:
   - platform: pvoutput
@@ -56,19 +58,21 @@ sensor:
   - platform: template
     sensors:
       power_consumption:
-        value_template: {% raw %}'{% if is_state_attr("sensor.pvoutput", "power_consumption", "NaN") %}0{% else %}{{ state_attr('sensor.pvoutput', 'power_consumption') }}{% endif %}'{% endraw %}
+              value_template: '{% if is_state_attr("sensor.pvoutput", "power_consumption", "NaN") %}0{% else %}{{ state_attr("sensor.pvoutput", "power_consumption") }}{% endif %}'
         friendly_name: 'Using'
         unit_of_measurement: 'Watt'
       energy_consumption:
-        value_template: {% raw %}'{{ "%0.1f"|format(state_attr('sensor.pvoutput', 'energy_consumption')|float/1000) }}'{% endraw %}
+        value_template: '{{ "%0.1f"|format(state_attr("sensor.pvoutput", "energy_consumption")|float/1000) }}'
         friendly_name: 'Used'
         unit_of_measurement: 'kWh'
       power_generation:
-        value_template: {% raw %}'{% if is_state_attr("sensor.pvoutput", "power_generation", "NaN") %}0{% else %}{{ state_attr('sensor.pvoutput', 'power_generation') }}{% endif %}'{% endraw %}
+        value_template: '{% if is_state_attr("sensor.pvoutput", "power_generation", "NaN") %}0{% else %}{{ state_attr("sensor.pvoutput", "power_generation") }}{% endif %}'
         friendly_name: 'Generating'
         unit_of_measurement: 'Watt'
       energy_generation:
-        value_template: {% raw %}'{% if is_state_attr("sensor.pvoutput", "energy_generation", "NaN") %}0{% else %}{{ "%0.2f"|format(state_attr('sensor.pvoutput', 'energy_generation')|float/1000) }}{% endif %}'{% endraw %}
+        value_template: '{% if is_state_attr("sensor.pvoutput", "energy_generation", "NaN") %}0{% else %}{{ "%0.2f"|format(state_attr("sensor.pvoutput", "energy_generation")|float/1000) }}{% endif %}'
         friendly_name: 'Generated'
         unit_of_measurement: 'kWh'
 ```
+
+{% endraw %}

source/_integrations/vizio.markdown

@@ -15,30 +15,21 @@ The `vizio` integration allows you to control [SmartCast](https://www.vizio.com/
 
 ## Find your device
 
-Install the command line tool using `pip` (or download it manually):
+### Install pyvizio locally
 
-```bash
+> NOTE: If the `pip3` command is not found, try `pip` instead
-$ pip3 install pyvizio
-```
 
-or
+- To install, run `pip3 install pyvizio` in your terminal.
+- If `pyvizio` is already installed locally, make sure you are using the latest version by running `pip3 install --upgrade pyvizio` in your terminal.
 
-```bash
+### Discover devices
-$ pip3 install git+https://github.com/vkorn/pyvizio.git@master
-```
-
-or
-
-```bash
-$ pip3 install -I .
-```
 
 Find your device using the following command:
-```txt
+```bash
-pyvizio --ip=0 discover
+$ pyvizio --ip=0 discover
 ```
 
-and note its IP address. If using the IP address by itself does not work, you may need to append `:9000` or `:7345` to it when using it as a parameter in future commands.
+and note its IP address and port number. If you have trouble finding a device you were expecting to, you can try increasing the discovery timeout period by adding the `--timeout` option (e.g. `pyvizio --ip=0 discover --timeout=10`).
 
 ## Pairing
 
@@ -48,28 +39,28 @@ To obtain an auth token, follow these steps:
 
 Make sure that your device is on before continuing.
 
-| Parameter       | Description          |
+| Parameter     | Description                                                             |
-|:----------------|:---------------------|
+| :------------ | :---------------------------------------------------------------------- |
-| `ip`            | IP address (possibly including port) obtained from the previous section |
+| `ip`          | `IP Address:Port` (obtained from the previous section)                  |
-| `device_type`   | The type of device you are connecting to. Options are `tv` or `speaker` |
+| `device_type` | The type of device you are connecting to. Options are `tv` or `speaker` |
 
 Enter the following command to initiate pairing:
 
 ```bash
-$ pyvizio --ip={ip} --device_type={device_type} pair
+$ pyvizio --ip={ip:port} --device_type={device_type} pair
 ```
 
 Initiation will show you two different values:
 
-| Value           | Description          |
+| Value           | Description                                                                                             |
-|:----------------|:---------------------|
+| :-------------- | :------------------------------------------------------------------------------------------------------ |
 | Challenge type  | Usually it should be `"1"`. If not, use the additional parameter `--ch_type=your_type` in the next step |
-| Challenge token | Token required to finalize pairing in the next step |
+| Challenge token | Token required to finalize pairing in the next step                                                     |
 
 At this point, a PIN code should be displayed at the top of your TV. With all these values, you can now finish pairing:
 
 ```bash
-$ pyvizio --ip={ip} --device_type={device_type} pair-finish --token={challenge_token} --pin={pin}
+$ pyvizio --ip={ip:port} --device_type={device_type} pair-finish --token={challenge_token} --pin={pin}
 ```
 
 You will need the authentication token returned by this command to configure Home Assistant.
@@ -81,13 +72,13 @@ To add your Vizio TV to your installation, add the following to your `configurat
 ```yaml
 # Example configuration.yaml entry
 vizio:
-  - host: IP_ADDRESS
+  - host: "DEVICE_IP:DEVICE_PORT"
     access_token: AUTH_TOKEN
 ```
 
 {% configuration %}
 host:
-  description: IP address of your device.
+  description: "`IP Address:Port` for your device (port is optional but recommended)."
   required: true
   type: string
 name:

source/_lovelace/light.markdown

@@ -30,6 +30,11 @@ name:
   description: Overwrites friendly name.
   type: string
   default: Name of Entity
+icon:
+  required: false
+  description: Overwrites icon.
+  type: string
+  default: Entity Domain Icon
 theme:
   required: false
   description: Set to any theme within `themes.yaml`.