diff --git a/Gemfile.lock b/Gemfile.lock index 07bd57242ff..7ed38f2bc86 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -68,7 +68,7 @@ GEM rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.4.0) - mini_portile2 (2.8.1) + mini_portile2 (2.8.2) multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) diff --git a/source/_data/glossary.yml b/source/_data/glossary.yml index 8644abce8d0..ca527351d30 100644 --- a/source/_data/glossary.yml +++ b/source/_data/glossary.yml @@ -146,11 +146,15 @@ link: /docs/configuration/state_object/ excerpt: > An entity represents a sensor, actor, or function in Home Assistant. Entities are used to monitor physical properties or to control other entities. An entity is usually part of a device or a service. + aliases: + - entities - term: Event definition: >- An event is when something happens. link: /docs/configuration/events/ + aliases: + - events - term: Frontend definition: >- @@ -279,6 +283,8 @@ Scripts are components that allow users to specify a sequence of actions to be executed by Home Assistant when turned on. link: /docs/scripts/ + aliases: + - scripts - term: Sensor definition: >- diff --git a/source/_docs/automation/basics.markdown b/source/_docs/automation/basics.markdown index e49a1655874..3d8b4e346a9 100644 --- a/source/_docs/automation/basics.markdown +++ b/source/_docs/automation/basics.markdown @@ -3,7 +3,7 @@ title: "Understanding Automations" description: "A breakdown of what an automation consists of." --- -All automations are made up of a trigger and an action. Optionally combined with a condition. Take for example the automation: +All {% term automations %} are made up of a {% term trigger %} and an {% term action %}. Optionally combined with a {% term condition %}. Take for example the automation: > When Paulus arrives home and it is after sunset: Turn the lights on in the living room. @@ -15,7 +15,7 @@ We can break up this automation into the following three parts: (action) Turn the lights on in the living room ``` -The first part is the [trigger](/docs/automation/trigger/) of the automation rule. Triggers describe events that should trigger the automation rule. In this case, it is a person arriving home, which can be observed in Home Assistant by observing the state of Paulus changing from `not_home` to `home`. +The first part is the [trigger](/docs/automation/trigger/) of the automation rule. Triggers describe {% term events %} that should trigger the automation rule. In this case, it is a person arriving home, which can be observed in Home Assistant using {% term devices %}/{% term sensors %} by observing the state of Paulus changing from `not_home` to `home`. The second part is the [condition](/docs/automation/condition/). Conditions are optional tests that can limit an automation rule to only work in your specific use cases. A condition will test against the current state of the system. This includes the current time, devices, people and other things like the sun. In this case, we only want to act when the sun has set. @@ -27,7 +27,7 @@ The difference between a condition and a trigger can be confusing as they are ve ## Exploring the internal state -Automation rules interact directly with the internal state of Home Assistant, so you'll need to familiarize yourself with it. Home Assistant exposes its current state via the developer tools. These are available at the bottom of the sidebar in the frontend. **{% my developer_states title="Developer Tools -> States" %}** will show all currently available states. An entity can be anything. A light, a switch, a person and even the sun. A state consists of the following parts: +Automation rules interact directly with the internal state of Home Assistant, so you'll need to familiarize yourself with it. Home Assistant exposes its current state via the developer tools. These are available at the bottom of the sidebar in the frontend. **{% my developer_states title="Developer Tools > States" %}** will show all currently available states. An entity can be anything. A light, a switch, a person and even the sun. A state consists of the following parts: | Name | Description | Example | | ---- | ----- | ---- | @@ -37,7 +37,7 @@ Automation rules interact directly with the internal state of Home Assistant, so State changes can be used as the source of triggers and the current state can be used in conditions. -Actions are all about calling *services*. To explore the available *services* open the **{% my developer_services title="Developer Tools -> Services" %}**. *Services* allow changing anything. For example turn on a light, run a script or enable a scene. Each *service* has a domain and a name. For example the *service* {% my developer_call_service service="light.turn_on" %} is capable of turning on any light in your system. Parameters can be passed to a *service* to indicate, for example, which device to activate or which color to use. +Actions are all about calling *services*. To explore the available *services* open the **{% my developer_services title="Developer Tools > Services" %}**. *Services* allow changing anything. For example turn on a light, run a script or enable a scene. Each *service* has a domain and a name. For example the *service* {% my developer_call_service service="light.turn_on" %} is capable of turning on any light in your system. Parameters can be passed to a *service* to indicate, for example, which device to activate or which color to use. ## Creating automations diff --git a/source/_docs/energy/individual-devices.markdown b/source/_docs/energy/individual-devices.markdown index 64cd33147ed..1e0f1751968 100644 --- a/source/_docs/energy/individual-devices.markdown +++ b/source/_docs/energy/individual-devices.markdown @@ -17,17 +17,8 @@ Depending on what protocols you use at home, you can use Zigbee, Z-Wave or Wi-Fi Smart relays sit behind your "normal" switches and make them smart. It allows you to control the devices via Home Assistant and via the connected buttons/switches. -{% comment %} -We recommend the Shelly brand because they have a local API that updates Home Assistant as soon as something happens and it has a high quality integration: - -- [Shelly 1PM](https://shop.shelly.cloud/shelly-1pm-wifi-smart-home-automation-1?tracking=A7FsiPIfUWsFpnfKHa8SRyUYLXjr2hPq) -- [Shelly 2.5](https://shop.shelly.cloud/shelly-2.5-ce-ul-wifi-smart-home-automation?tracking=A7FsiPIfUWsFpnfKHa8SRyUYLXjr2hPq) - {% endcomment %} - ## Devices with power (W) sensors Some smart devices, such as air conditioning, boilers, and others, may provide a power sensor, measured in Watts. You can use the [Integration (Riemann sum integral) integration](/integrations/integration/#energy) to calculate the energy your device is using. You can then use the energy sensor in the Energy Dashboard, as individual devices. Graphic showing energy flowing from the home to individual devices. - -_Disclaimer: Some links on this page are affiliate links._ diff --git a/source/_docs/scene/editor.markdown b/source/_docs/scene/editor.markdown index 06d2f3eb431..931110b9998 100644 --- a/source/_docs/scene/editor.markdown +++ b/source/_docs/scene/editor.markdown @@ -3,23 +3,27 @@ title: "Scenes Editor" description: "Instructions on how to use the scenes editor." --- -In Home Assistant 0.102 we introduced the first version of our scene editor. If you just created a new configuration with Home Assistant, then you're all set! Go to the UI and enjoy. - From the UI choose **Settings** which is located in the sidebar, then click on **Automations & Scenes** to go to the scene editor. Press the **Add Scene** button in the lower right corner to get started. Choose a meaningful name for your scene. -

- -

+![Scene editor](/images/docs/scenes/editor.png) -Select all the devices (or entities when advanced mode is enabled on your user profile) you want to include in your scene. +Select all the {% term devices %} (or {% term entities %} when advanced mode is enabled on your user profile) you want to include in your scene. The state of your devices will be saved, so it can be restored when you are finished creating your scene. Set the state of the devices to how you want them to be in your scene, this can be done by clicking on it and edit the state from the popup, or any other method that changes the state. On the moment you save the scene, all the states of your devices are stored in the scene. When you leave the editor the states of the devices are restored to the state from before you started editing. The menu on the top-right has options to **Duplicate scene** and **Delete scene**. +A scene can be called in {% term automation %} action and {% term scripts %} using a turn on scene {% term service %}: + +```yaml +service: scene.turn_on +target: + entity_id: scene.my_unique_id +``` + ## Updating your configuration to use the editor First, check that you have activated the configuration editor. diff --git a/source/_integrations/emulated_hue.markdown b/source/_integrations/emulated_hue.markdown index 8eba0b47a87..4e71e45bb56 100644 --- a/source/_integrations/emulated_hue.markdown +++ b/source/_integrations/emulated_hue.markdown @@ -15,7 +15,7 @@ ha_codeowners:
-Be aware that `emulated_hue` doesn't work for new users of **Google Home** with `emulated_hue`. If you've not previously set this up and had it working, use the [Google Assistant component](/integrations/google_assistant/) or [Nabu Casa cloud](/integrations/cloud) component. +Be aware that `emulated_hue` doesn't work for new users of **Google Home** with `emulated_hue`. If you've not previously set this up and had it working, use the [Google Assistant](/integrations/google_assistant/) integration or [Nabu Casa cloud](/integrations/cloud) integration.
@@ -41,13 +41,13 @@ If you added or upgraded to a newer Alexa device and devices are not found, you
-[Sleep Cycle](https://www.sleepcycle.com) and [Sleep as Android](https://sleep.urbandroid.org): smart alarm clock app can use emulated_hue to turn on and off entities. Sleep Cycle only has it implemented in the iOS app, see [Sleep Cycle support](https://support.sleepcycle.com/hc/en-us/articles/207670385-Does-Sleep-Cycle-integrates-with-Phillips-Hue-). The app requires the same configuration as Google Home and does not work if the type is defined as Alexa in the configuration. +[Sleep Cycle](https://www.sleepcycle.com) and [Sleep as Android](https://sleep.urbandroid.org): smart alarm clock app can use emulated_hue to turn on and off entities. Sleep Cycle only has it implemented in the iOS app, see [Sleep Cycle support](https://support.sleepcycle.com/hc/articles/207670385-Does-Sleep-Cycle-integrates-with-Phillips-Hue-). The app requires the same configuration as Google Home and does not work if the type is defined as Alexa in the configuration.
-Logitech Harmony remotes cannot connect to this emulator via Android and iOS mobile applications because they require the physical button on the hub to be pressed. The [MyHarmony desktop software](https://support.myharmony.com/en-us/download) must be used with the original cable to connect it, then "Scan for Devices". +Logitech Harmony remotes cannot connect to this emulator via Android and iOS mobile applications because they require the physical button on the hub to be pressed. The [MyHarmony desktop software](https://support.myharmony.com/download) must be used with the original cable to connect it, then "Scan for Devices".
@@ -174,7 +174,7 @@ On Linux systems (Ubuntu, Debian, etc) execute the following command to allow `e sudo setcap 'cap_net_bind_service=+ep' /srv/homeassistant/homeassistant_venv/bin/python3 ``` -Please note that your path may be different depending on your installation method. For example, if you followed the [Virtualenv instructions](/docs/installation/virtualenv/), your path will be `/srv/homeassistant/bin/python3`. +Please note that your path may be different depending on your installation method. For example, if you followed the [Virtualenv instructions](/installation/linux/), your path will be `/srv/homeassistant/bin/python3`. ### License diff --git a/source/_integrations/enocean.markdown b/source/_integrations/enocean.markdown index 4759fecf7f7..16b1d0a8cbe 100644 --- a/source/_integrations/enocean.markdown +++ b/source/_integrations/enocean.markdown @@ -24,7 +24,7 @@ ha_integration_type: integration The [EnOcean](https://en.wikipedia.org/wiki/EnOcean) standard is supported by many different vendors. There are switches and sensors of many different kinds, and typically they employ energy harvesting to get power such that no batteries are necessary. -The EnOcean integration adds support for some of these devices. You will need a controller like the [USB300](https://www.enocean.com/en/enocean_modules/usb-300/) in order for it to work. +The EnOcean integration adds support for some of these devices. You will need a controller like the [USB300](https://www.enocean.com/product/usb-300/) in order for it to work. There is currently support for the following device types within Home Assistant: @@ -44,7 +44,7 @@ The following devices have been confirmed to work out of the box: - EnOcean STM-330 temperature sensor - Hoppe SecuSignal window handle from Somfy -If you own a device not listed here, please check whether your device can talk in one of the listed [EnOcean Equipment Profiles](https://www.enocean-alliance.org/what-is-enocean/specifications/) (EEP). If it does, it will most likely work. The available profiles are usually listed somewhere in the device manual. +If you own a device not listed here, please check whether your device can talk in one of the listed [EnOcean Equipment Profiles](https://www.enocean-alliance.org/specifications/) (EEP). If it does, it will most likely work. The available profiles are usually listed somewhere in the device manual. Support for tech-in messages is not implemented. @@ -58,10 +58,10 @@ This can typically be one of those batteryless wall switches. Tested with: - Eltako FT55 which uses the EnOcean PTM 215 module -- [TRIO2SYS Wall switches](https://www.trio2sys.fr/index.php/fr/produits-enocean-sans-fil-sans-pile-interoperable/emetteur-sans-fils-sans-pile-interoperable-enocean) which uses the EnOcean PTM210 DB module +- [TRIO2SYS Wall switches](https://www.trio2sys.fr/index.php/produits-enocean-sans-fil-sans-pile-interoperable/emetteur-sans-fils-sans-pile-interoperable-enocean) which uses the EnOcean PTM210 DB module - Omnio WS-CH-102 -The following [EnOcean Equipment Profiles](https://www.enocean-alliance.org/what-is-enocean/specifications/) are supported: +The following [EnOcean Equipment Profiles](https://www.enocean-alliance.org/specifications/) are supported: - F6-02-01 (Light and Blind Control - Application Style 2) - F6-02-02 (Light and Blind Control - Application Style 1) @@ -107,7 +107,7 @@ Sample automation to switch lights on and off: ```yaml # Example automation to turn lights on/off on button release automation: - - alias: "hall light switches" + - alias: "Hall light switches" trigger: platform: event event_type: button_pressed @@ -122,7 +122,7 @@ automation: {% endraw %} -You can find the `event_data` `id` by going to "Developer Tools" -> "Events" and listening to “button_pressed” events. Then hit a button on the device and you should see an event. +You can find the `event_data` `id` by going to {% my developer_events title="Developer Tools -> Events" %} and listening to “button_pressed” events. Then hit a button on the device and you should see an event. ## Light @@ -207,7 +207,7 @@ sensor: ### Humidity sensor -The following [EnOcean Equipment Profiles](https://www.enocean-alliance.org/what-is-enocean/specifications/) are supported: +The following [EnOcean Equipment Profiles](https://www.enocean-alliance.org/specifications/) are supported: - Any profile that contains the humidity value at position **DB2.7** to **DB2.0** - **A5-04-01** - Temp. and Humidity Sensor, Range 0°C to +40°C and 0% to 100% @@ -229,7 +229,7 @@ sensor: This sensor has been tested with a generic STM-330 sensor, which is used in most indoor temperature sensor devices. -The following [EnOcean Equipment Profiles](https://www.enocean-alliance.org/what-is-enocean/specifications/) are supported: +The following [EnOcean Equipment Profiles](https://www.enocean-alliance.org/specifications/) are supported: - Any profile that contains an 8-bit temperature at position DB1.7 to DB1.0. 10-bit is not supported. - **A5-02-01** to **A5-02-1B** - Temperature Sensor with various temperature ranges diff --git a/source/_integrations/gc100.markdown b/source/_integrations/gc100.markdown index ebec8af46cc..23f46fe0b23 100644 --- a/source/_integrations/gc100.markdown +++ b/source/_integrations/gc100.markdown @@ -14,7 +14,7 @@ ha_platforms: ha_integration_type: integration --- -The Global Caché [GC-100](https://www.globalcache.com/products/gc-100/) can be integrated into Home Assistant. GC-100 is a TCP-controllable +The Global Caché GC-100 can be integrated into Home Assistant. GC-100 is a TCP-controllable hardware device which has an array of relays, RS232 serial ports, and flexible ports which can be programmed to be either digital inputs or IR blaster outputs. There are a variety of submodels of the GC-100 which have different amounts of each I/O type. There is currently support for the following device types within Home Assistant: diff --git a/source/_integrations/itach.markdown b/source/_integrations/itach.markdown index 623ed125b62..8d2f5648877 100644 --- a/source/_integrations/itach.markdown +++ b/source/_integrations/itach.markdown @@ -11,9 +11,9 @@ ha_platforms: ha_integration_type: integration --- -The `itach` remote platform allows you to control IR devices with a [Global Caché iTach Device](https://www.globalcache.com/products/itach/ip2irspecs) and GC-100 devices. The Global Cache IR API are similar across their product line. See API documentation links at the end of this page. +The `itach` remote platform allows you to control IR devices with a Global Caché iTach Device and GC-100 devices. The Global Cache IR API are similar across their product line. See API documentation links at the end of this page. -In order to utilize the digital input (binary sensor) and relay (switch) features of your Global Cache device you will need to use the [gc100 component](/integrations/gc100) and associated platforms. +In order to utilize the digital input (binary sensor) and relay (switch) features of your Global Cache device you will need to use the [gc100 integration](/integrations/gc100) and associated platforms. To use your iTach remote in your installation, you will need to know the IR commands for your devices in Pronto hex format and add the following to your `configuration.yaml` file: diff --git a/source/_integrations/joaoapps_join.markdown b/source/_integrations/joaoapps_join.markdown index 8f8e48379e9..b0d498782af 100644 --- a/source/_integrations/joaoapps_join.markdown +++ b/source/_integrations/joaoapps_join.markdown @@ -57,7 +57,7 @@ device_names: required: false type: string name: - description: The name parameter is optional but needed if you want to use multiple notification platforms. The platform will be exposed as service `notify.`. The name will default to `notify` if not supplied. See the [Notifications Component](/integrations/notify) for more details. + description: The name parameter is optional but needed if you want to use multiple notification platforms. The platform will be exposed as service `notify.`. The name will default to `notify` if not supplied. See the [Notifications integration](/integrations/notify) for more details. required: false type: string {% endconfiguration %} diff --git a/source/_integrations/kraken.markdown b/source/_integrations/kraken.markdown index 5c17b3457f9..557293f4a8b 100644 --- a/source/_integrations/kraken.markdown +++ b/source/_integrations/kraken.markdown @@ -16,7 +16,7 @@ ha_integration_type: integration --- The Kraken integration allows you to monitor exchange rates on [kraken.com](https://www.kraken.com/). -For a list of tradable asset pairs check [this kraken support article](https://support.kraken.com/hc/en-us/articles/201893658-Currency-pairs-available-for-trading-on-Kraken). +For a list of tradable asset pairs check [this kraken support article](https://support.kraken.com/hc/articles/201893658-Currency-pairs-available-for-trading-on-Kraken). {% include integrations/config_flow.md %} diff --git a/source/_integrations/matrix.markdown b/source/_integrations/matrix.markdown index fbe30367f05..5ced1b42f3d 100644 --- a/source/_integrations/matrix.markdown +++ b/source/_integrations/matrix.markdown @@ -100,7 +100,7 @@ This example also uses the [matrix `notify` platform](#notifications). {% raw %} ```yaml -# The Matrix component +# The Matrix integration matrix: homeserver: https://matrix.org username: "@my_matrix_user:matrix.org" @@ -155,7 +155,7 @@ This configuration will: The `matrix` platform allows you to deliver notifications from Home Assistant to a [Matrix](https://matrix.org/) room. Rooms can be both direct as well as group chats. -To enable Matrix notifications in your installation, you first need to configure the [Matrix component](#configuration). Then, add the following to your `configuration.yaml` file: +To enable Matrix notifications in your installation, you first need to configure the [Matrix integration](#configuration). Then, add the following to your `configuration.yaml` file: ```yaml # Example configuration.yaml entry diff --git a/source/_integrations/nest.markdown b/source/_integrations/nest.markdown index e4a9044d8b3..bab47f6ab3e 100644 --- a/source/_integrations/nest.markdown +++ b/source/_integrations/nest.markdown @@ -24,15 +24,6 @@ ha_platforms: ha_integration_type: integration --- - - -
Existing users: Nest authentication is changing.
-
LEARN MORE
- - - The `nest` integration allows you to integrate a few [supported](https://developers.google.com/nest/device-access/supported-devices) Google [Nest](https://store.google.com/us/category/connected_home?) devices in Home Assistant. This integration uses the [Smart Device Management](https://developers.google.com/nest/device-access/api) API and Google's Cloud Pubsub to efficiently listen for changes in device state or other events. See [Supported Devices](https://developers.google.com/nest/device-access/supported-devices) for all devices supported by the SDM API. There is currently support for the following device types within Home Assistant: diff --git a/source/_integrations/qld_bushfire.markdown b/source/_integrations/qld_bushfire.markdown index 5a09571a8d6..392337c7fa3 100644 --- a/source/_integrations/qld_bushfire.markdown +++ b/source/_integrations/qld_bushfire.markdown @@ -34,7 +34,7 @@ The data is updated every 5 minutes. The material used by this integration is provided under the [Creative Commons Attribution 4.0 license](https://creativecommons.org/licenses/by/4.0/legalcode). It has only been modified for the purpose of presenting the material in Home Assistant. -Please refer to the [creator's copyright notice](https://www.qfes.qld.gov.au/Pages/copyright.aspx) for more information. +Please refer to the [creator's copyright notice](https://www.qfes.qld.gov.au/copyright) for more information. diff --git a/source/_integrations/recorder.markdown b/source/_integrations/recorder.markdown index 56bea32dc73..9df854590ff 100644 --- a/source/_integrations/recorder.markdown +++ b/source/_integrations/recorder.markdown @@ -12,7 +12,7 @@ ha_codeowners: ha_integration_type: system --- -The `recorder` integration is responsible for storing details in a database, which then are handled by the [`history`](/integrations/history/) integration. +This integration is by default enabled as dependency of the [`history`](/integrations/history/) integration.
diff --git a/source/_integrations/switch_as_x.markdown b/source/_integrations/switch_as_x.markdown index ee55bb0cc0a..7d9f0ca600f 100644 --- a/source/_integrations/switch_as_x.markdown +++ b/source/_integrations/switch_as_x.markdown @@ -36,7 +36,7 @@ things like locks or garage doors. Using the Switch as X integration, you can convert those switches into the entity types that best matches your use case. -{% include integrations/config_flow.md name="Change device type of a switch" %} +{% include integrations/config_flow.md name="Switch as X" %} {% configuration_basic %} Switch entity: description: The switch entity you want to convert into something else. diff --git a/source/_integrations/transmission.markdown b/source/_integrations/transmission.markdown index 4883034705e..9d24b856d80 100644 --- a/source/_integrations/transmission.markdown +++ b/source/_integrations/transmission.markdown @@ -72,7 +72,7 @@ Example of an automation that notifies on successful download and removes the to message: "{{trigger.event.data.name}}" - service: transmission.remove_torrent data: - name: "Transmission" + entry_id: eeb52bc78e11d813a1e6bc68c8ff93c8 id: "{{trigger.event.data.id}}" ``` @@ -80,6 +80,8 @@ Example of an automation that notifies on successful download and removes the to ## Services +All Transmission services require integration `entry_id`. To find it, go to Developer Tools -> Services. Choose the desired service and select your integration from dropdown. Then switch to YAML mode to see `entry_id`. + ### Service `add_torrent` Adds a new torrent to download. It can either be a URL (HTTP, HTTPS or FTP), magnet link or a local file (make sure that the path is [white listed](/docs/configuration/basic/#allowlist_external_dirs)). diff --git a/source/_integrations/utility_meter.markdown b/source/_integrations/utility_meter.markdown index 8588ae9d39d..0853b40ffae 100644 --- a/source/_integrations/utility_meter.markdown +++ b/source/_integrations/utility_meter.markdown @@ -243,7 +243,7 @@ utility_meter: ## Advanced Configuration for DSMR users -When using the [DSMR component](/integrations/dsmr) to get data from the utility meter, each tariff (peak and off-peak) has a separate sensor. Additionally, there is a separate sensor for gas consumption. The meter switches automatically between tariffs, so an automation is not necessary in this case. But, you do have to setup a few more instances of the `utility_meter` component. +When using the [DSMR integration](/integrations/dsmr) to get data from the utility meter, each tariff (peak and off-peak) has a separate sensor. Additionally, there is a separate sensor for gas consumption. The meter switches automatically between tariffs, so an automation is not necessary in this case. But, you do have to setup a few more instances of the `utility_meter` integration. If you want to create a daily and monthly sensor for each tariff, you have to track separate sensors: @@ -251,7 +251,7 @@ If you want to create a daily and monthly sensor for each tariff, you have to tr - `sensor.energy_consumption_tarif_2` for tarif 2 power (for example peak) - `sensor.gas_consumption` for gas consumption -So, tracking daily and monthly consumption for each sensor, will require setting up 6 entries under the `utility_meter` component. +So, tracking daily and monthly consumption for each sensor, will require setting up 6 entries under the `utility_meter` integration. ```yaml utility_meter: diff --git a/source/_integrations/zone.markdown b/source/_integrations/zone.markdown index 0f95a09cad4..99edea158ee 100644 --- a/source/_integrations/zone.markdown +++ b/source/_integrations/zone.markdown @@ -80,8 +80,7 @@ If no configuration is given, the `zone` integration will create a zone for home
-Devices that are in the zone **'Home'** will not appear on the map in the Home Assistant UI. - +Devices that are in the zone **'Home'** will not appear on the map in the Home Assistant UI. To apply the changes to the **'Home'** `zone`, you must restart Home Assistant.
## Icons diff --git a/source/getting-started/concepts-terminology.markdown b/source/getting-started/concepts-terminology.markdown index caf599d14b6..a918b698baf 100644 --- a/source/getting-started/concepts-terminology.markdown +++ b/source/getting-started/concepts-terminology.markdown @@ -11,7 +11,7 @@ Customizable pages to display information connected to and available in Home Ass ![Dashboard](/images/getting-started/lovelace.png) ## Integrations -Software that allows Home Assistant to connect to other software and platforms. For example, the Philips Hue integration allows Home Assistant to talk to the Hue Bridge and read data such as the state of your lights through to controlling the lights themselves. +Software that allows Home Assistant to connect to other software and platforms. For example, a product by Philips called Hue would use the Philips Hue integration and allow Home Assistant to talk to the hardware controller Hue Bridge. Any connected and Home Assistant compatible devices to the Hue Bridge would appear in Home Assistant as [devices](#devices--entities). ![Integrations](/images/getting-started/integrations.png) diff --git a/source/tos/index.markdown b/source/tos/index.markdown index 58554f567d2..c1080767738 100644 --- a/source/tos/index.markdown +++ b/source/tos/index.markdown @@ -28,7 +28,7 @@ If you post material to the Website, post links on the Website, or otherwise mak ## 3. User Content License -User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, Home Assistant has the right (though not the obligation) to, in Home Assistant’s sole discretion (i) refuse or remove any content that, in Home Assistant’s reasonable opinion, violates any Home Assistant policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in Home Assistant’s sole discretion. Home Assistant will have no obligation to provide a refund of any amounts previously paid. +User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](https://creativecommons.org/licenses/by-nc-sa/3.0/). Without limiting any of those representations or warranties, Home Assistant has the right (though not the obligation) to, in Home Assistant’s sole discretion (i) refuse or remove any content that, in Home Assistant’s reasonable opinion, violates any Home Assistant policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in Home Assistant’s sole discretion. Home Assistant will have no obligation to provide a refund of any amounts previously paid. ## 4. Payment and Renewal @@ -56,7 +56,7 @@ We have not reviewed, and cannot review, all of the material, including computer ## 8. Copyright Infringement and DMCA Policy -As Home Assistant asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by Home Assistant violates your copyright, and if this website resides in the USA, you are encouraged to notify Home Assistant in accordance with Home Assistant’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. Home Assistant will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. Home Assistant will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of Home Assistant or others. In the case of such termination, Home Assistant will have no obligation to provide a refund of any amounts previously paid to Home Assistant. +As Home Assistant asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by Home Assistant violates your copyright, and if this website resides in the USA, you are encouraged to notify Home Assistant in accordance with Home Assistant’s [Digital Millennium Copyright Act](https://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. Home Assistant will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. Home Assistant will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of Home Assistant or others. In the case of such termination, Home Assistant will have no obligation to provide a refund of any amounts previously paid to Home Assistant. ## 9. Intellectual Property @@ -80,7 +80,7 @@ Home Assistant may terminate your access to all or any part of the Website at an ## 14. Disclaimer of Warranties -The Website is provided "as is". Home Assistant and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither Home Assistant nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk. +The Website is provided "as is". Home Assistant and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither Home Assistant nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](https://www.newyorker.com/humor/daily-shouts/the-hundred-best-lists-of-all-time). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk. ## 15. Limitation of Liability @@ -100,4 +100,4 @@ This Agreement constitutes the entire agreement between Home Assistant and you c This document is CC-BY-SA. It was last updated February 20, 2017. -Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/). \ No newline at end of file +Originally adapted from the [WordPress Terms of Service](https://wordpress.com/tos/).