diff --git a/esphomeyaml/components/sensor/wifi_signal.rst b/esphomeyaml/components/sensor/wifi_signal.rst
index 4f9ecb006..c7e2cff2a 100644
--- a/esphomeyaml/components/sensor/wifi_signal.rst
+++ b/esphomeyaml/components/sensor/wifi_signal.rst
@@ -26,7 +26,7 @@ measured in decibels. These values are always negative and the closer they are t
 Configuration variables:
 ------------------------
 
-- **name** (**Required**, string): The name of the hall effect sensor.
+- **name** (**Required**, string): The name of the WiFi signal sensor.
 - **update_interval** (*Optional*, :ref:`config-time`): The interval
   to check the sensor. Defaults to ``15s``. See :ref:`sensor-default_filter`.
 - **id** (*Optional*, :ref:`config-id`): Manually specify the ID used for code generation.
diff --git a/esphomeyaml/components/time.rst b/esphomeyaml/components/time.rst
index 7b8ea1dd5..bab14df10 100644
--- a/esphomeyaml/components/time.rst
+++ b/esphomeyaml/components/time.rst
@@ -25,7 +25,7 @@ Configuration variables:
 
 - **id** (**Required**, :ref:`config-id`): Specify the ID of the time for use in lambdas.
 - **timezone** (*Optional*, string): Manually tell esphomelib what timezone to use with `this format
-  <https://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html>`__ (warning: the format is quite complicated).
+  <https://www.gnu.org/software/libc/manual/html_node/TZ-Variable.html>`__ (warning: the format is quite complicated) or the simpler `TZ database name <https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>`__ in the form <Region>/<City>.
   esphomeyaml tries to automatically infer the timezone string based on the timezone of the computer that is running
   esphomeyaml, but this might not always be accurate.
 - **servers** (*Optional*, list of strings): Choose up to 3 NTP servers that are used for the clock source.
diff --git a/esphomeyaml/devices/sonoff.rst b/esphomeyaml/devices/sonoff.rst
index 429bab1e1..47967a361 100644
--- a/esphomeyaml/devices/sonoff.rst
+++ b/esphomeyaml/devices/sonoff.rst
@@ -286,6 +286,16 @@ Shelly 1
     GPIO4, Relay,
     GPIO5, SW Input,
 
+Shelly 2
+--------
+
+.. pintable::
+
+    GPIO4, Relay #1,
+    GPIO5, Relay #2,
+    GPIO12, SW Input #1,
+    GPIO14, SW Input #2,
+    
 See Also
 --------