diff --git a/source/_components/device_tracker.unifi_direct.markdown b/source/_components/device_tracker.unifi_direct.markdown
new file mode 100644
index 00000000000..92f0e38264a
--- /dev/null
+++ b/source/_components/device_tracker.unifi_direct.markdown
@@ -0,0 +1,36 @@
+---
+layout: page
+title: "Ubiquiti Unifi direct AP"
+description: "Instructions how to use a Unifi WAP as a device tracker."
+date: 2017-11-17 14:59
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: ubiquiti.png
+ha_category: Presence Detection
+ha_release: 0.58
+---
+
+
+This platform allows you to detect presence by looking at devices connected to a [UniFi AP](http://ubnt.com/unifi-ap/). This device tracker differs form [Ubiquiti Unifi WAP](https://home-assistant.io/components/device_tracker.unifi/) because it doesn't require the Unifi controller software.
+
+To use this device tracker in your installation, add the following to your `configuration.yaml` file:
+
+```yaml
+# Example configuration.yaml entry
+device_tracker:
+  - platform: unifi_direct
+    host: YOUR_AP_IP_ADDRESS
+    username: YOUR_USERNAME
+    password: YOUR_PASSWORD
+```
+
+Configuration variables:
+
+- **host** (*Required*): The hostname or IP address of your controller.
+- **username** (*Required*: The username used to connect to the AP.
+- **password** (*Required*): The password you created for the AP.
+
+See the [device tracker component page](/components/device_tracker/) for instructions how to configure the people to be tracked.
+
diff --git a/source/_components/switch.rainbird.markdown b/source/_components/switch.rainbird.markdown
index 44134393a61..5a8598c3021 100644
--- a/source/_components/switch.rainbird.markdown
+++ b/source/_components/switch.rainbird.markdown
@@ -1,46 +1,46 @@
----
-layout: page
-title: "Rain Bird Switch"
-description: "Instructions on how to integrate your Rain Bird LNK WiFi Module as Switches within Home Assistant."
-date: 2017-08-25 12:00
-sidebar: true
-comments: false
-sharing: true
-footer: true
-logo: rainbird.png
-ha_category: Hub
-ha_release: 0.57
-ha_iot_class: "Local Polling"
----
-
-This `rainbird` switch platform allows interacting with [LNK WiFi](http://www.rainbird.com/landscape/products/controllers/LNK-WiFi.htm) module of the Rain Bird Irrigation system in Home Assistant.
-
-To enable stations as switches inside Home Assistant, add the following to your `configuration.yaml` file:
-
-```yaml
-switch:
-    platform: rainbird
-    host: '1.1.1.1'
-    password: 'secretpassword'
-    sprinkler_1:
-      zone: 1
-      friendly_name: "Front sprinklers"
-      trigger_time: 20
-      scan_interval: 10
-    sprinkler_2:
-      friendly_name: "Back sprinklers"
-      zone: 2
-      trigger_time: 20
-      scan_interval: 10
-```
-
-Configuration variables:
-
-- **stickip** (*Required*): The IP address of your LNK WiFi Module.
-- **password** (*Required*): The password for accessing the module.
-- **zone** (*Required*): Station zone identifier.
-- **friendly_name** (*Optional*): Just a friendly name for the station.
-- **trigger_time** (*Required*): The default duration to sprinkle the zone.
-- **scan_interval** (*Optional*): How fast to refresh the switch.
-
-Please note that due to the implementation of the API within the LNK Module, there is a concurrency issue. For example, the Rain Bird app will give connection issues (like already a connection active).
+---
+layout: page
+title: "Rain Bird Switch"
+description: "Instructions on how to integrate your Rain Bird LNK WiFi Module as Switches within Home Assistant."
+date: 2017-08-25 12:00
+sidebar: true
+comments: false
+sharing: true
+footer: true
+logo: rainbird.png
+ha_category: Hub
+ha_release: 0.57
+ha_iot_class: "Local Polling"
+---
+
+This `rainbird` switch platform allows interacting with [LNK WiFi](http://www.rainbird.com/landscape/products/controllers/LNK-WiFi.htm) module of the Rain Bird Irrigation system in Home Assistant.
+
+To enable stations as switches inside Home Assistant, add the following to your `configuration.yaml` file:
+
+```yaml
+switch:
+    platform: rainbird
+    host: '1.1.1.1'
+    password: 'secretpassword'
+    sprinkler_1:
+      zone: 1
+      friendly_name: "Front sprinklers"
+      trigger_time: 20
+      scan_interval: 10
+    sprinkler_2:
+      friendly_name: "Back sprinklers"
+      zone: 2
+      trigger_time: 20
+      scan_interval: 10
+```
+
+Configuration variables:
+
+- **stickip** (*Required*): The IP address of your LNK WiFi Module.
+- **password** (*Required*): The password for accessing the module.
+- **zone** (*Required*): Station zone identifier.
+- **friendly_name** (*Optional*): Just a friendly name for the station.
+- **trigger_time** (*Required*): The default duration to sprinkle the zone.
+- **scan_interval** (*Optional*): How fast to refresh the switch.
+
+Please note that due to the implementation of the API within the LNK Module, there is a concurrency issue. For example, the Rain Bird app will give connection issues (like already a connection active).