Skip to content

Commit 14898ed

Browse files
committed
Merge branch 'current' into next
2 parents a38f45d + f02b077 commit 14898ed

23 files changed

+438
-58
lines changed

_config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ social:
127127

128128
# Home Assistant release details
129129
current_major_version: 0
130-
current_minor_version: 38
131-
current_patch_version: 4
132-
date_released: 2017-02-21
130+
current_minor_version: 39
131+
current_patch_version: 0
132+
date_released: 2017-02-25
133133

134134
# Either # or the anchor link to latest release notes in the blog post.
135135
# Must be prefixed with a # and have double quotes around it.
136-
patch_version_notes: "#release-0384---february-21"
136+
patch_version_notes: "#"

sass/custom/_paulus.scss

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
}
1919

2020
.material-card {
21-
// display: inline-block;
2221
background-color: #fefefe;
2322
border-radius: 2px;
2423
box-shadow: 0 2px 2px 0 rgba(0,0,0,0.14),0 1px 5px 0 rgba(0,0,0,0.12),0 3px 1px -2px rgba(0,0,0,0.2);
@@ -77,6 +76,33 @@
7776
}
7877
}
7978

79+
.shirt-promo {
80+
display: block;
81+
padding-top: 30%;
82+
background-image: url(/images/merchandise/shirt-frontpage.png);
83+
background-size: cover;
84+
background-position: center;
85+
text-decoration: none;
86+
87+
.caption {
88+
padding: 16px 12px 12px;
89+
background-color: rgba(0, 0, 0, .54);
90+
color: white;
91+
border-bottom-left-radius: 2px;
92+
border-bottom-right-radius: 2px;
93+
94+
.title {
95+
font-size: 20px;
96+
font-weight: 400;
97+
}
98+
99+
.subtitle {
100+
font-size: 12px;
101+
font-weight: initial;
102+
}
103+
}
104+
}
105+
80106
.supported-brands {
81107
text-align: center;
82108

source/_components/binary_sensor.enocean.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ha_release: 0.21
1313
ha_iot_class: "Local Push"
1414
---
1515

16-
This can typically be one of those batteryless wall switches. Currently only one type has been tested: Eltako FT55. Other devices will most likely not work without changing the Home Assistant code.
16+
This can typically be one of those batteryless wall switches. Currently only one type has been tested: Eltako FT55 which uses the EnOcean PTM 215 module. All switches using this module are expected to work. Other devices will most likely not work without changing the Home Assistant code.
1717

1818
To use your EnOcean device, you first have to set up your [EnOcean hub](/components/enocean/) and then add the following to your `configuration.yaml` file:
1919

source/_components/lock.nuki.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ha_iot_class: "Local Polling"
1616

1717
The `nuki` platform allows you to control [Nuki Smart Locks](https://nuki.io/en/smart-lock/) via either a [software bridge](https://play.google.com/store/apps/details?id=io.nuki.bridge) or a [physical bridge](https://nuki.io/en/bridge/).
1818

19-
To add a Nuki bridge to your installation, you need to enable developper mode on your bridge and define a port and an access token. This can be achieved using the [Android app](https://play.google.com/store/apps/details?id=io.nuki). Please note that the API token should be 6-20 characters long, even though the app allows you to set a longer one.
19+
To add a Nuki bridge to your installation, you need to enable developer mode on your bridge and define a port and an access token. This can be achieved using the [Android app](https://play.google.com/store/apps/details?id=io.nuki). Please note that the API token should be 6-20 characters long, even though the app allows you to set a longer one.
2020
Then add the following to your `configuration.yaml` file:
2121

2222
```yaml

source/_components/mqtt.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ha_iot_class: depends
1616

1717
MQTT (aka MQ Telemetry Transport) is a machine-to-machine or "Internet of Things" connectivity protocol on top of TCP/IP. It allows extremely lightweight publish/subscribe messaging transport.
1818

19-
Your first step to get MQTT and Home Assistant working is the choose a [broker](/docs/mqtt/broker).
19+
Your first step to get MQTT and Home Assistant working is to choose a [broker](/docs/mqtt/broker).
2020

2121
To integrate MQTT into Home Assistant, add the following section to your `configuration.yaml` file. Keep in mind that the minimal setup will run with [an embedded MQTT broker](/docs/mqtt/broker#embedded-broker):
2222

source/_components/sensor.broadlink.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ To enable it, add the following lines to your `configuration.yaml`:
1919

2020
```yaml
2121
# Example configuration.yaml entry
22-
switch:
22+
sensor:
2323
- platform: broadlink
2424
host: IP_ADDRESS
2525
mac: 'MAC_ADDRESS'
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
layout: page
3+
title: "Configuration.yaml by aneisch"
4+
description: ""
5+
date: 2017-2-23 20:27
6+
sidebar: true
7+
comments: false
8+
sharing: true
9+
footer: true
10+
ha_category: Example configuration.yaml
11+
ha_external_link: https://github.com/aneisch/home-assistant/
12+
---
13+

source/_cookbook/turn_on_light_for_10_minutes_when_motion_detected.markdown

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,23 @@ This recipe will turn on a light when there is motion and turn off the light whe
1616

1717
```yaml
1818
automation:
19-
alias: Turn on kitchen lights when there is movement
19+
- alias: Turn on kitchen light when there is movement
2020
trigger:
21-
- platform: state
22-
entity_id: sensor.motion_sensor
23-
to: 'on'
21+
platform: state
22+
entity_id: sensor.motion_sensor
23+
to: 'on'
2424
action:
2525
service: homeassistant.turn_on
26-
entity_id: script.timed_lamp
26+
entity_id: light.kitchen
2727

28-
script:
29-
timed_lamp:
30-
alias: "Turn on lamp and set timer"
31-
sequence:
32-
# Cancel ev. old timers
33-
- service: script.turn_off
34-
data:
35-
entity_id: script.timer_off
36-
- service: light.turn_on
37-
data:
38-
entity_id: light.kitchen
39-
# Set new timer
40-
- service: script.turn_on
41-
data:
42-
entity_id: script.timer_off
43-
44-
timer_off:
45-
alias: "Turn off lamp after 10 minutes"
46-
sequence:
47-
- delay:
48-
minutes: 10
49-
- service: light.turn_off
50-
data:
51-
entity_id: light.kitchen
28+
- alias: Turn off kitchen light 10 minutes after last movement
29+
trigger:
30+
platform: state
31+
entity_id: sensor.motion_sensor
32+
to: 'off'
33+
for:
34+
minutes: 10
35+
action:
36+
service: homeassistant.turn_off
37+
entity_id: light.kitchen_light
5238
```

source/_docs/automation.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ sharing: true
99
footer: true
1010
---
1111

12-
Home Assistant offers a wide range of automation configurations. In this section, we'll try to guide you through all the different possibilities and options. Besides this documentation, there are also a couple of people who have made their automations [publicly available][/cookbook/#example-configurationyaml].
12+
Home Assistant offers a wide range of automation configurations. In this section, we'll try to guide you through all the different possibilities and options. Besides this documentation, there are also a couple of people who have made their automations [publicly available](/cookbook/#example-configurationyaml).
1313

1414
### {% linkable_title Automation basics %}
1515

source/_docs/configuration/customizing-devices.markdown

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,13 @@ homeassistant:
3333
icon: mdi:kettle
3434
switch.rfxtrx_switch:
3535
assumed_state: false
36+
customize_domain:
37+
light:
38+
icon: mdi:home
39+
customize_glob:
40+
"light.kitchen_*":
41+
icon: mid:description
42+
3643
```
3744

3845
### {% linkable_title Possible values %}

0 commit comments

Comments
 (0)