Skip to content

Commit 1af9062

Browse files
robbiet480robbiet480
committed
Merge branch 'current' into next
2 parents c937242 + 4d2de0d commit 1af9062

20 files changed

+186
-69
lines changed

‎_config.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,3 +123,7 @@ social:
123123

124124
twitter:
125125
account: home_assistant
126+
127+
current_major_version: 0
128+
current_minor_version: 31
129+
current_patch_version: 1

‎sass/custom/_paulus.scss

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,14 @@ p.note {
398398
margin: 12px 0;
399399
}
400400

401+
.added_in_current_version {
402+
margin-top: 12px;
403+
}
404+
405+
.added_two_versions_ago {
406+
margin-bottom: 12px;
407+
}
408+
401409
.btn {
402410
display: block;
403411
background: 0;
@@ -472,4 +480,4 @@ a code {
472480
twitterwidget {
473481
margin-left: auto;
474482
margin-right: auto;
475-
}
483+
}

‎source/_components/climate.netatmo.markdown

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
layout: page
33
title: "Netatmo Thermostat"
44
description: "Instructions how to integrate Netatmo thermostat into Home Assistant."
5-
date: 2016-11-10 08:10
5+
date: 2016-10-11 08:10
66
sidebar: true
77
comments: false
88
sharing: true
@@ -12,27 +12,24 @@ ha_category: Climate
1212
ha_release: 0.31
1313
---
1414

15-
### {% linkable_title Basic Configuration %}
1615

1716
The `netatmo` thermostat platform is consuming the information provided by a [Netatmo Smart Thermostat](https://www.netatmo.com/product/energy/thermostat) thermostat. This component allows you to view the current temperature and setpoint.
1817

1918
To enable the Netatmo thermostat, you first have to set up [netatmo](/components/netatmo/), this will use discovery to add your thermostat.
2019

21-
### {% linkable_title Basic Configuration %}
22-
2320
If you want to select a specific thermostat, set discovery to False for [netatmo](/components/netatmo/) and add the following lines to your `configuration.yaml`:
2421

2522
```yaml
2623
# Example configuration.yaml entry
2724
climate:
28-
platform: netatmo
25+
- platform: netatmo
2926
```
3027
3128
Configuration variables:
3229
3330
- **relay** (*Optional*): Will display the thermostats of this relay only.
3431
- **thermostat** array (*Optional*): Thermostat to use.
35-
- **thermostat_name**: Name of the thermostat to display.
32+
- **thermostat_name**: Name of the thermostat to display.
3633
3734
If **relay** and **thermostat** are not provided, all thermostats will be displayed.
3835

‎source/_components/device_tracker.asuswrt.markdown

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ ha_release: pre 0.7
1515

1616
The `asuswrt` platform offers presence detection by looking at connected devices to a [ASUSWRT](http://event.asus.com/2013/nw/ASUSWRT/) based router.
1717

18+
<p class='note warning'>
19+
This platform is **NOT** available for [Microsoft Windows installations](http://pexpect.readthedocs.io/en/stable/overview.html#pexpect-on-windows).
20+
</p>
21+
1822
To use an ASUSWRT router in your installation, add the following to your `configuration.yaml` file:
1923

2024
```yaml

‎source/_components/history.markdown

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ comments: false
88
sharing: true
99
footer: true
1010
logo: home-assistant.png
11-
ha_category: "History"
11+
ha_category: History
1212
ha_release: pre 0.7
1313
---
1414

@@ -44,7 +44,8 @@ Configuration variables:
4444
4545
Without any `include` or `exclude` configuration the history displays graphs for every entity (well that's not exactly true - for instance `hidden` entities or `scenes` are never shown) on a given date. If you are only interested in some of the entities you several options:
4646

47-
- Define domains and entities to `exclude` (aka. blacklist). This is convenient when you are basically happy with the information displayed, but just want to remove some entities or domains. Usually these are entities/domains which do not change (like `weblink`) or rarely change (`updater` or `automation`).
47+
Define domains and entities to `exclude` (aka. blacklist). This is convenient when you are basically happy with the information displayed, but just want to remove some entities or domains. Usually these are entities/domains which do not change (like `weblink`) or rarely change (`updater` or `automation`).
48+
4849
```yaml
4950
# Example configuration.yaml entry with exclude
5051
history:
@@ -57,7 +58,9 @@ history:
5758
- sensor.last_boot
5859
- sensor.date
5960
```
60-
- Define domains and entities to display by using the `include` configuration (aka. whitelist). If you have a lot of entities in your system and your `exclude` lists possibly get very large, it might be better just to define the entities or domains to display.
61+
62+
Define domains and entities to display by using the `include` configuration (aka. whitelist). If you have a lot of entities in your system and your `exclude` lists possibly get very large, it might be better just to define the entities or domains to display.
63+
6164
```yaml
6265
# Example configuration.yaml entry with include
6366
history:
@@ -67,7 +70,9 @@ history:
6770
- switch
6871
- media_player
6972
```
70-
- Use the `include` list to define the domains/entities to display, and exclude some of them with in the `exclude` list. This makes sense if you for instance include the `sensor` domain, but want to exclude some specific sensors. Instead of adding every sensor entity to the `include` `entities` list just include the `sensor` domain and exclude the sensor entities you are not interested in.
73+
74+
Use the `include` list to define the domains/entities to display, and exclude some of them with in the `exclude` list. This makes sense if you for instance include the `sensor` domain, but want to exclude some specific sensors. Instead of adding every sensor entity to the `include` `entities` list just include the `sensor` domain and exclude the sensor entities you are not interested in.
75+
7176
```yaml
7277
# Example configuration.yaml entry with include and exclude
7378
history:
@@ -84,7 +89,7 @@ history:
8489

8590
#### {% linkable_title Implementation details %}
8691

87-
The history is stored in a SQLite database `home-assistant.db` within your config directory.
92+
The history is stored in a SQLite database `home-assistant_v2.db` within your configuration directory.
8893

8994
- events table is all events except `time_changed` that happened while recorder component was running.
9095
- states table contains all the `new_state` values of `state_changed` events.
@@ -96,7 +101,7 @@ The history is stored in a SQLite database `home-assistant.db` within your confi
96101
- `last_updated`: timestamp anything has changed (state, attributes)
97102
- `created`: timestamp this entry was inserted into the database
98103

99-
When the history component queries the states table it only selects states where the state has changed: `WHERE last_changed=last_updated`
104+
When the `history` component queries the states table it only selects states where the state has changed: `WHERE last_changed=last_updated`
100105

101106
#### {% linkable_title On dates %}
102107

‎source/_components/notify.nma.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ha_release: pre 0.7
1515

1616
The `nma` platform uses [Notify My Android (NMA)](http://www.notifymyandroid.com/) to delivery notifications from Home Assistant to your Android device.
1717

18-
Go to the [NMA website](https://www.notifymyandroid.com) and create a new API key. If you are using the trial offer then keep in mind that your limit is five (5) message per day.
18+
Go to the [NMA website](https://www.notifymyandroid.com) and create a new API key. If you are using the trial offer then keep in mind that your limit is five messages per day.
1919

2020
To add NMA to your installation, add the following to your `configuration.yaml` file:
2121

‎source/_components/sensor.tellstick.markdown

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,4 @@ sensor:
4545
only_named: True
4646
temperature_scale: "°C"
4747
datatype_mask: 1
48+
```

‎source/_cookbook/automation_sun.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Solar elevation automations can cope with offsets from sunset / sunrise as the s
8989
trigger:
9090
platform: numeric_state
9191
entity_id: sun.sun
92-
value_template: '{% raw %}{{ state.attributes.elevation }}{% end raw %}'
92+
value_template: '{% raw %}{{ state.attributes.elevation }}{% endraw %}'
9393
below: 1.5
9494
action:
9595
service: scene.turn_on

‎source/_posts/2016-09-29-async-sleepiq-emoncms-stocks.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,17 @@ Since 0.28 [automation rules](/blog/2016/09/10/notify-group-reload-api-pihole/#r
8383

8484
### {% linkable_title Hotfix 0.29.4 - September 30 %}
8585

86-
- Alexa config fix ([@baloob], reported by [@lwis])
86+
- Alexa config fix ([@balloob], reported by [@lwis])
8787
- Envisalink discovery fix ([@cinntax])
8888
- Acer Projector config fix ([@pvizeli])
8989

9090
### {% linkable_title Hotfix 0.29.5 - September 30 %}
9191

92-
- Fix Climate Nest platform (@tchellomello, @jawilson)
92+
- Fix Climate Nest platform ([@tchellomello], [@jawilson])
9393

9494
### {% linkable_title Hotfix 0.29.6 - October 1 %}
9595

96-
- Fix segmentation fault ([@bbangert], fixes #3453) 🎉
96+
- Fix segmentation fault ([@bbangert]) 🎉
9797
- Fix nested templates in `data_template` would incorrectly get cached ([@balloob])
9898

9999
### {% linkable_title Hotfix 0.29.7 - October 5 %}

‎source/_posts/2016-10-08-hassbian-rest-digital-ocean.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ As the results are processed on-the-fly you still need to use the data from your
4040

4141
### {% linkable_title REST! We don't... %}
4242

43-
There was a lot of work done on our implementation which are working with RESTful APIs. [@w1ll1am23] extended the [aREST] platforms to display if an aREST unit is available or not. The aREST is now covered by the configuration check as well. Please check the Breaking changes section for more details.
43+
There was a lot of work done on our implementation which are working with RESTful APIs. [@w1ll1am23] extended the [aREST] platforms to display if an aREST unit is available or not. The aREST implementations are now covered by the configuration check as well. Please check the Breaking changes section for more details.
4444

45-
The [REST sensor][rest-sensor] supports now HTTP authentication (basic and digest) and custom header. This will allow you to access resources which are protected. This sample sensor will access GitHub and retrieve the latest release number while by-passing the rate limit for non-authenticated requests.
45+
The [REST sensor][rest-sensor] supports now HTTP authentication (basic and digest) and custom headers. This will allow you to access resources which are protected. This sample sensor will access GitHub and retrieve the latest release number while by-passing the rate limit for non-authenticated requests.
4646

4747
```yaml
4848
sensor

0 commit comments

Comments
 (0)