diff --git a/source/_docs/configuration/devices.markdown b/source/_docs/configuration/devices.markdown
index 61e10fce226..e042d212dd7 100644
--- a/source/_docs/configuration/devices.markdown
+++ b/source/_docs/configuration/devices.markdown
@@ -3,16 +3,16 @@ title: "Adding devices to Home Assistant"
 description: "Steps to help you get your devices in Home Assistant."
 ---
 
-Home Assistant will be able to automatically discover many devices and services available on your network if you have [the discovery component](/integrations/discovery/) enabled (the default setting).
+Home Assistant will be able to automatically discover many devices and services
+available on your network.
 
-See the [integrations overview page](/integrations/) to find installation instructions for your devices and services. If you can't find support for your favorite device or service, [consider adding support](/developers/add_new_platform/).
+See the [integrations overview page](/integrations/) to find installation
+instructions for your devices and services. Most integration can be
+fully configured via the user interface these days; however, some older or
+more complex integrations may need to be configured manually using YAML.
 
-Classification for the available integrations:
-
-- [IoT class](/blog/2016/02/12/classifying-the-internet-of-things): Classifier for the device's behavior.
-- [Quality scale](/docs/quality_scale/): Representation of the integration's quality.
-
-Usually every entity needs its own entry in the `configuration.yaml` file. There are two styles for multiple entries:
+For some of these integrations, every entity needs its own entry in the
+`configuration.yaml` file. There are two styles for multiple entity entries:
 
 ## Style 1: Collect every entity under the "parent"
 
@@ -32,9 +32,10 @@ switch:
   - platform: vera
 ```
 
-## Style 2: List each device separately
+## Style 2: List each entity separately
 
-You need to append numbers or strings to differentiate the entries, as in the example below. The appended number or string must be unique.
+You need to append numbers or strings to differentiate the entries, as in the
+example below. The appended number or string must be unique.
 
 ```yaml
 sensor bedroom:
@@ -59,10 +60,12 @@ switch 2:
   platform: vera
 ```
 
-## Grouping devices
+## Grouping entities
 
-Once you have several devices set up, it is time to organize them into groups.
-Each group consists of a name and a list of entity IDs. Entity IDs can be retrieved from the web interface by using the {% my developer_states title="States page in the Developer Tools" %}.
+Once you have several entities set up, it is time to organize them into groups.
+Each group consists of a name and a list of entity IDs. Entity IDs can be
+retrieved from the web interface by using the
+{% my developer_states title="States page in the Developer Tools" %}.
 
 ```yaml
 # Example configuration.yaml entry