diff --git a/source/_components/sensor.deutsche_bahn.markdown b/source/_components/sensor.deutsche_bahn.markdown
index 00942189ce..2d10cdcc97 100644
--- a/source/_components/sensor.deutsche_bahn.markdown
+++ b/source/_components/sensor.deutsche_bahn.markdown
@@ -21,9 +21,9 @@ To enable this sensor, add the following lines to your `configuration.yaml` file
 ```yaml
 # Example configuration.yaml entry
 sensor:
-  platform: deutsche_bahn
-  from: NAME_OF_START_STATION
-  to: NAME_OF_FINAL_STATION
+  - platform: deutsche_bahn
+    from: NAME_OF_START_STATION
+    to: NAME_OF_FINAL_STATION
 ```
 
 Configuration variables:
diff --git a/source/_components/sensor.google_travel_time.markdown b/source/_components/sensor.google_travel_time.markdown
index 98d0b6086c..7c904d9d54 100644
--- a/source/_components/sensor.google_travel_time.markdown
+++ b/source/_components/sensor.google_travel_time.markdown
@@ -22,13 +22,10 @@ A free API Key allows 2500 requests per day. The sensor will update the travel t
 ```yaml
 # Example entry for configuration.yaml
 sensor:
-    platform: google_travel_time
-    name: Google Travel Time
+  - platform: google_travel_time
     api_key: XXXX_XXXXX_XXXXX
     origin: Trondheim, Norway
     destination: Paris, France
-    options:
-      ...
 ```
 
 Configuration variables:
diff --git a/source/_components/sensor.gtfs.markdown b/source/_components/sensor.gtfs.markdown
index d474d12b0f..e2d60b8093 100644
--- a/source/_components/sensor.gtfs.markdown
+++ b/source/_components/sensor.gtfs.markdown
@@ -41,10 +41,10 @@ Your mileage may vary depending on the transit agency used. Most agencies respec
 ```yaml
 # Example configuration.yaml entry
 sensor:
-  platform: gtfs
-  origin: STOP_ID
-  destination: STOP_ID
-  data: DATA_SOURCE
+  - platform: gtfs
+    origin: STOP_ID
+    destination: STOP_ID
+    data: DATA_SOURCE
 ```
 
 Configuration variables:
diff --git a/source/_components/sensor.swiss_public_transport.markdown b/source/_components/sensor.swiss_public_transport.markdown
index 37ff0ac0af..d352afc000 100644
--- a/source/_components/sensor.swiss_public_transport.markdown
+++ b/source/_components/sensor.swiss_public_transport.markdown
@@ -25,9 +25,9 @@ If the score is 100 ("score":"100" in the response), it is a perfect match. Then
 ```yaml
 # Example configuration.yaml entry
 sensor:
-  platform: swiss_public_transport
-  from: STATION_ID
-  to: STATION_ID
+  - platform: swiss_public_transport
+    from: STATION_ID
+    to: STATION_ID
 ```
 
 Configuration variables:
diff --git a/source/_components/sensor.torque.markdown b/source/_components/sensor.torque.markdown
index e1f96a42bd..7fdc1a475a 100644
--- a/source/_components/sensor.torque.markdown
+++ b/source/_components/sensor.torque.markdown
@@ -40,9 +40,8 @@ Add the following to your `configuration.yaml` file:
 ```yaml
 # Example configuration.yaml entry
 sensor:
-  platform: torque
-  name: Your Vehicle Name
-  email: your_configured@email.com
+  - platform: torque
+    email: your_configured@email.com
 ```
 
 Configuration variables:
diff --git a/source/_components/sensor.uber.markdown b/source/_components/sensor.uber.markdown
index 3ea359e735..b742b84935 100644
--- a/source/_components/sensor.uber.markdown
+++ b/source/_components/sensor.uber.markdown
@@ -24,21 +24,32 @@ To enable this sensor, add the following lines to your `configuration.yaml` file
 ```yaml
 # Example configuration.yaml entry
 sensor:
-  platform: uber
-  start_latitude: 37.8116380
-  start_longitude: -122.2648050
-  end_latitude: 37.7768520
-  end_longitude: -122.4155500
-  server_token: 'BeAPPTDsWZSHLf7fd9OWjZkIezweRw18Q8NltY27'
-  product_ids:
-    - '04a497f5-380d-47f2-bf1b-ad4cfdcb51f2'
+  - platform: uber
+    server_token: 'BeAPPTDsWZSHLf7fd9OWjZkIezweRw18Q8NltY27'
+    start_latitude: 37.8116380
+    start_longitude: -122.2648050
 ```
 
 Configuration variables:
 
+- **server_token** (*Required*): A server token obtained from [developer.uber.com](https://developer.uber.com) after [creating an app](https://developer.uber.com/dashboard/create).
 - **start_latitude** (*Required*): The starting latitude for a trip.
 - **start_longitude** (*Required*): The starting longitude for a trip.
 - **end_latitude** (*Optional*): The ending latitude for a trip. While `end_latitude` is optional, it is strongly recommended to provide an `end_latitude`/`end_longitude` when possible as you will get more accurate price and time estimates.
 - **end_longitude** (*Optional*): The ending longitude for a trip. While `end_longitude` is optional, it is strongly recommended to provide an `end_latitude`/`end_longitude` when possible as you will get more accurate price and time estimates.
-- **server_token** (*Required*): A server token obtained from [developer.uber.com](https://developer.uber.com) after [creating an app](https://developer.uber.com/dashboard/create).
 - **product_ids** (*Options*): A list of Uber product UUIDs. If provided, sensors will only be created for the given product IDs. Please note that product IDs are region and some times even more specific geographies based. The easiest way to find a UUID is to click on a sensor in the Home Assistant frontend and look for "Product ID" in the attributes.
+
+A full configuration entry could look like the sample below: 
+
+```yaml
+# Example configuration.yaml entry
+sensor:
+  - platform: uber
+    start_latitude: 37.8116380
+    start_longitude: -122.2648050
+    end_latitude: 37.7768520
+    end_longitude: -122.4155500
+    server_token: 'BeAPPTDsWZSHLf7fd9OWjZkIezweRw18Q8NltY27'
+    product_ids:
+      - '04a497f5-380d-47f2-bf1b-ad4cfdcb51f2'
+```