Merge branch 'current' into patch-1

source/_components/calendar.caldav.markdown

@@ -33,6 +33,8 @@ To integrate a WebDav calendar in Home Assistant, add the following section to y
 # Example configuration.yaml entry for baikal
 calendar:
   - platform: caldav
+    username: john.doe@test.com
+    password: !secret caldav
     url: https://baikal.my-server.net/cal.php/calendars/john.doe@test.com/default
 ```
 
@@ -45,6 +47,33 @@ calendar:
 
 Note that all day events only work for custom calendars.
 
+This example will generate default binary sensors for each calendar you have in your account. Those calendars will be `on` when there is an ongoing event and `off` if not. Events that last a whole day are ignored in those calendars. You have to setup custom calendars in order to take them into account or for advanced event filtering.
+
+
+### {% linkable_title Custom calendars %}
+
+You have the possibility to create multiple binary sensors for events that match certain conditions.
+
+```yaml
+# Example configuration.yaml entry
+calendar:
+  - platform: caldav
+    username: john.doe@test.com
+    password: !secret caldav
+    url: https://baikal.my-server.net/cal.php/calendars/john.doe@test.com/default
+    custom_calendars:
+      - name: 'HomeOffice'
+        calendar: 'Agenda'
+        search: 'HomeOffice'
+      - name: 'WarmupFlat'
+        calendar: 'Agenda'
+        search: 'Warmup'
+```
+
+This will create two binary sensors for the calendar name Agenda: "HomeOffice" and "WarmupFlat". Those sensors will be `on` if there is an ongoing event matching the regular expression specified in `search`. In custom calendars, events that last a whole day are taken into account.
+
+Please note that when you configure custom calendars, the default ones are not created anymore.
+
 {% configuration %}
 url:
   required: true
@@ -77,7 +106,7 @@ custom_calendars:
       type: string
     search:
       required: true
-      description: Regular expression for filtering the events. If this matches the description, summary, or location then the event will be included in this custom calendar.
+      description: Regular expression for filtering the events based on the content of their summary, description or location.
       type: string
 {% endconfiguration %}
 
@@ -151,4 +180,4 @@ calendar:
     entity_id: calendar.work_holiday
     state: 'off'
 
-```
+```

source/_components/sensor.folder.markdown

@@ -13,7 +13,7 @@ ha_iot_class: "Local Polling"
 ha_release: 0.64
 ---
 
-Sensor for monitoring the contents of a folder. Note that folder paths must be added to [whitelist_external_dirs](https://home-assistant.io/docs/configuration/basic/). Optionally a [wildcard filter]((https://docs.python.org/3.6/library/fnmatch.html)) can be applied to the files considered within the folder. The state of the sensor is the size in MB of files within the folder that meet the filter criteria. The number of filtered files in the folder and total size in bytes of those files are exposed as attributes.
+Sensor for monitoring the contents of a folder. Note that folder paths must be added to [whitelist_external_dirs](https://home-assistant.io/docs/configuration/basic/). Optionally a [wildcard filter](https://docs.python.org/3.6/library/fnmatch.html) can be applied to the files considered within the folder. The state of the sensor is the size in MB of files within the folder that meet the filter criteria. The number of filtered files in the folder and total size in bytes of those files are exposed as attributes.
 
 To enable the `folder` sensor in your installation, add the following to your `configuration.yaml` file:
 

source/_docs/installation/hassbian/common-tasks.markdown

@@ -37,7 +37,7 @@ To get the current state of the `homeassistant.service` replace `stop` with `sta
 ### {% linkable_title Update Home Assistant %}
 
 <p class='note'>
-You can also use `hassbian-config` to automate the process by running `sudo hassbian-config upgrade homeassistant`
+You can also use `hassbian-config` to automate the process by running `sudo hassbian-config upgrade home-assistant`
 </p>
 
 Log in as the `pi` account and execute the following commands: