diff --git a/esphomeyaml/components/sensor/index.rst b/esphomeyaml/components/sensor/index.rst
index 9baac52ce..90b4654dc 100644
--- a/esphomeyaml/components/sensor/index.rst
+++ b/esphomeyaml/components/sensor/index.rst
@@ -86,7 +86,7 @@ sensor values before they’re sent to Home Assistant. This is for example
 useful if you want to apply some average over the last few values to
 relief Home Assistant’s state machine and keep the history graphs in the
 front-end a bit more clean. More sophisticated filters should be done
-with Home Assistant `filter
+with Home Assistant's `filter
 sensor <https://www.home-assistant.io/components/sensor.filter/>`__.
 
 .. code:: yaml
diff --git a/esphomeyaml/devices/sonoff.rst b/esphomeyaml/devices/sonoff.rst
index 1796906b2..2a430efa5 100644
--- a/esphomeyaml/devices/sonoff.rst
+++ b/esphomeyaml/devices/sonoff.rst
@@ -33,8 +33,8 @@ Sonoff RF
     GPIO0, Button (inverted),
     GPIO12, Relay and Red LED,
     GPIO13, Green LED (inverted),
-    GPIO1, UART RX pin (for external sensors)
-    GPIO3, UART TX pin (for external sensors)
+    GPIO1, UART TX pin (for external sensors)
+    GPIO3, UART RX pin (for external sensors)
     GPIO4, Optional sensor
     GPIO14, Optional sensor
 
@@ -48,8 +48,8 @@ Sonoff SV
     GPIO12, Relay and Red LED,
     GPIO13, Green LED (inverted),
     GPIO17, Analog Input,
-    GPIO1, UART RX pin (for external sensors)
-    GPIO3, UART TX pin (for external sensors)
+    GPIO1, UART TX pin (for external sensors)
+    GPIO3, UART RX pin (for external sensors)
     GPIO4, Optional sensor
     GPIO5, Optional sensor
     GPIO14, Optional sensor
@@ -63,8 +63,8 @@ Sonoff TH10/TH16
     GPIO0, Button (inverted),
     GPIO12, Relay and Red LED,
     GPIO13, Green LED (inverted),
-    GPIO1, UART RX pin (for external sensors)
-    GPIO3, UART TX pin (for external sensors)
+    GPIO1, UART TX pin (for external sensors)
+    GPIO3, UART RX pin (for external sensors)
     GPIO4, Optional sensor
     GPIO14, Optional sensor
 
@@ -134,8 +134,8 @@ Slampher
     GPIO0, Button (inverted),
     GPIO3, Relay and Red LED,
     GPIO13, Blue LED (inverted),
-    GPIO1, UART RX pin (for external sensors)
-    GPIO3, UART TX pin (for external sensors)
+    GPIO1, UART TX pin (for external sensors)
+    GPIO3, UART RX pin (for external sensors)
 
 Sonoff Touch
 ------------
@@ -145,8 +145,8 @@ Sonoff Touch
     GPIO0, Button (inverted),
     GPIO12, Relay and Red LED,
     GPIO13, Blue LED (inverted),
-    GPIO1, UART RX pin (for external sensors)
-    GPIO3, UART TX pin (for external sensors)
+    GPIO1, UART TX pin (for external sensors)
+    GPIO3, UART RX pin (for external sensors)
 
 Sonoff LED
 ----------
@@ -210,8 +210,8 @@ Sonoff T1 1CH, 2CH, 3CH
     GPIO5, Relay 2 and Blue LED,
     GPIO10, Button 3 (inverted),
     GPIO4, Relay 3 and Blue LED,
-    GPIO1, UART RX pin (for external sensors)
-    GPIO3, UART TX pin (for external sensors)
+    GPIO1, UART TX pin (for external sensors)
+    GPIO3, UART RX pin (for external sensors)
 
 Arilux LC10, Magic Home
 -----------------------
@@ -224,8 +224,8 @@ Arilux LC10, Magic Home
     GPIO12, Blue Channel,
     GPIO13, White Channel,
 
-    GPIO1, UART RX pin (for external sensors)
-    GPIO3, UART TX pin (for external sensors)
+    GPIO1, UART TX pin (for external sensors)
+    GPIO3, UART RX pin (for external sensors)
 
 See :doc:`/esphomeyaml/components/light/rgbw` for controlling the lights together with
 :doc:`/esphomeyaml/components/output/esp8266_pwm`.
@@ -242,8 +242,8 @@ Arilux LC01
     GPIO13, Blue Channel,
     GPIO14, White Channel,
 
-    GPIO1, UART RX pin (for external sensors)
-    GPIO3, UART TX pin (for external sensors)
+    GPIO1, UART TX pin (for external sensors)
+    GPIO3, UART RX pin (for external sensors)
 
 See :doc:`/esphomeyaml/components/light/rgbw` for controlling the lights together with
 :doc:`/esphomeyaml/components/output/esp8266_pwm`.
@@ -261,8 +261,8 @@ Arilux LC11
     GPIO13, Cold White Channel,
     GPIO12, Warm White Channel,
 
-    GPIO1, UART RX pin (for external sensors)
-    GPIO3, UART TX pin (for external sensors)
+    GPIO1, UART TX pin (for external sensors)
+    GPIO3, UART RX pin (for external sensors)
 
 See :doc:`/esphomeyaml/components/light/rgbww` for controlling the lights together with
 :doc:`/esphomeyaml/components/output/esp8266_pwm`.