diff --git a/source/_components/browser.markdown b/source/_components/browser.markdown
index 36bb6176789..78671687abd 100644
--- a/source/_components/browser.markdown
+++ b/source/_components/browser.markdown
@@ -25,7 +25,7 @@ browser:
| Service data attribute | Optional | Description |
| ---------------------- | -------- | ----------- |
-| `url` | no | The url to open
+| `url` | no | The URL to open.
### {% linkable_title Usage %}
diff --git a/source/_components/camera.generic.markdown b/source/_components/camera.generic.markdown
index 6f384859570..11aecff2e25 100644
--- a/source/_components/camera.generic.markdown
+++ b/source/_components/camera.generic.markdown
@@ -14,7 +14,7 @@ ha_iot_class: "depends"
---
-The `generic` camera platform allows you to integrate any IP camera or other url into Home Assistant. Templates can be used to generate the urls on the fly.
+The `generic` camera platform allows you to integrate any IP camera or other URL into Home Assistant. Templates can be used to generate the URLs on the fly.
Home Assistant will serve the images via its server, making it possible to view your IP camera's while outside of your network. The endpoint is `/api/camera_proxy/camera.[name]`.
@@ -34,7 +34,7 @@ Configuration variables:
- **username** (*Optional*): The username for accessing your camera.
- **password** (*Optional*): The password for accessing your camera.
- **authentication** (*Optional*): Type for authenticating the requests `basic` (default) or `digest`.
-- **limit_refetch_to_url_change** (*Optional*): True/false value (default: false). Limits refetching of the remote image to when the url changes. Only relevant if using a template to fetch the remote image.
+- **limit_refetch_to_url_change** (*Optional*): True/false value (default: false). Limits refetching of the remote image to when the URL changes. Only relevant if using a template to fetch the remote image.
- **content_type** (*Optional*): Set the content type for the IP camera if it is not a jpg file (default: `image/jpeg`). Use `image/svg+xml` to add a dynamic svg file.
diff --git a/source/_components/image_processing.markdown b/source/_components/image_processing.markdown
index 41f36134250..e74ef6ec5c8 100644
--- a/source/_components/image_processing.markdown
+++ b/source/_components/image_processing.markdown
@@ -15,7 +15,7 @@ Image processing enables Home Assistant to process images from [cameras](/compon
For interval control, use `scan_interval` in platform.
-If you are running Home Assistant over SSL or from within a container, you will have to setup a base url inside the [http component](/components/http/).
+If you are running Home Assistant over SSL or from within a container, you will have to setup a base URL (`base_url`) inside the [http component](/components/http/).
## {% linkable_title ALPR %}
diff --git a/source/_components/tts.markdown b/source/_components/tts.markdown
index 7039136506f..369ee59a2e1 100644
--- a/source/_components/tts.markdown
+++ b/source/_components/tts.markdown
@@ -42,7 +42,7 @@ tts:
```
-If you are running Home Assistant over SSL or from within a container, you will have to setup a base url inside the [http component](/components/http/).
+If you are running Home Assistant over SSL or from within a container, you will have to setup a base URL (`base_url`) inside the [http component](/components/http/).
## {% linkable_title Service say %}
diff --git a/source/_components/volvooncall.markdown b/source/_components/volvooncall.markdown
index 7a73922f01f..a8b9d827b99 100644
--- a/source/_components/volvooncall.markdown
+++ b/source/_components/volvooncall.markdown
@@ -25,7 +25,7 @@ volvooncall:
password: password
```
-Users registered with Volvo in North America or China will need to specify a service url:
+Users registered with Volvo in North America or China will need to specify a service URL:
```yaml
# North America
diff --git a/source/_docs/configuration/state_object.markdown b/source/_docs/configuration/state_object.markdown
index 9659e255241..8ba54380a55 100644
--- a/source/_docs/configuration/state_object.markdown
+++ b/source/_docs/configuration/state_object.markdown
@@ -18,7 +18,7 @@ All states will always have an entity id, a state and a timestamp when last upda
Field | Description
----- | -----------
-`state.state` | String representation of the current state of the entity. Example `off`
+`state.state` | String representation of the current state of the entity. Example `off`.
`state.entity_id` | Entity ID. Format: `.`. Example: `light.kitchen`.
`state.domain` | Domain of the entity. Example: `light`.
`state.object_id` | Object ID of entity. Example: `kitchen`.
@@ -36,7 +36,7 @@ Attribute | Description
`friendly_name` | Name of the entity. Example: `Kitchen Ceiling`.
`icon` | Icon to use for the entity in the frontend. Example: `mdi:home`.
`hidden` | Boolean if the entity should not be shown in the frontend. Example: `true`.
-`entity_picture` | Url to a picture that should be used instead of showing the domain icon. Example: `http://example.com/picture.jpg`.
+`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`.
diff --git a/source/_posts/2015-07-11-ip-cameras-arduino-kodi-efergy-support.markdown b/source/_posts/2015-07-11-ip-cameras-arduino-kodi-efergy-support.markdown
index b192d9b9bbd..ce431a91dab 100644
--- a/source/_posts/2015-07-11-ip-cameras-arduino-kodi-efergy-support.markdown
+++ b/source/_posts/2015-07-11-ip-cameras-arduino-kodi-efergy-support.markdown
@@ -15,7 +15,7 @@ Another month has passed and some great new features have landed in Home Assista
This release includes some architectural changes by me. The first is that the frontend is now based on a [NuclearJS](http://optimizely.github.io/nuclear-js/) JavaScript backend. This has greatly helped to organize and optimize the frontend code. Another change is that Home Assistant will now install dependencies on-demand instead of installing dependencies for all supported devices.
__IP Camera Support__
-James has worked very hard to add support for IP cameras to Home Assistant which is included in this release. The initial release focusses on providing generic IP camera support. This means that any webcam that can exposes a JPEG image via a url can be integrated.
+James has worked very hard to add support for IP cameras to Home Assistant which is included in this release. The initial release focusses on providing generic IP camera support. This means that any webcam that can exposes a JPEG image via a URL can be integrated.
Home Assistant will route the requests to your camera via the server allowing you to expose IP camera's inside your network via the Home Assistant app.
diff --git a/source/_posts/2015-09-13-home-assistant-meets-ifttt.markdown b/source/_posts/2015-09-13-home-assistant-meets-ifttt.markdown
index d8a76a3b99f..fb3ef97b205 100644
--- a/source/_posts/2015-09-13-home-assistant-meets-ifttt.markdown
+++ b/source/_posts/2015-09-13-home-assistant-meets-ifttt.markdown
@@ -26,7 +26,7 @@ Head over to the [setup instructions](/components/ifttt/) to get started with IF
-In each of the following examples, make sure to replace the XXX in the url with your correct host address and api password.
+In each of the following examples, make sure to replace the XXX in the URL with your correct host address and API password.
## {% linkable_title Turn off irregation system when not needed %}
diff --git a/source/_posts/2016-07-01-envisalink-homematic-hdmi-cec-and-sony-bravia-tv.markdown b/source/_posts/2016-07-01-envisalink-homematic-hdmi-cec-and-sony-bravia-tv.markdown
index b28b26b7cd4..d30c6ea84de 100644
--- a/source/_posts/2016-07-01-envisalink-homematic-hdmi-cec-and-sony-bravia-tv.markdown
+++ b/source/_posts/2016-07-01-envisalink-homematic-hdmi-cec-and-sony-bravia-tv.markdown
@@ -32,7 +32,7 @@ On the config side, you can now [store your passwords][secrets] in your OS keyri
- Sensor: [Fixer.io] now supported ([@fabaff])
- Garage door: Control any garage door using [Raspberry Pi GPIO pins] ([@kellerza])
- Sensor: [OpenExchangeRates] support added ([@arsaboo])
-- Notify: [Pushover] now supports target device, sound, url and priority ([@dale3h])
+- Notify: [Pushover] now supports target device, sound, URL and priority ([@dale3h])
- Sensor: [Netatmo] now supports wind, battery and radio signals ([@Jypy])
- Log successful and failed login attemps ([@fabaff])
- Config: allow [extracting account info][secrets] into OS keyring or separate YAML file ([@kellerza])
diff --git a/source/_posts/2016-12-17-text-to-speech-aquostv-flic-zamg.markdown b/source/_posts/2016-12-17-text-to-speech-aquostv-flic-zamg.markdown
index dc163a0ecad..2f4697f6283 100644
--- a/source/_posts/2016-12-17-text-to-speech-aquostv-flic-zamg.markdown
+++ b/source/_posts/2016-12-17-text-to-speech-aquostv-flic-zamg.markdown
@@ -64,7 +64,7 @@ The [GPSLogger](https://home-assistant.io/components/device_tracker.gpslogger/)
### {% linkable_title Release 0.35.1 - December 18 %}
-Some issues have been reported with TTS that will be addressed by 0.35.1. The TTS component had issues linking the media player to the right media file if you were using Docker or SSL certificates. This can be fixed by exposing to your HTTP config what url you use for hosting Home Assistant:
+Some issues have been reported with TTS that will be addressed by 0.35.1. The TTS component had issues linking the media player to the right media file if you were using Docker or SSL certificates. This can be fixed by exposing to your HTTP config what URL you use for hosting Home Assistant:
```yaml
http:
diff --git a/source/_posts/2017-01-28-face-coffee-wink.markdown b/source/_posts/2017-01-28-face-coffee-wink.markdown
index 60fc55db966..5697e3c393b 100644
--- a/source/_posts/2017-01-28-face-coffee-wink.markdown
+++ b/source/_posts/2017-01-28-face-coffee-wink.markdown
@@ -137,7 +137,7 @@ Bugfix: [@balloob], [@fabaff], [@freol35241], [@pvizeli], [@Danielhiversen], [@t
- Fix Telldus Live dim level error on startup ([@molobrakos])
- Fix Sonos group coordinators ([@pvizeli])
- UPC Connect: Parse XML outside event loop ([@pvizeli])
-- Fix Netatmo SSL issue with VPN url ([@jabesq])
+- Fix Netatmo SSL issue with VPN URL ([@jabesq])
- Homematic: Fix bug with UNREACH device state/restore and variables not updating ([@pvizeli])
- Sonos: Prevent duplicate entries in favorite list ([@pvizeli])
- Fix Schlage Connect deadbolt integration via Z-Wave ([@turbokongen])
diff --git a/source/_posts/2017-03-11-repurpose-any-android-phone-as-ip-camera.markdown b/source/_posts/2017-03-11-repurpose-any-android-phone-as-ip-camera.markdown
index daf58b77dfb..a33b1d6aaf7 100644
--- a/source/_posts/2017-03-11-repurpose-any-android-phone-as-ip-camera.markdown
+++ b/source/_posts/2017-03-11-repurpose-any-android-phone-as-ip-camera.markdown
@@ -204,7 +204,7 @@ Hot fix release to fix dependency issues. More detailed information about the is
- Fix unnecessary warning for ip bans.yaml ([@balloob])
- Better restore_state warnings ([@balloob])
- Set new color before turning LIFX bulbs on ([@amelchio])
-- Don't log username and password in camera url ([@ishults])
+- Don't log username and password in camera URL ([@ishults])
- Ignore deleted mails in IMAP unread count (#6394) ([@amelchio])
- Delay zwave updates for 100ms to group them. ([@andrey-git])
- Rename _scheduled_update to _update_scheduled ([@andrey-git])
diff --git a/source/_posts/2017-04-08-eddystone-beacons--lockitron-locks--total-connect.markdown b/source/_posts/2017-04-08-eddystone-beacons--lockitron-locks--total-connect.markdown
index 612dff06b74..b8949bbedf2 100644
--- a/source/_posts/2017-04-08-eddystone-beacons--lockitron-locks--total-connect.markdown
+++ b/source/_posts/2017-04-08-eddystone-beacons--lockitron-locks--total-connect.markdown
@@ -225,7 +225,7 @@ Experiencing issues introduced by this release? Please report them in our [issue
- light.yeelight: catch i/o related exceptions from the backend lib ([@rytilahti] - [#6952])
- Fix current_temperature is rounded ([@aufano] - [#6960])
- Preserve customize glob order. ([@andrey-git] - [#6963])
-- Foscam Camera: Adding exception handling when fetching the camera image to avoid python exception errors when host is not reachable or rather any url error to camera ([@viswa-swami] - [#6964])
+- Foscam Camera: Adding exception handling when fetching the camera image to avoid python exception errors when host is not reachable or rather any URL error to camera ([@viswa-swami] - [#6964])
- Crime Reports sensor ([@happyleavesaoc] - [#6966]) (new-platform)
- Update kodi for aiohttp2 ([@armills] - [#6967])
- Bugfix time and task coro ([@pvizeli] - [#6968])
diff --git a/source/_posts/2017-04-22-ikea-tradfri--spotify.markdown b/source/_posts/2017-04-22-ikea-tradfri--spotify.markdown
index aa5893e844c..7b7233f60ee 100644
--- a/source/_posts/2017-04-22-ikea-tradfri--spotify.markdown
+++ b/source/_posts/2017-04-22-ikea-tradfri--spotify.markdown
@@ -116,7 +116,7 @@ Experiencing issues introduced by this release? Please report them in our [issue
- Bugfix time and task coro ([@pvizeli] - [#6968])
- Initial import for HassIO ([@pvizeli] - [#6935])
- Preserve customize glob order. ([@andrey-git] - [#6963])
-- Foscam Camera: Adding exception handling when fetching the camera image to avoid python exception errors when host is not reachable or rather any url error to camera ([@viswa-swami] - [#6964]) ([camera.foscam docs])
+- Foscam Camera: Adding exception handling when fetching the camera image to avoid python exception errors when host is not reachable or rather any URL error to camera ([@viswa-swami] - [#6964]) ([camera.foscam docs])
- light.yeelight: catch i/o related exceptions from the backend lib ([@rytilahti] - [#6952])
- From Dusk till Dawn ([@BillyNate] - [#6857]) ([sun docs])
- Tests for zwave services ([@armills] - [#6937]) ([zwave docs])
diff --git a/source/developers/code_review_component.markdown b/source/developers/code_review_component.markdown
index cb9683bcc0a..e3662e63791 100644
--- a/source/developers/code_review_component.markdown
+++ b/source/developers/code_review_component.markdown
@@ -16,7 +16,7 @@ A checklist of things to do when you're adding a new component.
1. Requirement version pinned: `REQUIREMENTS = ['phue==0.8.1']`
2. If requirement hosted on GitHub:
- Point at a zip archive of a release tag or commit SHA.
- - Add version found in zip-archive as hash to url.
+ - Add version found in zip-archive as hash to URL.
```python
REQUIREMENTS = [
diff --git a/source/developers/code_review_platform.markdown b/source/developers/code_review_platform.markdown
index a50fdf91a79..1096302764f 100644
--- a/source/developers/code_review_platform.markdown
+++ b/source/developers/code_review_platform.markdown
@@ -16,7 +16,7 @@ A checklist of things to do when you're adding a new platform.
1. Requirement version pinned: `REQUIREMENTS = ['phue==0.8.1']`
2. If requirement hosted on GitHub:
- Point at a zip archive of a release tag or commit SHA.
- - Add version found in zip-archive as hash to url.
+ - Add version found in zip-archive as hash to URL.
```python
REQUIREMENTS = [
diff --git a/source/hassio/addon_repository.markdown b/source/hassio/addon_repository.markdown
index 8059225125a..662fa8ef08a 100644
--- a/source/hassio/addon_repository.markdown
+++ b/source/hassio/addon_repository.markdown
@@ -15,7 +15,7 @@ Add-ons repository can contain one or more add-ons. Each add-on is stored in it'
## Installing a repository
-A user can add a repository by going to the Hass.io panel in Home Assistant, clicking on the store icon in the top right, copy/paste the url of your repostory into the repository textarea and click on "Save".
+A user can add a repository by going to the Hass.io panel in Home Assistant, clicking on the store icon in the top right, copy/paste the URL of your repostory into the repository textarea and click on "Save".
## Repository configuration