Skip to content

Commit 810a0a7

Browse files
committed
Merge branch 'current' into next
2 parents 33f2a8c + a4af4d5 commit 810a0a7

File tree

15 files changed

+464
-254
lines changed

15 files changed

+464
-254
lines changed

credits_generator/README.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
credits_generator
2+
=================
3+
4+
This tool can be used to update the [Home Assistant's Credits page](https://home-assistant.io/developers/credits/).
5+
6+
```bash
7+
$ cd credits_generator
8+
$ npm install
9+
```
10+
11+
Set your personal GitHub access token as environmental variable.
12+
13+
```bash
14+
$ export GITHUB_TOKEN=<Your GitHub access token>
15+
```
16+
17+
Run the script.
18+
19+
```bash
20+
$ node update_credits.js
21+
```
22+
23+
Commit the changes (depending on our setup).
24+
25+
```bash
26+
$ git commit ../source/developers/credits.markdown
27+
$ git push upstream
28+
```
29+

credits_generator/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"scripts": {
77
"test": "echo \"Error: no test specified\" && exit 1"
88
},
9-
"author": "",
10-
"license": "MIT",
9+
"author": "Home Assistant Community",
10+
"license": "Apache 2.0",
1111
"dependencies": {
1212
"async": "^2.1.4",
1313
"github": "^8.1.0",

source/_components/alert.markdown

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ The `alert` component is designed to notify you when problematic issues arise. F
1616

1717
Alerts will add an entity to the front end only when they are firing. This entity allows you to silence an alert until it is resolved.
1818

19+
When using the `alert` component it is important that the timezone used for Home Assistant and the underlying operating system match. Failing to do so may result in multiple alerts being sent at the same time (such as when Home Assistant is set to the `America/Detroit` timezone but the operating system uses `UTC`).
20+
1921
### {% linkable_title Basic Example %}
2022

2123
The `alert` component makes use of any of the `notifications` components. To setup the `alert` component, first, you must setup a `notification` component. Then, add the following to your configuration file:
@@ -83,12 +85,12 @@ binary_sensor:
8385
8486
alert:
8587
motion_battery:
86-
- name: Motion Battery is Low
87-
entity_id: binary_sensor.motion_battery_low
88-
repeat: 30
89-
notifiers:
90-
- ryans_phone
91-
- kristens_phone
88+
name: Motion Battery is Low
89+
entity_id: binary_sensor.motion_battery_low
90+
repeat: 30
91+
notifiers:
92+
- ryans_phone
93+
- kristens_phone
9294
```
9395

9496
This example will begin firing as soon as the entity `sensor.motion`'s `battery` attribute falls below 15. It will continue to fire until the battery attribute raises above 15 or the alert is acknowledged on the frontend.

source/_components/fan.mqtt.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Configuration variables:
5353
- **payload_medium_speed** (*Optional*): The payload that represents the fan's medium speed.
5454
- **payload_high_speed** (*Optional*): The payload that represents the fan's high speed.
5555
- **speed_value_template** (*Optional*): Defines a [template](/topics/templating/) to extract a value from the speed payload.
56-
- **speeds** array (*Optional*): Valid entries for the list are `off`, `low`, `med`, and `high`.
56+
- **speeds** array (*Optional*): Valid entries for the list are `off`, `low`, `medium`, and `high`.
5757

5858
<p class='note warning'>
5959
Make sure that your topic is an exact match. `some-topic/` and `some-topic` are different topics.

source/_components/logger.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ data:
6868
homeassistant.components.media_player.yamaha: debug
6969
```
7070

71-
The log information are stored in the [configuration directory](/docs/configuration/) as `home-assistant.log` and you can read it with the command-line tool `cat` or follow it dynamicly with `tail -f`. If you are a Rasbian user then like the example below:
71+
The log information are stored in the [configuration directory](/docs/configuration/) as `home-assistant.log` and you can read it with the command-line tool `cat` or follow it dynamically with `tail -f`. If you are a Hassbian user you can use the example below:
7272

7373
```bash
74-
$ tail -f /home/pi/.homeassistant/home-assistant.log
74+
$ tail -f /home/homeassistant/.homeassistant/home-assistant.log
7575
```

source/_components/telegram_webhooks.markdown

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ telegram_webhooks:
6363

6464
### {% linkable_title Configuration samples %}
6565

66-
Telegram webhooks raise an event `telegram.command` with a payload.
66+
Telegram webhooks raise an event `telegram_command` with a payload.
6767

6868
```json
6969
{
70-
'command': '/thecommand'
71-
'args': 'strings after command'
72-
'user_id': 12345
70+
"command": "/thecommand",
71+
"args": "strings after command",
72+
"user_id": "12345"
7373
}
7474
```
7575

@@ -80,7 +80,7 @@ alias: 'telegram bot that reply pong to ping'
8080
hide_entity: true
8181
trigger:
8282
platform: event
83-
event_type: telegram.command
83+
event_type: telegram_command
8484
event_data:
8585
command: '/ping'
8686
action:
@@ -94,7 +94,7 @@ Example that show keyboard interaction with `notify.telegram`
9494
```yaml
9595
trigger:
9696
platform: event
97-
event_type: telegram.command
97+
event_type: telegram_command
9898
event_data:
9999
command: '/start'
100100
action:
@@ -112,7 +112,7 @@ and an automation to trigger a related command "/siren".
112112
```yaml
113113
trigger:
114114
platform: event
115-
event_type: telegram.command
115+
event_type: telegram_command
116116
event_data:
117117
command: '/siren'
118118
action:

source/_docs/ecosystem/ios/integration.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ Query parameters are passed as a dictionary in the call.
1818
Example: `homeassistant://call_service/device_tracker.see?entity_id=device_tracker.entity`
1919

2020
## Fire event
21+
You can create an [event trigger](https://home-assistant.io/docs/automation/trigger/#event-trigger) and fire the event.
2122

22-
Example `homeassistant://fire_event/custom_event?entity_id=device_tracker.entity`
23+
Example: `homeassistant://fire_event/custom_event?entity_id=MY_CUSTOM_EVENT`
2324

2425
## Send one shot location
25-
2626
Example: `homeassistant://send_location/`

source/_docs/hassbian/installation.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ The easiest way to install Home Assistant on your Raspberry Pi is by using HASSb
1717
3. Ensure your Raspberry Pi has access to the internet.
1818
4. Insert SD card to Raspberry Pi and turn it on. Initial installation of Home Assistant will take about 5 minutes.
1919

20-
These instructions are also available as a [video](https://www.youtube.com/watch?v=iIz6XqDwHEk). And additioning info is available in this [video](https://www.youtube.com/watch?v=tCGlQSsQ-Mc).
20+
These instructions are also available as a [video](https://www.youtube.com/watch?v=iIz6XqDwHEk). Additional information is available in this [video](https://www.youtube.com/watch?v=tCGlQSsQ-Mc).
2121

2222
After initial boot, you can reach Home Assistant in your browser at [http://hassbian.local:8123]. If you want to login via SSH, the default username is `pi` and password is `raspberry` (please change this by running `passwd`). The Home Assistant configuration is located at `/home/homeassistant/.homeassistant/`.
2323

source/_docs/installation/raspberry-pi-all-in-one.markdown

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,6 @@ To upgrade the All-In-One setup manually:
7474
* Type `exit` to logout the hass user and return to the `pi` user.
7575
</div>
7676

77-
To upgrade with fabric:
78-
79-
* Login to Raspberry Pi `ssh pi@your_raspberry_pi_ip`
80-
* Change to `cd ~/fabric-home-assistant`
81-
* Run `fab upgrade_homeassistant`
82-
8377
After upgrading, you can restart Home Assistant a few different ways:
8478

8579
* Restarting the Raspberry Pi `sudo reboot`

source/_docs/mqtt/discovery.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ A motion detection device which can be represented by a [binary sensor](/compone
5454
- State topic: `homeassistant/binary_sensor/garden/state`
5555
- Payload: `{"name": "garden", "device_class": "motion"}`
5656

57-
To create a new sensor manually. For more details please refer to the [MQTT testing section](/component/mqtt_testing).
57+
To create a new sensor manually. For more details please refer to the [MQTT testing section](/docs/mqtt/testing/).
5858

5959
```bash
6060
$ mosquitto_pub -h 127.0.0.1 -p 1883 -t "homeassistant/binary_sensor/garden/config" -m '{"name": "garden", "device_class": "motion"}'

0 commit comments

Comments
 (0)