Merge branch 'current' into next

_config.yml

@@ -100,9 +100,9 @@ social:
 
 # Home Assistant release details
 current_major_version: 0
-current_minor_version: 104
-current_patch_version: 3
-date_released: 2020-01-21
+current_minor_version: 105
+current_patch_version: 0
+date_released: 2020-02-05
 
 # Either # or the anchor link to latest release notes in the blog post.
 # Must be prefixed with a # and have double quotes around it.

source/_docs/configuration/packages.markdown

@@ -84,6 +84,24 @@ homeassistant:
 This uses the concept splitting the configuration and will include all files in a directory with the keys representing the filenames.
 See the documentation about [splitting the configuration](/docs/configuration/splitting_configuration/) for more information about `!include_dir_named` and other include statements that might be helpful. The benefit of this approach is to pull all configurations required to integrate a system, into one file, rather than across several.
 
+The following example allows to have subfolders in the `packages` folder, which could make managing multiple packages easier by grouping:
+
+```yaml
+homeassistant:
+  packages: !include_dir_merge_named packages/
+```
+
+and in `packages/subsystem1/functionality1.yaml`:
+
+```yaml
+subsystem1_functionality1:
+  input_boolean:
+  ...
+  binary_sensor:
+  ...
+  automation:
+```
+
 ### Customizing entities with packages
 
 It is possible to [customize entities](/docs/configuration/customizing-devices/) within packages. Just create your customization entries under:

source/_docs/ecosystem/nginx_subdomain.markdown

@@ -85,6 +85,10 @@ server {
     location / {
         proxy_pass http://localhost:8124;
         proxy_set_header Host $host;
+        
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
     }
 
     location /api/websocket {

source/hassio/installation.markdown

@@ -208,21 +208,21 @@ A detailed guide about running Hass.io as a virtual machine is available in the
 [balenaEtcher]: https://www.balena.io/etcher
 [Virtual Appliance]: https://github.com/home-assistant/hassos/blob/dev/Documentation/boards/ova.md
 [hassos-network]: https://github.com/home-assistant/hassos/blob/dev/Documentation/network.md
-[pi0-w]: https://github.com/home-assistant/hassos/releases/download/3.8/hassos_rpi0-w-3.8.img.gz
-[pi1]: https://github.com/home-assistant/hassos/releases/download/3.8/hassos_rpi-3.8.img.gz
-[pi2]: https://github.com/home-assistant/hassos/releases/download/3.8/hassos_rpi2-3.8.img.gz
-[pi3-32]: https://github.com/home-assistant/hassos/releases/download/3.8/hassos_rpi3-3.8.img.gz
-[pi3-64]: https://github.com/home-assistant/hassos/releases/download/3.8/hassos_rpi3-64-3.8.img.gz
-[pi4-32]: https://github.com/home-assistant/hassos/releases/download/3.8/hassos_rpi4-3.8.img.gz
-[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
+[pi0-w]: https://github.com/home-assistant/hassos/releases/download/3.9/hassos_rpi0-w-3.9.img.gz
+[pi1]: https://github.com/home-assistant/hassos/releases/download/3.9/hassos_rpi-3.9.img.gz
+[pi2]: https://github.com/home-assistant/hassos/releases/download/3.9/hassos_rpi2-3.9.img.gz
+[pi3-32]: https://github.com/home-assistant/hassos/releases/download/3.9/hassos_rpi3-3.9.img.gz
+[pi3-64]: https://github.com/home-assistant/hassos/releases/download/3.9/hassos_rpi3-64-3.9.img.gz
+[pi4-32]: https://github.com/home-assistant/hassos/releases/download/3.9/hassos_rpi4-3.9.img.gz
+[pi4-64]: https://github.com/home-assistant/hassos/releases/download/3.9/hassos_rpi4-64-3.9.img.gz
+[tinker]: https://github.com/home-assistant/hassos/releases/download/3.9/hassos_tinker-3.9.img.gz
+[odroid-c2]: https://github.com/home-assistant/hassos/releases/download/3.9/hassos_odroid-c2-3.9.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
-[vhdx]: https://github.com/home-assistant/hassos/releases/download/3.8/hassos_ova-3.8.vhdx.gz
-[vdi]: https://github.com/home-assistant/hassos/releases/download/3.8/hassos_ova-3.8.vdi.gz
+[odroid-xu4]: https://github.com/home-assistant/hassos/releases/download/3.9/hassos_odroid-xu4-3.9.img.gz
+[intel-nuc]: https://github.com/home-assistant/hassos/releases/download/3.9/hassos_intel-nuc-3.9.img.gz
+[vmdk]: https://github.com/home-assistant/hassos/releases/download/3.9/hassos_ova-3.9.vmdk.gz
+[vhdx]: https://github.com/home-assistant/hassos/releases/download/3.9/hassos_ova-3.9.vhdx.gz
+[vdi]: https://github.com/home-assistant/hassos/releases/download/3.9/hassos_ova-3.9.vdi.gz
 [linux]: https://github.com/home-assistant/hassio-installer
 [local]: http://hassio.local:8123
 [samba]: /addons/samba/