Merge branch 'current' into next

plugins/details.rb

@@ -15,9 +15,6 @@ module Jekyll
       end
       title = title.to_s.delete("\"")
 
-      site = context.registers[:site]
-      converter = site.find_converter_instance(::Jekyll::Converters::Markdown)
-
       <<~MARKUP
         <script>
         function showDetails(el) {
@@ -36,7 +33,7 @@ module Jekyll
               <svg id="down" style="display: block;" width="24" height="24" viewBox="0 0 24 24"><path d="M7.41,8.58L12,13.17L16.59,8.58L18,10L12,16L6,10L7.41,8.58Z" /></svg>
               <svg id="up" style="display: none;" width="24" height="24" viewBox="0 0 24 24"><path d="M7.41,15.41L12,10.83L16.59,15.41L18,14L12,8L6,14L7.41,15.41Z" /></svg>
             </div>
-            <div class='details-block-content' hidden>#{converter.convert(contents.to_s)}</div>
+            <div class='details-block-content' hidden>#{contents}</div>
           </div>
         </div>
       MARKUP

source/_docs/blueprint/selectors.markdown

@@ -225,9 +225,9 @@ entity:
 
 An example entity selector that, will only show devices that are:
 
-- Provided by the [deCONZ](/integration/deconz) integration.
+- Provided by the [deCONZ](/integrations/deconz) integration.
 - Are a Philips Hue Remote of Model RWL021.
-- Provide a battery [sensor](/integration/sensor).
+- Provide a battery [sensor](/integrations/sensor).
 
 And this is what is looks like in YAML:
 
@@ -286,8 +286,8 @@ device_class:
 
 An example entity selector that, will only show entities that are:
 
-- Provided by the [ZHA](/integration/zha) integration.
+- Provided by the [ZHA](/integrations/zha) integration.
-- From the [Binary Sensor](/integration/binary_sensor) domain.
+- From the [Binary Sensor](/integrations/binary_sensor) domain.
 - Have presented themselves as devices of a motion device class.
 
 And this is what it looks like in YAML:

source/_integrations/qnap.markdown

@@ -35,7 +35,7 @@ sensor:
 
 {% configuration %}
 host:
-  description: The IP address of the QNAP NAS to monitor.
+  description: The IP address of the QNAP NAS to monitor, i.e., `192.168.8.12`.
   required: true
   type: string
 port:
@@ -44,12 +44,12 @@ port:
   default: 8080
   type: integer
 ssl:
-  description: Whether to connect via `https`.
+  description: Whether to connect via `https`. You might need to configure `port` (i.e., `443`) and `verify_ssl` (i.e., `false`) accordingly.
   required: false
   default: false
   type: boolean
 verify_ssl:
-  description: Whether SSL certificates should be validated.
+  description: Whether SSL certificates should be validated. Set to `false` if you use the default, self-signed QNap certificate.
   required: false
   default: true
   type: boolean
@@ -59,7 +59,7 @@ timeout:
   default: 10
   type: integer
 username:
-  description: An user to connect to the QNAP NAS.
+  description: An administration user to connect to the QNAP NAS. This user must be a member of the _administration_ group.
   required: true
   type: string
 password:
@@ -118,9 +118,9 @@ monitored_conditions:
       description: Displays the used space of the volume as a percentage (creates a new entry for each volume).
 {% endconfiguration %}
 
-### Self-signed certificates
+### SSL and Self-signed certificates
 
-If your QNAP device uses self-signed certificates, set the `verify_ssl` option to `false`.
+If your QNAP device uses self-signed certificates, set the `verify_ssl` option to `false`. If you configured your device to accept SSL-only connections, please also check that you set `port` accordingly, or you might get an `SSL: WRONG_VERSION_NUMBER` error.
 
 ### QNAP device support
 

source/_posts/2020-10-28-release-117.markdown

@@ -1541,7 +1541,7 @@ is automatically imported after upgrading and can be safely removed afterward.
 - Improve handling of ignored entries ([@balloob] - [#42148]) ([hue docs]) ([progettihwsw docs]) ([tradfri docs])
 - Use the beautiful ambient light icon ([@dermotduffy] - [#42153]) ([hyperion docs])
 - Upgrade sentry-sdk to 0.19.1 ([@frenck] - [#42132]) ([sentry docs])
-- Handle Fritz exception and log warning ([@JPHutchins] - [#42145]) ([fritz docs]) ([open_energy_view docs])
+- Handle Fritz exception and log warning ([@JPHutchins] - [#42145]) ([fritz docs])
 - Fix pico tts errors ([@KevinCathcart] - [#41619]) ([tts docs])
 - Add async_setup_entry to calendar platform ([@Olen] - [#42075]) ([calendar docs])
 - Bump aioshelly library to 0.4.0 ([@bieniu] - [#41905]) ([shelly docs])
@@ -2738,7 +2738,6 @@ is automatically imported after upgrading and can be safely removed afterward.
 [omnilogic docs]: /integrations/omnilogic/
 [onewire docs]: /integrations/onewire/
 [onvif docs]: /integrations/onvif/
-[open_energy_view docs]: /integrations/open_energy_view/
 [openhardwaremonitor docs]: /integrations/openhardwaremonitor/
 [openhome docs]: /integrations/openhome/
 [openuv docs]: /integrations/openuv/

source/_posts/2020-11-18-release-118.markdown

@@ -802,7 +802,7 @@ all erroneous entries to the new `controller_modes` parameter.
 - Use common strings in openuv config flow ([@springstan] - [#42480]) ([openuv docs])
 - Add platform services to Roon media player to allow grouping, ungrouping and transfer between players ([@pavoni] - [#42133]) ([roon docs])
 - Set the translations cache under the lock ([@bdraco] - [#42470])
-- Add color_extractor service ([@GenericStudent] - [#42129]) ([colorthief docs]) (new-integration)
+- Add color_extractor service ([@GenericStudent] - [#42129]) ([color_extractor docs]) (new-integration)
 - Remove zxdavb from honeywell codeowners ([@zxdavb] - [#42491]) ([honeywell docs])
 - Fix somfy device recreation on update ([@bdraco] - [#42462]) ([somfy docs])
 - Start homekit bridges with asyncio.gather ([@bdraco] - [#42498]) ([homekit docs])
@@ -1549,7 +1549,6 @@ all erroneous entries to the new `controller_modes` parameter.
 [cast docs]: /integrations/cast/
 [cloud docs]: /integrations/cloud/
 [color_extractor docs]: /integrations/color_extractor/
-[colorthief docs]: /integrations/colorthief/
 [config docs]: /integrations/config/
 [debugpy docs]: /integrations/debugpy/
 [device_tracker docs]: /integrations/device_tracker/

source/_posts/2021-02-03-release-20212.markdown

@@ -2034,7 +2034,7 @@ The following integrations have been removed:
 [frontend docs]: /integrations/frontend/
 [generic_thermostat docs]: /integrations/generic_thermostat/
 [gogogate2 docs]: /integrations/gogogate2/
-[google docs]: /integrations/google/
+[google docs]: /integrations/calendar.google/
 [google_assistant docs]: /integrations/google_assistant/
 [google_cloud docs]: /integrations/google_cloud/
 [google_maps docs]: /integrations/google_maps/