diff --git a/source/_components/climate.knx.markdown b/source/_components/climate.knx.markdown
index 8345f23ad0c..6297448c231 100644
--- a/source/_components/climate.knx.markdown
+++ b/source/_components/climate.knx.markdown
@@ -29,9 +29,9 @@ climate:
     setpoint_address: 0/1/0
 ```
 
-- **address** (*Required*): The KNX group address that is used to turn on/off this actuator channel
+- **address** (*Required*): The KNX group address that is used to turn on/off this actuator channel.
 - **temperature_address** (*Required*): The group address that is used to communicate the current temperature. Data format must be datapoint type 9.001 DPT_Value_Temp (2-Octet float value), check [details](http://www.knx.org/fileadmin/template/documents/downloads_support_menu/KNX_tutor_seminar_page/Advanced_documentation/05_Interworking_E1209.pdf).
 - **setpoint_address** (*Required*): The group address that is used to set/read the target temperature. Data format must be datapoint type 9.001 DPT_Value_Temp (2-Octet float value). Make sure, you set the read-flag for the thermostat to allow Home Assistant to read the target temperature.
-- **name** (*Optional*): A name for this devices used within Home Assistant
+- **name** (*Optional*): A name for this devices used within Home Assistant.
 
 With the current version of the module, no advanced KNX thermostat functionalities (e.g. HVAC mode) are supported.
diff --git a/source/_components/knx.markdown b/source/_components/knx.markdown
index 28b36941936..7ab0f340fb1 100644
--- a/source/_components/knx.markdown
+++ b/source/_components/knx.markdown
@@ -27,8 +27,6 @@ A `knx` section must be present in the `configuration.yaml` file and contain the
 ```yaml
 # Example configuration.yaml entry
 knx:
-  host: IP_ADDRESS
-  port: PORT
 ```
 
 - **host** (*Optional*): The IP address of the KNX/IP interface to use. It defaults to `0.0.0.0` which will start discovery for your KNX/IP gateway.
diff --git a/source/_components/sensor.dht.markdown b/source/_components/sensor.dht.markdown
index 1a5424b30d4..b807d14d6ea 100644
--- a/source/_components/sensor.dht.markdown
+++ b/source/_components/sensor.dht.markdown
@@ -24,7 +24,6 @@ sensor:
   platform: dht
   sensor: DHT22
   pin: 23
-  name: Living Room
   monitored_conditions:
     - temperature
     - humidity
@@ -35,11 +34,7 @@ Configuration variables:
 - **sensor** (*Required*): The sensor type, supported devices are DHT11, DHT22, and AM2302
 - **pin** (*Required*): The pin the sensor is connected to.
 - **name** (*Optional*): The name of the sensor
-- **monitored_conditions** array: Conditions to monitor.
-	- **temperature**:
-	- **humidity**: 
-
-Available conditions are only *temperature* and *humidity*.
+- **monitored_conditions** array  (*Required*): Conditions to monitor. Available conditions are only *temperature* and *humidity*.
 
 The name of the pin to which the sensor is connected has different names on different platforms. 'P8_11' for Beaglebone, '23' for Raspberry Pi.
 
diff --git a/source/_components/sensor.knx.markdown b/source/_components/sensor.knx.markdown
index 46a33f47bce..aa1ee560262 100644
--- a/source/_components/sensor.knx.markdown
+++ b/source/_components/sensor.knx.markdown
@@ -30,17 +30,16 @@ To use your KNX sensor in your installation, add the following to your `configur
 # Example configuration.yaml entry
 sensor:
   - platform: knx
-    name: knxweather_temp
     type: temperature
     address: 1/0/3
 
   - platform: knx
-    name: knxweather_wind
+    name: Wind speed
     type: speed_ms
     address: 1/0/0
 
   - platform: knx
-    name: knxweather_lux
+    name: Lux
     type: illuminance
     address: 1/0/1
 ```
diff --git a/source/_components/switch.arduino.markdown b/source/_components/switch.arduino.markdown
index e6426f688e3..5d6a882c379 100644
--- a/source/_components/switch.arduino.markdown
+++ b/source/_components/switch.arduino.markdown
@@ -25,11 +25,11 @@ switch:
     11:
       name: Fan Office
       type: digital
-      default: on
-      negate: true
     12:
       name: Light Desk
       type: digital
+      default: on
+      negate: true
 ```
 
 Configuration variables:
diff --git a/source/_components/switch.knx.markdown b/source/_components/switch.knx.markdown
index 2591f5d0af1..4452028d5e1 100644
--- a/source/_components/switch.knx.markdown
+++ b/source/_components/switch.knx.markdown
@@ -24,7 +24,6 @@ switch:
   - platform: knx
     name: KNX Switch
     address: 0/0/1
-    state_address: 0/0/3
 ```
 
 - **name** (*Optional*): A name for this devices used within Home assistant