jeena/home-assistant.github.io
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge branch 'master' into next

Browse source 
Conflicts:
	source/_cookbook/custom_panel_using_react.markdown
This commit is contained in:
Paulus Schoutsen 2016-08-13 10:29:41 -07:00
commit 1957efefb8
74 changed files with 845 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/_topics/secrets.markdown
View file

@ -13,9 +13,9 @@ The `configuration.yaml` file a plain-text file thus it is readable for everyone
### {% linkable_title Using secrets.yaml %}
The workflow for the outsourcing in the `secrets.yaml` are very similar to the [splitting of the configuration](/topics/splitting_configuration/). Create a `secrets.yaml` file in your Home assistant configuration directory (The location of the folder differs between operating systems: on OS X and Linux it's `~/.homeassistant` and on Windows it's `%APPDATA%/.homeassistant`).
The workflow for the outsourcing in the `secrets.yaml` is very similar to the [splitting of the configuration](/topics/splitting_configuration/). Create a `secrets.yaml` file in your Home assistant configuration directory (The location of the folder differs between operating systems: on OS X and Linux it's `~/.homeassistant` and on Windows it's `%APPDATA%/.homeassistant`).
The entries for password and API keys in the `configuration.yaml` file usally looks like the example below.
The entries for password and API keys in the `configuration.yaml` file usually looks like the example below.
```yaml
http:
@ -29,7 +29,7 @@ http:
api_password: !secret http_password
```
The `secrets.yaml` files stored the corresponding password assigned to the identifier.
The `secrets.yaml` file contains the corresponding password assigned to the identifier.
```yaml
logger: debug
@ -44,7 +44,7 @@ Using [Keyring](http://pythonhosted.org/keyring/) is an alternative way to `secr
$ pip3 install keyring
```
Replaced your password or API key with `!secret` and an identifier in `configuration.yaml` file.
Replace your password or API key with `!secret` and an identifier in `configuration.yaml` file.
```yaml
http:

2
source/_topics/state_object.markdown
View file

@ -37,3 +37,5 @@ Attribute | Description
`entity_picture` | Url to a picture that should be used instead of showing the domain icon. Example: `http://example.com/picture.jpg`.
`assumed_state` | Boolean if the current state is an assumption. [More info](https://home-assistant.io/blog/2016/02/12/classifying-the-internet-of-things/#classifiers) Example: `True`.
`unit_of_measurement` | The unit of measurement the state is expressed in. Used for grouping graphs or understanding the entity. Example: `°C`.
When an attribute contains spaces, you can retrieve it like this: `states.sensor.livingroom.attributes["Battery numeric"]`.