Merge branch 'current' into next

2017-10-20 23:28:47 +02:00 · 2017-10-20 23:28:47 +02:00 · c3237a57ac
commit c3237a57ac
parent dfb11dbd9d 2b963d62c4
81 changed files with 803 additions and 177 deletions
--- a/source/_docs/configuration/yaml.markdown
+++ b/source/_docs/configuration/yaml.markdown
@ -83,3 +83,13 @@ If an environment variable is not set, you can fallback to a default value.
 http:
  api_password: !env_var PASSWORD default_password
 ```
+
+### {% linkable_title Including Separate Files %}
+
+To improve readability, you can source out certain domains from your main configuration file with the `!include`-syntax.
+
+```yaml
+lights: !include lights.yaml
+```
+
+More information about this feature can also be found at [splitting configuration](/docs/configuration/splitting_configuration/).