diff --git a/source/_components/binary_sensor.ihc.markdown b/source/_components/binary_sensor.ihc.markdown
index b05f2e3e8e1..b822dcfb1a1 100644
--- a/source/_components/binary_sensor.ihc.markdown
+++ b/source/_components/binary_sensor.ihc.markdown
@@ -29,19 +29,22 @@ be found in the IHC project and setup as binary sensors:
 
 ## {% linkable_title Manual configuration %}
 
-To manually configure IHC Binary Sensors
-insert this section in your configuration:
+To manually configure IHC Binary Sensors insert the "binary_sensors" section in your IHC configuration:
 
 ```yaml
-binary_sensor:
-  - platform: ihc
+# Example configuration.yaml entry
+ihc:
+  - url: 'http://192.168.1.3'
+    username: YOUR_USERNAME
+    password: YOUR_PASSWORD
+    info: true
     binary_sensors:
       - id: 12345
-        name: mysensor
-        type: opening
-        inverting: True
-      - id: 12346
-           ...
+        name: switch_front_door
+        inverting: false
+        note: Magnet contact
+        position: Switch in door
+        type: door
 ```
 
 {% configuration %}
@@ -60,7 +63,7 @@ binary_sensors:
       type: boolean
       default: false
     name:
-      description: The name of the component
+      description: The name of the sensor.
       required: false
       type: string
     type:
@@ -70,6 +73,14 @@ binary_sensors:
         for available types.
       required: false
       type: string
+    note:
+      description: Descriptive note
+      required: false
+      type: string
+    position:
+      description: Where is it placed
+      required: false
+      type: string
 {% endconfiguration %}
 
 The resource id should be an id of a boolean IHC resource. For more information
diff --git a/source/_components/ihc.markdown b/source/_components/ihc.markdown
index 5fca84708fe..2ec4eaaabbb 100644
--- a/source/_components/ihc.markdown
+++ b/source/_components/ihc.markdown
@@ -21,12 +21,16 @@ An `ihc` section must be present in the `configuration.yaml` file and contain
 the following options:
 
 ```yaml
-# Example configuration.yaml entry
+# Example configuration.yaml entry for two IHC controllers
 ihc:
-   url: http://192.168.1.3
-   username: YOUR_USERNAME
-   password: YOUR_PASSWORD
-   info: true
+  - url: 'http://192.168.1.3'
+    username: YOUR_USERNAME
+    password: YOUR_PASSWORD
+    info: true 
+  - url: 'http://192.168.1.4'
+    username: YOUR_USERNAME2
+    password: YOUR_PASSWORD2
+    info: true 
 ```
 
 {% configuration %}
diff --git a/source/_components/light.ihc.markdown b/source/_components/light.ihc.markdown
index 22a7b2cf60b..9d2d724b86e 100644
--- a/source/_components/light.ihc.markdown
+++ b/source/_components/light.ihc.markdown
@@ -27,18 +27,19 @@ project and setup as light devices:
 - Wireless mobile dimmer
 - Dataline lamp outlet
 
-To manually configure IHC lights insert this section in your configuration:
+To manually configure IHC lights insert the "lights" section in 
+your IHC configuration:
 
 ```yaml
-light:
-  - platform: ihc
+ihc:
+  - url: 'http://192.168.1.3'
+    username: YOUR_USERNAME2
+    password: YOUR_PASSWORD2
+    info: true 
     lights:
       - id: 12345
         name: tablelight
-        dimmable: True
-      - id: 12346
-        name: anotherlight
-      ...
+      - id: 23432
 ```
 
 {% configuration %}
@@ -48,7 +49,7 @@ lights:
   type: map
   keys:
     dimmable:
-      description: Set to True if the IHC resource is a light level
+      description: Set to True if the IHC resource is a light level.
       required: false
       type: boolean
       default: false
@@ -60,6 +61,14 @@ lights:
       description: The name of the component
       required: false
       type: string
+    note:
+      description: Descriptive note.
+      required: false
+      type: string
+    position:
+      description: Where it is placed.
+      required: false
+      type: string
 {% endconfiguration %}
 
 In the example above 12345 is ihc resource id and "tablelight" is the name.
diff --git a/source/_components/sensor.ihc.markdown b/source/_components/sensor.ihc.markdown
index 6e2c2885fb4..9127ac13b35 100644
--- a/source/_components/sensor.ihc.markdown
+++ b/source/_components/sensor.ihc.markdown
@@ -23,22 +23,28 @@ project and setup as sensors:
 - Dataline Humidity - Will insert 1 humidity and 2 temperature sensors (calculated dewpoint)
 - Dataline Lux - will insert 1 light and 1 temperature sensor
 
-To manually configure IHC sensors insert this section:
+To manually configure IHC sensors insert the "sensors"
+section in your IHC configuration:
 
 ```yaml
-sensor:
-  - platform: ihc
+ihc:
+  - url: 'http://192.168.1.3'
+    username: YOUR_USERNAME2
+    password: YOUR_PASSWORD2
+    info: true 
     sensors:
       - id: 12345
-        name: 'mysensor'
+        name: Temperatur_living_room
         unit_of_measurement: '°C'
-      - id: 12346
+        note: Floor and wall temp. 
+        position: On wall between windows
+      - id: 23456
         ...
 ```
 
 {% configuration %}
 sensors:
-  description: List of sensors to setup manually
+  description: List of sensors to setup manually.
   required: false
   type: map
   keys:
@@ -47,13 +53,21 @@ sensors:
       required: true
       type: integer
     name:
-      description: The name of the component
+      description: The name of the sensor.
       required: false
       type: string
     unit_of_measurement:
       description: Defines the unit of measurement of the sensor, if any.
       required: false
       type: string
+    note:
+      description: Descriptive note.
+      required: false
+      type: string
+    position:
+      description: Where it is placed.
+      required: false
+      type: string
 {% endconfiguration %}
 
 The resource id should be a IHC float resource. For more information about IHC
diff --git a/source/_components/switch.ihc.markdown b/source/_components/switch.ihc.markdown
index 5f70b909cf7..4d0125807d6 100644
--- a/source/_components/switch.ihc.markdown
+++ b/source/_components/switch.ihc.markdown
@@ -24,17 +24,18 @@ project and setup as switch devices:
 - Mobile wireless relay
 - Dataline plug outlet
 
-To manually configure IHC switches insert this section in your configuration:
+To manually configure IHC switches insert the "switches" section in your
+IHC configuration:
 
 ```yaml
-switch:
-    - platform: ihc
-    auto_setup: True
+ihc:
+  - url: 'http://192.168.1.3'
+    username: YOUR_USERNAME
+    password: YOUR_PASSWORD
+    info: true 
     switches:
-        - id: 12345
-          name: myswitch
-        - id: 12346
-        ....
+      - id: 12345
+      - id: 12346
 ```
 
 {% configuration %}
@@ -51,6 +52,14 @@ switches:
       description: The name of the component
       required: false
       type: string
+    note:
+      description: Descriptive note.
+      required: false
+      type: string
+    position:
+      description: Where it is placed.
+      required: false
+      type: string
 {% endconfiguration %}
 
 The resource id should be a boolean resource (On/Off).