diff --git a/source/components/index.markdown b/source/components/index.markdown index 184a2670b5e..2732a2755dd 100644 --- a/source/components/index.markdown +++ b/source/components/index.markdown @@ -31,7 +31,7 @@ Entities are things that you want to observe within Home Assistant. Support for SABnzbd clients - Monitor queue and download speeds + Monitor queue and download speeds. @@ -103,7 +103,7 @@ Entities are things that you want to observe within Home Assistant. Support for Google Cast devices - Track what is being played and control playback. (temporarely disabled awaiting protobuf 3 release) + Track what is being played and control playback. (temporarely disabled awaiting protobuf 3 release). @@ -177,37 +177,37 @@ the manufacturers of these devices. Notify My Android (NMA) -Allow sending messages using Notify My Android (NMA) +Allow sending messages using Notify My Android (NMA). Instapush -Allow sending messages using Instapush +Allow sending messages using Instapush. PushBullet -Allow sending messages using PushBullet +Allow sending messages using PushBullet. PushOver -Allow sending messages using PushOver +Allow sending messages using PushOver. Jabber (XMPP) -Allow sending messages using Jabber (XMPP) +Allow sending messages using Jabber (XMPP). Browser -Open URLs on the host machine +Open URLs on the host machine. @@ -219,19 +219,22 @@ the manufacturers of these devices. Keyboard -Simulate key presses on the host machine +Simulate key presses on the host machine. OpenWeatherMap Display current meteorological data from your location. +<<<<<<< HEAD Bitcoin Display details about the Bitcoin Network and your Blockchain.info online wallet. +======= +>>>>>>> f9261e70a652b2bcd1f852f2cdc93ad21184e594 diff --git a/source/components/notify.instapush.markdown b/source/components/notify.instapush.markdown index 3f319f84201..5943675fdd2 100644 --- a/source/components/notify.instapush.markdown +++ b/source/components/notify.instapush.markdown @@ -1,6 +1,6 @@ --- layout: page -title: "Instapush otification support" +title: "Instapush notification support" description: "Instructions how to add Instapush notifications to Home Assistant." date: 2015-05-01 18:00 sidebar: false diff --git a/source/components/notify.pushover.markdown b/source/components/notify.pushover.markdown index 43615c38d30..d1afe9a2334 100644 --- a/source/components/notify.pushover.markdown +++ b/source/components/notify.pushover.markdown @@ -10,7 +10,7 @@ footer: true --- -James Cole has contributed support for the PushOver service as a platform for the notify component. This allows components to send messages to the user using PushOver. +James Cole has contributed support for the [PushOver service](https://pushover.net/) as a platform for the notify component. This allows components to send messages to the user using PushOver. ```yaml # Example configuration.yaml entry diff --git a/source/components/notify.xmpp.markdown b/source/components/notify.xmpp.markdown index 5d0cb377d71..cb709cbdb5a 100644 --- a/source/components/notify.xmpp.markdown +++ b/source/components/notify.xmpp.markdown @@ -10,7 +10,7 @@ footer: true --- -The xmpp platform allows you to deliver notifications from Home Assistant to a Jabber (XMPP) account. +The xmpp platform allows you to deliver notifications from Home Assistant to a [Jabber (XMPP)](http://xmpp.org) account. ```yaml # Example configuration.yaml entry diff --git a/source/components/sensor.sabnzbd.markdown b/source/components/sensor.sabnzbd.markdown index fc7911c3dbd..fb8fe07e932 100644 --- a/source/components/sensor.sabnzbd.markdown +++ b/source/components/sensor.sabnzbd.markdown @@ -10,7 +10,7 @@ footer: true --- -James Cole has contributed support to integrate SABnzbd. This will allow you to monitor your downloads from within Home Assistant and setup automation based on the information. +James Cole has contributed support to integrate [SABnzbd](http://sabnzbd.org). This will allow you to monitor your downloads from within Home Assistant and setup automation based on the information. ```yaml # Example configuration.yaml entry diff --git a/source/developers/add_new_platform.markdown b/source/developers/add_new_platform.markdown index c7e3ebbbabe..db473d06af7 100644 --- a/source/developers/add_new_platform.markdown +++ b/source/developers/add_new_platform.markdown @@ -80,9 +80,9 @@ This abstract class contains logic for integrating most standard features into your entities, such as visibility, entity IDs, updates, and many more. That is why it is best practice to reference the existing class. -A list of entities can be registered with Home Assitant using the *add_devices* +A list of entities can be registered with Home Assistant using the *add_devices* function that is provided as an input to *setup_platform*. Once entities are registered with with Home Assistant their updates will be provided to the core -and the core will have control over them. For more information on how Entites +and the core will have control over them. For more information on how Entities can be customized, take a look at the [Entity Abstract Class](https://github.com/balloob/home-assistant/blob/master/homeassistant/helpers/entity.py#L18). diff --git a/source/developers/architecture.markdown b/source/developers/architecture.markdown index cf3393957df..74547416884 100644 --- a/source/developers/architecture.markdown +++ b/source/developers/architecture.markdown @@ -58,13 +58,13 @@ For example the `device_sun_light_trigger` component tracks the state of devices If the sun has set and the lights are not on: Turn on the lights - + In the event that the combined state of all tracked devices changes to 'Not Home': If the lights are on: Turn off the lights - + In the event of the sun setting: If the lights are off and the combined state of all tracked device equals 'Home': @@ -74,7 +74,7 @@ Another example of a home automation component can be found in [`/config/custom_ ### {% linkable_title The full picture %} -When we put all the different pieces of Home Assistant together we see that we match pretty close to the initial sketched home automation overview. The smart home AI is not implemented yet and therefor ommitted from the following picture. +When we put all the different pieces of Home Assistant together we see that we match pretty close to the initial sketched home automation overview. The smart home AI is not implemented yet and therefor omitted from the following picture.

@@ -118,4 +118,4 @@ hass.block_till_stopped()

Because each slave maintains its own ServiceRegistry it is possible to have multiple slaves respond to one service call. -

\ No newline at end of file +

diff --git a/source/developers/creating_components.markdown b/source/developers/creating_components.markdown index a260adf2fd9..70620e861b3 100644 --- a/source/developers/creating_components.markdown +++ b/source/developers/creating_components.markdown @@ -56,7 +56,7 @@ The Home Assistant object contains three objects to help you interact with the s | Object | Description | | ------ | ----------- | -| hass.states | This is the StateMachine. It allows you to set states and trach when they are changed. [See available methods](https://github.com/balloob/home-assistant/blob/master/homeassistant/__init__.py#L473). | +| hass.states | This is the StateMachine. It allows you to set states and track when they are changed. [See available methods](https://github.com/balloob/home-assistant/blob/master/homeassistant/__init__.py#L473). | | hass.events | This is the EventBus. It allows you to trigger and listen for events.
[See available methods](https://github.com/balloob/home-assistant/blob/master/homeassistant/__init__.py#L308). | | hass.services | This is the ServiceRegistry. It allows you to register services.
[See available methods](https://github.com/balloob/home-assistant/blob/master/homeassistant/__init__.py#L589). |