Merge branch 'current' into next

.github/workflows/markdown.yml

@@ -4,8 +4,7 @@ on: [push, pull_request]
 
 jobs:
   remark:
-    #runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
-    runs-on: self-hosted
     steps:
       - name: Checking out files from GitHub
         uses: actions/checkout@v1

source/_addons/google_assistant.markdown

@@ -28,7 +28,7 @@ To enable access to the Google Assistant API, do the following:
 1. Start the add-on. Check the log and click refresh till it says: "ENGINE Bus STARTED".
 1. Now click "Open Web UI" and follow the authentication process. You will get an empty response after you have send your token.
 
-That's it. You should no be able to use the Google Voice assistant. 
+That's it. You should now be able to use the Google Voice assistant. 
 
 ### Add-on configuration
 

source/_docs/installation/python.markdown

@@ -6,7 +6,7 @@ redirect_from: /getting-started/installation-python/
 
 <div class='note'>
 
-If you're running a Linux-based platform, we strongly recommend you follow the instructions for a [virtual environment](/docs/installation/virtualenv/) instead. If you're running on Windows then [see here](/docs/installation/windows/#installing-in-a-python-virtual-environment) instead.
+If you're running a Linux-based platform, we strongly recommend you follow the instructions for a [virtual environment](/docs/installation/virtualenv/) instead.
 
 </div>
 

source/_docs/installation/windows.markdown

@@ -1,61 +0,0 @@
----
-title: "Installation on a Windows system"
-description: "Instructions to install Home Assistant on a Microsoft Windows system."
----
-
-To run Home Assistant on Microsoft Windows installation you need to install Python first. Download Python (the latest version of Python 3.6 is recommended) for [https://www.python.org/downloads/windows/](https://www.python.org/downloads/windows/) and follow the instructions of the installer.
-
-<div class='note'>
-There may be alpha or beta releases of Python listed on that download page (marked by the letters `a` or `b` in the version number. Do not use these versions.
-</div>
-
-If you use your machine for something other than Home Assistant, you should install it in a [Python virtual environment](#installing-in-a-python-virtual-environment).
-
-Start 
-
-```bash
-C:\...\> pip3 install homeassistant
-C:\...\> py -m homeassistant --open-ui
-```
-
-For autostarting Home Assistant please refer to this [guide](https://community.home-assistant.io/t/autostart-on-windows/3504).
-
-Check this [video](https://www.youtube.com/watch?v=X27eVvuqwnY) for the installation on Windows 10.
-
-<div class='note warning'>
-The Microsoft Windows platform is not a primary target to install Home Assistant. Also, not all tools and third-party modules will work.
-</div>
-
-## Updating
-
-To update Home Assistant, stop it and then run:
-
-```bash
-C:\...\> pip3 install --upgrade homeassistant
-```
-
-Then start Home Assistant.
-
-## Installing in a Python virtual environment
-
-Open `cmd.exe` and paste the following commands (one at the time):
-
-```bash
-C:\...\> py -m venv homeassistant
-C:\...\> cd homeassistant
-C:\...\> Scripts\activate.bat
-C:\...\> py -m pip install wheel setuptools pip
-C:\...\> py -m pip install homeassistant
-C:\...\> hass
-```
-
-## Upgrading in a Python virtual environment
-
-To update Home Assistant, stop it and then open `cmd.exe` and paste the following commands (one at the time):
-
-```bash
-C:\...\> cd homeassistant
-C:\...\> Scripts\activate.bat
-C:\...\> py -m pip install --upgrade homeassistant
-```
-Then start Home Assistant.

source/_integrations/automatic.markdown

@@ -53,6 +53,12 @@ devices:
   type: list
 {% endconfiguration %}
 
+<div class='note'>
+  
+The device name must be the name given by Automatic automatically. This is typically the model year, make and model. This is *not* the nickname you have to give the vehicle in the `vehicles` section of the app's settings.
+  
+</div>  
+
 Home Assistant will also fire events when an update is received from Automatic. These can be used to trigger automations, as shown in the example below. A list of available event types can be found in the [Automatic Real-Time Events documentation](https://developer.automatic.com/api-reference/#real-time-events).
 
 ```yaml

source/_integrations/discovery.markdown

@@ -47,7 +47,7 @@ Zeroconf discoverable integrations [Axis](/integrations/axis/)/[ESPHome](/integr
 
 </div>
 
-`discovery` is included in the default configuration. To load this component manually, add the following lines to your `configuration.yaml` file:
+To load this integration, add the following lines to your `configuration.yaml` file:
 
 ```yaml
 # Example configuration.yaml entry

source/_integrations/dsmr.markdown

@@ -12,7 +12,7 @@ A sensor platform for Dutch Smart Meters which comply to DSMR (Dutch Smart Meter
 
 - Currently support DSMR V2.2, V3, V4 and V5 through the [dsmr_parser](https://github.com/ndokter/dsmr_parser) module by Nigel Dokter.
 - For official information about DSMR refer to: [DSMR Document](https://www.netbeheernederland.nl/dossiers/slimme-meter-15)
-- For official information about the P1 port refer to: <https://www.wijhebbenzon.nl/media/kunena/attachments/3055/DSMRv5.0FinalP1.pdf>
+- For official information about the P1 port refer to: <https://www.netbeheernederland.nl/_upload/Files/Slimme_meter_15_a727fce1f1.pdf>
 - For unofficial hardware connection examples refer to: [Domoticx](http://domoticx.com/p1-poort-slimme-meter-hardware/)
 
 <p class='img'>

source/_integrations/homematicip_cloud.markdown

@@ -165,6 +165,18 @@ Within this delay the device registration should be completed in the App, otherw
   * Weather Sensor – plus (*HmIP-SWO-PL*)
   * Weather Sensor – pro (*HmIP-SWO-PR*)
   
+## What to do, if a device is missing in Home Assistant
+
+In order for a device to be integrated into Home Assistant, it must first be implemented in the upstream library. A dump of your configuration is required for this, which is then attached to a new issue in the [upstream lib's](https://github.com/coreGreenberet/homematicip-rest-api) GitHub repository.
+
+1. Create a dump of your access point configuration in Home Assistant: 
+  Developer Tools -> Services -> Select `homematicip_cloud.dump_hap_config` -> Execute. 
+  The default dump is anonymized and is written to your configuration directory (`hmip_config_XXXX.json`).
+2. Create a [new issue](https://github.com/coreGreenberet/homematicip-rest-api/issues/new) at this GitHub repository and attach the created dump file.
+
+Please be patient, wait for the implementation and a new release of the upstream library.
+Afterward, this device can be implemented into Home Assistant.
+  
 ## Services
 
 - `homematicip_cloud.activate_eco_mode_with_duration`: Activate eco mode with duration.

source/hassio/installation.markdown

@@ -15,6 +15,7 @@ The following will take you through the steps required to install Hass.io.
      - [Raspberry Pi 4 Model B 64bit][pi4-64]
      - [Tinkerboard][tinker]
      - [Odroid-C2][odroid-c2]
+     - [Odroid-N2 (Beta)][odroid-n2]
      - [Odroid-XU4][odroid-xu4]
      - [Intel-Nuc][intel-nuc]
     
@@ -216,6 +217,7 @@ A detailed guide about running Hass.io as a virtual machine is available in the
 [pi4-64]: https://github.com/home-assistant/hassos/releases/download/3.8/hassos_rpi4-64-3.8.img.gz
 [tinker]: https://github.com/home-assistant/hassos/releases/download/3.8/hassos_tinker-3.8.img.gz
 [odroid-c2]: https://github.com/home-assistant/hassos/releases/download/3.8/hassos_odroid-c2-3.8.img.gz
+[odroid-n2]: https://github.com/home-assistant/hassos/releases/download/4.0/hassos_odroid-n2-4.0.img.gz
 [odroid-xu4]: https://github.com/home-assistant/hassos/releases/download/3.8/hassos_odroid-xu4-3.8.img.gz
 [intel-nuc]: https://github.com/home-assistant/hassos/releases/download/3.8/hassos_intel-nuc-3.8.img.gz
 [vmdk]: https://github.com/home-assistant/hassos/releases/download/3.8/hassos_ova-3.8.vmdk.gz