Merge branch 'current' of https://github.com/OttoWinter/esphomedocs i…

…nto current

esphomeyaml/components/switch/template.rst

@@ -47,7 +47,7 @@ Configuration variables:
 - **turn_on_action** (*Optional*, :ref:`Action <config-action>`): The action that should
   be performed when the remote (like Home Assistant's frontend) requests the switch to be turned on.
 - **turn_off_action** (*Optional*, :ref:`Action <config-action>`): The action that should
-  be performed when the remote (like Home Assistant's frontend) requests the switch to be turned on.
+  be performed when the remote (like Home Assistant's frontend) requests the switch to be turned off.
 - **restore_state** (*Optional*, boolean): Sets whether esphomelib should attempt to restore the
   state on boot-up and call the turn on/off actions with the recovered values. Defaults to ``yes``.
 - **id** (*Optional*, :ref:`config-id`): Manually specify the ID used for code generation.

esphomeyaml/cookbook/dual-r2-cover.rst

@@ -10,7 +10,7 @@ The following is a possible configuration file for common covers that use a moto
 Only one should be powered at a time (interlocking) to either move the cover up or down. For this
 the `Sonoff Dual R2 <https://www.itead.cc/sonoff-dual.html>`__ can be used which has two independent
 relays. Additionally this configuration allows the single button on the Sonoff to control the motion
-by cycling between: open->stop->down->stop->...
+by cycling between: open->stop->close->stop->...
 
 These kind of motors automatically stop when the end of the cover movement is reached. However,
 to be safe, this automation stops powering the motor after 1 minute of movement. In the rare case