diff --git a/source/_data/glossary.yml b/source/_data/glossary.yml index 9bb3f81f014..63997496c97 100644 --- a/source/_data/glossary.yml +++ b/source/_data/glossary.yml @@ -32,12 +32,14 @@ description: "[Groups](/integrations/group/) are a way to organize your entities into a single unit." - topic: hass description: "HASS or [hass](/docs/tools/hass/) is often used as an abbreviation for Home Assistant. It is also the command-line tool." -- topic: Hass.io - description: "[Hass.io](/hassio/) is a full UI managed home automation ecosystem that runs Home Assistant, the Hass.io Supervisor and add-ons. It comes pre-installed on HassOS, but can be installed on any Linux system. It leverages Docker, which is managed by the Hass.io Supervisor." -- topic: Hass.io Supervisor - description: "The Hass.io Supervisor is a program that manages a Hass.io installation, taking care of installing and updating Home Assistant, add-ons, itself and, if used, updating the HassOS operating system." -- topic: HassOS - description: "HassOS, the Home Assistant Operating System, is an embedded, minimalistic, operating system designed to run the Hass.io ecosystem on single board computers (like the Raspberry Pi) or Virtual Machines. The Hass.io Supervisor can keep it up to date, removing the need for you to manage an operating system." +- topic: Home Assistant Core + description: Home Assistant Core is a Python program. It can be run on various operating systems and is the basis for Home Assistant. When people are talking about Home Assistant Core they usually refer to a standalone installation method that can be installed using a Virtual Environment or Docker. Home Assistant Core does not use the Home Assistant Supervisor. +- topic: Home Assistant Supervised (Previously Hass.io) + description: "[Home Assistant](/hassio/) is a full UI managed home automation ecosystem that runs Home Assistant, the Home Assistant Supervisor and add-ons. It comes pre-installed on Home Assistant OS, but can be installed on any Linux system. It leverages Docker, which is managed by the Home Assistant Supervisor." +- topic: Home Assistant Supervisor + description: "The Home Assistant Supervisor is a program that manages a Home Assistant installation, taking care of installing and updating Home Assistant, add-ons, itself and, if used, updating the HassOS operating system." +- topic: Home Assistant Operating System + description: "Home Assistant OS, the Home Assistant Operating System, is an embedded, minimalistic, operating system designed to run the Home Assistant ecosystem on single board computers (like the Raspberry Pi) or Virtual Machines. The Home Assistant Supervisor can keep it up to date, removing the need for you to manage an operating system." - topic: Integration description: "[Integrations](/integrations/) provide the core logic for the functionality in Home Assistant. Like `notify` provides sending notifications." - topic: Lovelace diff --git a/source/_docs/configuration/customizing-devices.markdown b/source/_docs/configuration/customizing-devices.markdown index 274664e0a0d..60ffd57306d 100644 --- a/source/_docs/configuration/customizing-devices.markdown +++ b/source/_docs/configuration/customizing-devices.markdown @@ -8,7 +8,7 @@ redirect_from: /getting-started/customizing-devices/ You can use the UI to change the `entity_id` and friendly name of supported entities. To do this: -1. Select the entity, either from the frontend or by clicking next to the entity in the Developer Tools "States" tab. +1. Select the entity, either from the frontend or by clicking the info button next to the entity in the Developer Tools "States" tab. 2. Click on the cog in the right corner of the entity's dialog 3. Enter the new name or the new entity ID (remember not to change the domain of the entity - the part before the `.`) 4. Select *Save* @@ -123,7 +123,11 @@ homeassistant: ### Reloading customize -Home Assistant offers a service to reload the core configuration while Home Assistant is running called `homeassistant.reload_core_config`. This allows you to change your customize section and see it being applied without having to restart Home Assistant. To call this service, go to the "Service" tab under Developer Tools, select the `homeassistant.reload_core_config` service and click the "CALL SERVICE" button. Alternatively, you can press the "Reload Location & Customizations" button under Configuration > Server Control. +Home Assistant offers a service to reload the core configuration while Home Assistant is running. This allows you to change your customize section and see your changes being applied without having to restart Home Assistant. + +To reload customizations, navigate to Configuration > Server Controls and then press the "Reload Location & Customizations" button. If you don't see this, enable Advanced Mode on your user profile page first. + +Alternatively, you can reload via service call. Navigate to Developer Tools > Services tab, select `homeassistant.reload_core_config` from the dropdown and press the "Call Service" button.
New customize information will be applied the next time the state of the entity gets updated. diff --git a/source/_docs/configuration/templating.markdown b/source/_docs/configuration/templating.markdown index de04e1a88be..cf889f05507 100644 --- a/source/_docs/configuration/templating.markdown +++ b/source/_docs/configuration/templating.markdown @@ -25,7 +25,7 @@ Templating in Home Assistant is powered by the [Jinja2](https://palletsprojects. We will not go over the basics of the syntax, as Jinja2 does a great job of this in their [templates documentation](https://jinja.palletsprojects.com/en/master/templates/). -The frontend has a template editor tool to help develop and debug templates. Click on the template developer tool icon icon, create your template in the _Template editor_ and check the results on the right. +The frontend has a template editor tool to help develop and debug templates. Navigate to Developer Tools > Template, create your template in the _Template editor_ and check the results on the right. Templates can get big pretty fast. To keep a clear overview, consider using YAML multiline strings to define your templates: diff --git a/source/_includes/asides/help_navigation.html b/source/_includes/asides/help_navigation.html index 458a6a93850..491f508735f 100644 --- a/source/_includes/asides/help_navigation.html +++ b/source/_includes/asides/help_navigation.html @@ -11,10 +11,10 @@ Developer documentation
  • - {% active_link /developers/documentation/ Website/Documentation %} + {% active_link /developers/documenting Website/Documentation %}
  • diff --git a/source/_integrations/alexa.smart_home.markdown b/source/_integrations/alexa.smart_home.markdown index 2dd0ed9c5ff..c2f04a236f5 100644 --- a/source/_integrations/alexa.smart_home.markdown +++ b/source/_integrations/alexa.smart_home.markdown @@ -957,6 +957,7 @@ The following is a list of regions and the corresponding URL for the web-based A - Australia: `https://alexa.amazon.com.au` - India: `https://alexa.amazon.in` - Spain: `https://alexa.amazon.es` +- France: `https://alexa.amazon.fr` ## Troubleshooting diff --git a/source/_integrations/emoncms.markdown b/source/_integrations/emoncms.markdown index 1d1e874ab69..a9fd4ae6024 100644 --- a/source/_integrations/emoncms.markdown +++ b/source/_integrations/emoncms.markdown @@ -1,7 +1,6 @@ --- title: Emoncms description: Instructions on how to integrate Emoncms feeds as sensors into Home Assistant. -logo: emoncms.png ha_category: - Sensor ha_release: 0.29 diff --git a/source/_integrations/http.markdown b/source/_integrations/http.markdown index 768c4867bbf..bdda8b291ec 100644 --- a/source/_integrations/http.markdown +++ b/source/_integrations/http.markdown @@ -108,6 +108,7 @@ http: use_x_forwarded_for: true trusted_proxies: - 10.0.0.200 + - 172.30.33.0/24 ip_ban_enabled: true login_attempts_threshold: 5 ``` diff --git a/source/_integrations/sensor.mqtt.markdown b/source/_integrations/sensor.mqtt.markdown index a8c67ec2689..cfe318e7b1d 100644 --- a/source/_integrations/sensor.mqtt.markdown +++ b/source/_integrations/sensor.mqtt.markdown @@ -130,7 +130,9 @@ In this section you find some real-life examples of how to use this sensor. ### JSON attributes topic configuration -The example sensor below shows a configuration example which uses a JSON dict: `{"ClientName": , "IP": , "MAC": , "RSSI": , "HostName": , "ConnectedSSID": }` in a separate topic `home/sensor1/attributes` to add extra attributes. It also makes use of the `availability` topic. Extra attributes will be displayed in the frontend and can also be extracted in [Templates](/docs/configuration/templating/#attributes). For example, to extract the `ClientName` attribute from the sensor below, use a template similar to: {% raw %}`{{ state_attr('sensor.bs_rssi', 'ClientName') }}`{% endraw %}. +The example sensor below shows a configuration example which uses a JSON dict: `{"ClientName": , "IP": , "MAC": , "RSSI": , "HostName": , "ConnectedSSID": }` in a separate topic `home/sensor1/attributes` to add extra attributes. It also makes use of the `availability` topic. + +Extra attributes will be displayed in the frontend and can also be extracted in [Templates](/docs/configuration/templating/#attributes). For example, to extract the `ClientName` attribute from the sensor below, use a template similar to: {% raw %}`{{ state_attr('sensor.bs_rssi', 'ClientName') }}`{% endraw %}. {% raw %} ```yaml @@ -150,7 +152,9 @@ sensor: ### JSON attributes template configuration -The example sensor below shows a configuration example which uses a JSON dict: `{"Timer1":{"Arm": , "Time":