From a68032625e42145846533d31eb7450c656885d61 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 20 Oct 2019 20:32:10 +0200
Subject: [PATCH 1/6] Update supporters.rst

---
 guides/supporters.rst | 47 +++++++++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/guides/supporters.rst b/guides/supporters.rst
index 2d5a89ee2..12cdd07d2 100644
--- a/guides/supporters.rst
+++ b/guides/supporters.rst
@@ -87,7 +87,7 @@ that have made it into the `ESPHome organization's <https://github.com/esphome>`
 Author & Main Developer
 ***********************
 
-- `Otto Winter (@OttoWinter) <https://github.com/OttoWinter>`__ - 1886 contributions
+- `Otto Winter (@OttoWinter) <https://github.com/OttoWinter>`__ - 1962 contributions
 
 Contributors
 ************
@@ -97,37 +97,46 @@ Contributors
 - `2016for (@2016for) <https://github.com/2016for>`__ - 1 contribution
 - `Pavel Pletenev (@ASMfreaK) <https://github.com/ASMfreaK>`__ - 1 contribution
 - `Aalian Khan (@AalianKhan) <https://github.com/AalianKhan>`__ - 4 contributions
+- `Alexander Leisentritt (@Alex9779) <https://github.com/Alex9779>`__ - 2 contributions
 - `Alexandre Danault (@AlexDanault) <https://github.com/AlexDanault>`__ - 1 contribution
 - `Alex Mekkering (@AlexMekkering) <https://github.com/AlexMekkering>`__ - 1 contribution
-- `Nikolay Vasilchuk (@Anonym-tsk) <https://github.com/Anonym-tsk>`__ - 4 contributions
+- `Nikolay Vasilchuk (@Anonym-tsk) <https://github.com/Anonym-tsk>`__ - 10 contributions
 - `Rutger Nijhuis (@BananaPukeh) <https://github.com/BananaPukeh>`__ - 1 contribution
 - `Bierchermuesli (@Bierchermuesli) <https://github.com/Bierchermuesli>`__ - 1 contribution
 - `David De Sloovere (@DavidDeSloovere) <https://github.com/DavidDeSloovere>`__ - 3 contributions
 - `Eenoo (@Eenoo) <https://github.com/Eenoo>`__ - 1 contribution
 - `EmmanuelLM (@EmmanuelLM) <https://github.com/EmmanuelLM>`__ - 1 contribution
 - `FrengerH (@FrengerH) <https://github.com/FrengerH>`__ - 2 contributions
+- `mr G1K (@G1K) <https://github.com/G1K>`__ - 1 contribution
 - `Jimmy Hedman (@HeMan) <https://github.com/HeMan>`__ - 5 contributions
 - `Lorenzo Ortiz (@Infinitte) <https://github.com/Infinitte>`__ - 1 contribution
 - `Johboh (@Johboh) <https://github.com/Johboh>`__ - 2 contributions
+- `Justahobby01 (@Justahobby01) <https://github.com/Justahobby01>`__ - 1 contribution
 - `Fredrik Lindqvist (@Landrash) <https://github.com/Landrash>`__ - 1 contribution
 - `Marco  (@Melkor82) <https://github.com/Melkor82>`__ - 2 contributions
 - `Mynasru (@Mynasru) <https://github.com/Mynasru>`__ - 2 contributions
 - `Erik Näsström (@Naesstrom) <https://github.com/Naesstrom>`__ - 1 contribution
 - `Jérôme W. (@RomRider) <https://github.com/RomRider>`__ - 1 contribution
+- `Paul Krischer (@SqyD) <https://github.com/SqyD>`__ - 1 contribution
 - `Teemu Mikkonen (@T3m3z) <https://github.com/T3m3z>`__ - 2 contributions
 - `Taigar2015 (@Taigar2015) <https://github.com/Taigar2015>`__ - 1 contribution
-- `Thomas Eckerstorfer (@TheEggi) <https://github.com/TheEggi>`__ - 1 contribution
+- `Thomas Eckerstorfer (@TheEggi) <https://github.com/TheEggi>`__ - 2 contributions
 - `Spencer Hachmeister (@TheHackmeister) <https://github.com/TheHackmeister>`__ - 1 contribution
 - `TheJulianJES (@TheJulianJES) <https://github.com/TheJulianJES>`__ - 2 contributions
 - `Florian Gareis (@TheZoker) <https://github.com/TheZoker>`__ - 7 contributions
+- `TomFahey (@TomFahey) <https://github.com/TomFahey>`__ - 1 contribution
 - `Rick van Hattem (@WoLpH) <https://github.com/WoLpH>`__ - 1 contribution
+- `ZabojnikM (@ZabojnikM) <https://github.com/ZabojnikM>`__ - 1 contribution
+- `Abílio Costa (@abmantis) <https://github.com/abmantis>`__ - 1 contribution
 - `Attila Darazs (@adarazs) <https://github.com/adarazs>`__ - 1 contribution
 - `Johan Bloemberg (@aequitas) <https://github.com/aequitas>`__ - 6 contributions
 - `Anders (@ahd71) <https://github.com/ahd71>`__ - 1 contribution
+- `amishv (@amishv) <https://github.com/amishv>`__ - 1 contribution
 - `Adriaan Peeters (@apeeters) <https://github.com/apeeters>`__ - 3 contributions
 - `Florian Mösch (@badbadc0ffee) <https://github.com/badbadc0ffee>`__ - 4 contributions
 - `balk77 (@balk77) <https://github.com/balk77>`__ - 2 contributions
 - `Paulus Schoutsen (@balloob) <https://github.com/balloob>`__ - 1 contribution
+- `Mauricio Bonani (@bonanitech) <https://github.com/bonanitech>`__ - 1 contribution
 - `Patrik Hermansson (@bphermansson) <https://github.com/bphermansson>`__ - 1 contribution
 - `Brandon Davidson (@brandond) <https://github.com/brandond>`__ - 14 contributions
 - `brianrjones69 (@brianrjones69) <https://github.com/brianrjones69>`__ - 1 contribution
@@ -135,7 +144,9 @@ Contributors
 - `chris-jennings (@chris-jennings) <https://github.com/chris-jennings>`__ - 1 contribution
 - `James Crook (@cooljimy84) <https://github.com/cooljimy84>`__ - 1 contribution
 - `Corban Mailloux (@corbanmailloux) <https://github.com/corbanmailloux>`__ - 5 contributions
-- `cryptelli (@cryptelli) <https://github.com/cryptelli>`__ - 2 contributions
+- `cryptelli (@cryptelli) <https://github.com/cryptelli>`__ - 3 contributions
+- `Dale Higgs (@dale3h) <https://github.com/dale3h>`__ - 1 contribution
+- `Danny Sauer (@dannysauer) <https://github.com/dannysauer>`__ - 1 contribution
 - `Dave Richer (@davericher) <https://github.com/davericher>`__ - 3 contributions
 - `Mario Di Raimondo (@diraimondo) <https://github.com/diraimondo>`__ - 1 contribution
 - `Dirk Jahnke (@dirkj) <https://github.com/dirkj>`__ - 1 contribution
@@ -148,23 +159,26 @@ Contributors
 - `erazor666 (@erazor666) <https://github.com/erazor666>`__ - 1 contribution
 - `Eric Hiller (@erichiller) <https://github.com/erichiller>`__ - 1 contribution
 - `escoand (@escoand) <https://github.com/escoand>`__ - 6 contributions
+- `Evan Coleman (@evandcoleman) <https://github.com/evandcoleman>`__ - 1 contribution
 - `Malte Franken (@exxamalte) <https://github.com/exxamalte>`__ - 2 contributions
-- `Fabian Affolter (@fabaff) <https://github.com/fabaff>`__ - 13 contributions
+- `Fabian Affolter (@fabaff) <https://github.com/fabaff>`__ - 14 contributions
 - `C W (@fake-name) <https://github.com/fake-name>`__ - 1 contribution
+- `Fredrik Erlandsson (@fredrike) <https://github.com/fredrike>`__ - 1 contribution
 - `Fritz Mueller (@fritzm) <https://github.com/fritzm>`__ - 1 contribution
 - `gitolicious (@gitolicious) <https://github.com/gitolicious>`__ - 11 contributions
 - `The Gitter Badger (@gitter-badger) <https://github.com/gitter-badger>`__ - 1 contribution
-- `Guillermo Ruffino (@glmnet) <https://github.com/glmnet>`__ - 13 contributions
+- `Guillermo Ruffino (@glmnet) <https://github.com/glmnet>`__ - 28 contributions
 - `Giorgos Logiotatidis (@glogiotatidis) <https://github.com/glogiotatidis>`__ - 1 contribution
 - `Antoine GRÉA (@grea09) <https://github.com/grea09>`__ - 3 contributions
 - `guptamp (@guptamp) <https://github.com/guptamp>`__ - 1 contribution
+- `h0-- (@h0--) <https://github.com/h0-->`__ - 1 contribution
 - `Boris Hajduk (@hajdbo) <https://github.com/hajdbo>`__ - 4 contributions
 - `Ivan Kravets (@ivankravets) <https://github.com/ivankravets>`__ - 1 contribution
 - `Jan Pieper (@janpieper) <https://github.com/janpieper>`__ - 2 contributions
 - `JbLb (@jblb) <https://github.com/jblb>`__ - 1 contribution
 - `jcullen86 (@jcullen86) <https://github.com/jcullen86>`__ - 1 contribution
 - `Joshua Dadswell (@jdads1) <https://github.com/jdads1>`__ - 1 contribution
-- `jeff-h (@jeff-h) <https://github.com/jeff-h>`__ - 1 contribution
+- `jeff-h (@jeff-h) <https://github.com/jeff-h>`__ - 2 contributions
 - `Jesse Hills (@jesserockz) <https://github.com/jesserockz>`__ - 7 contributions
 - `Jonathan Jefferies (@jjok) <https://github.com/jjok>`__ - 1 contribution
 - `John Erik Halse (@johnerikhalse) <https://github.com/johnerikhalse>`__ - 1 contribution
@@ -177,21 +191,25 @@ Contributors
 - `kimonm (@kimonm) <https://github.com/kimonm>`__ - 1 contribution
 - `Ken Davidson (@kwdavidson) <https://github.com/kwdavidson>`__ - 1 contribution
 - `Jeppe Ladefoged (@ladefoged81) <https://github.com/ladefoged81>`__ - 2 contributions
-- `Lazar Obradovic (@lobradov) <https://github.com/lobradov>`__ - 3 contributions
+- `Lazar Obradovic (@lobradov) <https://github.com/lobradov>`__ - 4 contributions
 - `Lewis Juggins (@lwis) <https://github.com/lwis>`__ - 1 contribution
 - `Marc-Antoine Courteau (@macourteau) <https://github.com/macourteau>`__ - 1 contribution
 - `Magnus (@magnusja) <https://github.com/magnusja>`__ - 1 contribution
 - `Magnus Øverli (@magnusoverli) <https://github.com/magnusoverli>`__ - 1 contribution
 - `Major Péter (@majorpeter) <https://github.com/majorpeter>`__ - 1 contribution
+- `Marcel van der Veldt (@marcelveldt) <https://github.com/marcelveldt>`__ - 2 contributions
 - `MeIchthys (@meichthys) <https://github.com/meichthys>`__ - 1 contribution
 - `meijerwynand (@meijerwynand) <https://github.com/meijerwynand>`__ - 2 contributions
 - `Pauline Middelink (@middelink) <https://github.com/middelink>`__ - 2 contributions
 - `mjoshd (@mjoshd) <https://github.com/mjoshd>`__ - 2 contributions
 - `Matt N. (@mnoorenberghe) <https://github.com/mnoorenberghe>`__ - 1 contribution
+- `Matthew Pettitt (@mpettitt) <https://github.com/mpettitt>`__ - 1 contribution
 - `mtl010957 (@mtl010957) <https://github.com/mtl010957>`__ - 7 contributions
-- `Michiel van Turnhout (@mvturnho) <https://github.com/mvturnho>`__ - 10 contributions
+- `Michiel van Turnhout (@mvturnho) <https://github.com/mvturnho>`__ - 11 contributions
 - `Niels Ulrik Andersen (@myplacedk) <https://github.com/myplacedk>`__ - 1 contribution
 - `Kevin Uhlir (@n0bel) <https://github.com/n0bel>`__ - 1 contribution
+- `Nebula (@nebula-it) <https://github.com/nebula-it>`__ - 1 contribution
+- `nicuh (@nicuh) <https://github.com/nicuh>`__ - 1 contribution
 - `Alex (@nnmalex) <https://github.com/nnmalex>`__ - 1 contribution
 - `ffabi (@norges) <https://github.com/norges>`__ - 2 contributions
 - `Greg Johnson (@notgwj) <https://github.com/notgwj>`__ - 1 contribution
@@ -213,23 +231,30 @@ Contributors
 - `r-jordan (@r-jordan) <https://github.com/r-jordan>`__ - 1 contribution
 - `Pär Stålberg (@rabbadab) <https://github.com/rabbadab>`__ - 1 contribution
 - `Florian Ragwitz (@rafl) <https://github.com/rafl>`__ - 1 contribution
+- `Robert Cambridge (@rcambrj) <https://github.com/rcambrj>`__ - 1 contribution
 - `Richard Lewis (@richrd) <https://github.com/richrd>`__ - 2 contributions
+- `rlowens (@rlowens) <https://github.com/rlowens>`__ - 1 contribution
 - `rnauber (@rnauber) <https://github.com/rnauber>`__ - 2 contributions
 - `Robbie Page (@rorpage) <https://github.com/rorpage>`__ - 1 contribution
 - `Ryan Nazaretian (@ryannazaretian) <https://github.com/ryannazaretian>`__ - 1 contribution
+- `Sergio Mayoral Martínez (@sermayoral) <https://github.com/sermayoral>`__ - 1 contribution
 - `sethcohn (@sethcohn) <https://github.com/sethcohn>`__ - 1 contribution
 - `Emanuele Tessore (@setola) <https://github.com/setola>`__ - 1 contribution
 - `Abdelkader Boudih (@seuros) <https://github.com/seuros>`__ - 1 contribution
 - `shbatm (@shbatm) <https://github.com/shbatm>`__ - 1 contribution
 - `sherbang (@sherbang) <https://github.com/sherbang>`__ - 4 contributions
 - `srg74 (@srg74) <https://github.com/srg74>`__ - 1 contribution
+- `Samuel Sieb (@ssieb) <https://github.com/ssieb>`__ - 1 contribution
+- `Levente Tamas (@tamisoft) <https://github.com/tamisoft>`__ - 1 contribution
+- `Andrew Quested (@thenameiwantedwastaken) <https://github.com/thenameiwantedwastaken>`__ - 1 contribution
+- `Thomas Klingbeil (@thomasklingbeil) <https://github.com/thomasklingbeil>`__ - 1 contribution
 - `Andrew Thompson (@thompsa) <https://github.com/thompsa>`__ - 1 contribution
 - `thubot (@thubot) <https://github.com/thubot>`__ - 1 contribution
 - `tiagofreire-pt (@tiagofreire-pt) <https://github.com/tiagofreire-pt>`__ - 1 contribution
 - `tomlut (@tomlut) <https://github.com/tomlut>`__ - 1 contribution
 - `Felix Eckhofer (@tribut) <https://github.com/tribut>`__ - 1 contribution
 - `tubalainen (@tubalainen) <https://github.com/tubalainen>`__ - 2 contributions
-- `Nad (@valordk) <https://github.com/valordk>`__ - 1 contribution
+- `Nad (@valordk) <https://github.com/valordk>`__ - 5 contributions
 - `Xuming Feng (@voicevon) <https://github.com/voicevon>`__ - 2 contributions
 - `Ian Wells (@wellsi) <https://github.com/wellsi>`__ - 1 contribution
 - `wutr (@wutr) <https://github.com/wutr>`__ - 1 contribution
@@ -237,4 +262,4 @@ Contributors
 - `Vladimir Eremin (@yottatsa) <https://github.com/yottatsa>`__ - 1 contribution
 - `YuanL.Lee (@yuanl) <https://github.com/yuanl>`__ - 1 contribution
 
-*This page was last updated Sat Oct 12 12:03:02 2019 UTC.*
+*This page was last updated Sun Oct 20 18:32:10 2019 UTC.*

From 124602fa987e48eed7d986d7f25df8d4f5b30038 Mon Sep 17 00:00:00 2001
From: amishv <41266094+amishv@users.noreply.github.com>
Date: Mon, 21 Oct 2019 16:13:36 +0530
Subject: [PATCH 2/6] fixed typo (#370)

git remote add upstream https://github.com/esphome/<REPO_NAME>.git
 # For example: git remote add upstream https://github.com/esphome/esphome.git
---
 guides/contributing.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guides/contributing.rst b/guides/contributing.rst
index 471ec453e..4459da8bd 100644
--- a/guides/contributing.rst
+++ b/guides/contributing.rst
@@ -306,7 +306,7 @@ a fork of the repository that you can modify and create git branches on.
 
     # Add "upstream" remote
     git remote add upstream https://github.com/esphome/<REPO_NAME>.git
-    # For example: git clone https://github.com/esphome/esphome.git
+    # For example: git remote add upstream https://github.com/esphome/esphome.git
 
     # For each patch, create a new branch from latest dev
     git checkout dev

From 4ed468e747d4b4661ea9c24d11462f8fa73cb877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 21 Oct 2019 21:35:56 +0300
Subject: [PATCH 3/6] Spelling and grammar fixes (#372)

---
 changelog/v1.10.0.rst               | 2 +-
 changelog/v1.11.0.rst               | 4 ++--
 changelog/v1.13.0.rst               | 2 +-
 components/api.rst                  | 2 +-
 components/light/custom.rst         | 2 +-
 components/ota.rst                  | 2 +-
 components/remote_transmitter.rst   | 2 +-
 components/sensor/ultrasonic.rst    | 2 +-
 components/stepper/index.rst        | 8 ++++----
 cookbook/arduino_port_extender.rst  | 2 +-
 cookbook/dual-r2-cover.rst          | 2 +-
 devices/sonoff_4ch.rst              | 2 +-
 devices/sonoff_s20.rst              | 2 +-
 devices/sonoff_t1_uk_3gang_v1.1.rst | 2 +-
 guides/automations.rst              | 2 +-
 guides/contributing.rst             | 2 +-
 16 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/changelog/v1.10.0.rst b/changelog/v1.10.0.rst
index d12d28d91..75b43f7a2 100644
--- a/changelog/v1.10.0.rst
+++ b/changelog/v1.10.0.rst
@@ -212,7 +212,7 @@ All changes
 - yaml: Make compatible with python 3 :yamlpr:`281`
 - docs: Fix copy/paste error in turn_off_action :docspr:`113` by :ghuser:`wutr`
 - yaml: GPIO Switch Fix restore_mode validator :yamlpr:`296` by :ghuser:`yottatsa`
-- yaml: Fixes for Python 3 Compatability :yamlpr:`297`
+- yaml: Fixes for Python 3 Compatibility :yamlpr:`297`
 - lib: Stop old template action when new one is started :libpr:`354`
 - lib: Add APDS-9960 support :libpr:`286`
 - lib: Change default update interval to 60 seconds :libpr:`356`
diff --git a/changelog/v1.11.0.rst b/changelog/v1.11.0.rst
index b1df15f34..f7324aed2 100644
--- a/changelog/v1.11.0.rst
+++ b/changelog/v1.11.0.rst
@@ -149,7 +149,7 @@ Beta Fixes
 All changes
 -----------
 
-- core: Attemp to fix the addressable flicker effect :corepr:`392` by :ghuser:`RomRider`
+- core: Attempt to fix the addressable flicker effect :corepr:`392` by :ghuser:`RomRider`
 - esphome: typing is only required for python < 3.5 :esphomepr:`341` by :ghuser:`dotlambda`
 - esphome: Fix install pillow in docker image :esphomepr:`338`
 - esphome: Allow IPv4 addresses for SNTP servers :esphomepr:`340`
@@ -222,7 +222,7 @@ All changes
 - core: Better error messages for OTA :corepr:`486`
 - esphome: Better error messages for OTA :esphomepr:`418`
 - core: Synchronize homeassistant time periodically :corepr:`485`
-- core: ESP8266 Arduino 2.5.0 Compatability :corepr:`481` (cherry-picked)
+- core: ESP8266 Arduino 2.5.0 Compatibility :corepr:`481` (cherry-picked)
 - esphome: Add Switch Interlocking :esphomepr:`411` (cherry-picked)
 - esphome: Add local mDNS responder for .local :esphomepr:`386` (cherry-picked)
 - core: Auto-Redact private information from logs :corepr:`488`
diff --git a/changelog/v1.13.0.rst b/changelog/v1.13.0.rst
index b1cb63bba..47bc0d1b4 100644
--- a/changelog/v1.13.0.rst
+++ b/changelog/v1.13.0.rst
@@ -98,7 +98,7 @@ Other notable changes:
   functions to allow easier effect creation.
 - Added a new custom component mechanism and contribution guidelines have been updated. See the
   :doc:`contributing guide </guides/contributing>` for more details.
-- :doc:`RDM6300 </components/binary_sensor/rdm6300>` now also has a ``on_tag`` trigger like the PN532.
+- :doc:`RDM6300 </components/binary_sensor/rdm6300>` now also has an ``on_tag`` trigger like the PN532.
 - :doc:`Remote Transmitter </components/remote_transmitter>` and :doc:`Remote Receiver </components/remote_receiver>`
   have gotten some new features: custom triggers and actions with templatable values.
 - Added ``output.esp8266_pwm.set_frequency`` action for dynamically changing the frequency of the ESP8266
diff --git a/components/api.rst b/components/api.rst
index dbfe43f98..e16c54a7e 100644
--- a/components/api.rst
+++ b/components/api.rst
@@ -98,7 +98,7 @@ You can repeat these steps for all your nodes, or convert them over to the new n
          });
        </script>
 
-4. Stop Home Assistant - this is necessary for the entity registry changes not to become overriden.
+4. Stop Home Assistant - this is necessary for the entity registry changes not to become overridden.
 
 5. Convert the Entity Registry file above using the "Convert Entity Registry Button", and
    override the ``.storage/core.entity_registry`` file with the new contents.
diff --git a/components/light/custom.rst b/components/light/custom.rst
index dfcabfffa..ff463c379 100644
--- a/components/light/custom.rst
+++ b/components/light/custom.rst
@@ -8,7 +8,7 @@ Please first read :doc:`/components/sensor/custom` guide,
 the same principles apply here.
 
 All internal stuff (like effects, transitions etc) is handled by the light core
-and cannot be overriden. Light outputs are only responsible for displaying some state
+and cannot be overridden. Light outputs are only responsible for displaying some state
 when asked to do so.
 
 The example below is an example of a custom light output.
diff --git a/components/ota.rst b/components/ota.rst
index 09c8ac127..0e8cb0b9f 100644
--- a/components/ota.rst
+++ b/components/ota.rst
@@ -48,7 +48,7 @@ Updating the password:
 
 Since the password is used both for compiling and uploading the regular ``esphome <file> run``
 won't work of course. This issue can be worked around by executing the operations separately
-through a ``on_boot`` trigger:
+through an ``on_boot`` trigger:
 
 .. code-block:: yaml
 
diff --git a/components/remote_transmitter.rst b/components/remote_transmitter.rst
index 629374330..fa0368bd0 100644
--- a/components/remote_transmitter.rst
+++ b/components/remote_transmitter.rst
@@ -42,7 +42,7 @@ Configuration variables:
 -  **pin** (**Required**, :ref:`config-pin`): The pin to transmit the remote signal on.
 -  **carrier_duty_percent** (*Optional*, int): How much of the time the remote is on. For example, infrared
    protocols modulate the signal using a carrier signal. Set this is ``50%`` if you're working with IR leds and to
-   ``100%`` if working with a other things like 433MHz transmitters.
+   ``100%`` if working with other things like 433MHz transmitters.
 -  **id** (*Optional*, :ref:`config-id`): Manually specify
    the ID used for code generation. Use this if you have multiple remote transmitters.
 
diff --git a/components/sensor/ultrasonic.rst b/components/sensor/ultrasonic.rst
index eb5b0f401..bc58365fb 100644
--- a/components/sensor/ultrasonic.rst
+++ b/components/sensor/ultrasonic.rst
@@ -15,7 +15,7 @@ than about two meters and may sometimes make some annoying clicking
 sounds.
 
 This sensor platform expects a sensor that can be sent a **trigger
-pulse** on a specific pin and will send out a **echo pulse** once a
+pulse** on a specific pin and will send out an **echo pulse** once a
 measurement has been taken. Because sometimes (for example if no object
 is detected) the echo pulse is never returned, this sensor also has a
 timeout option which specifies how long to wait for values.
diff --git a/components/stepper/index.rst b/components/stepper/index.rst
index abd7c3759..98bf68b93 100644
--- a/components/stepper/index.rst
+++ b/components/stepper/index.rst
@@ -274,7 +274,7 @@ lambda calls
 From :ref:`lambdas <config-lambda>`, you can call several methods on stepper motors to do some
 advanced stuff (see the full API Reference for more info).
 
-- ``set_target``: Set the target postion of the motor as an integer.
+- ``set_target``: Set the target position of the motor as an integer.
 
     .. code-block:: cpp
 
@@ -282,21 +282,21 @@ advanced stuff (see the full API Reference for more info).
         // Set the (absolute) target position to 250 steps
         id(my_stepper).set_target(250);
 
-- ``report_position``: Report the current postion as an integer.
+- ``report_position``: Report the current position as an integer.
 
     .. code-block:: cpp
 
         // Report the (absolute) current position as 250 steps
         id(my_stepper).report_position(250);
 
-- ``current_postion``: Get the current postion of the stepper as an integer.
+- ``current_position``: Get the current position of the stepper as an integer.
 
     .. code-block:: cpp
 
         int pos = id(my_stepper).current_position;
 
 
-- ``target_position``: Get the set target postion of the stepper  as an integer.
+- ``target_position``: Get the set target position of the stepper  as an integer.
 
     .. code-block:: cpp
 
diff --git a/cookbook/arduino_port_extender.rst b/cookbook/arduino_port_extender.rst
index 5231e87a6..11c3cdda7 100644
--- a/cookbook/arduino_port_extender.rst
+++ b/cookbook/arduino_port_extender.rst
@@ -71,7 +71,7 @@ When adding binary sensors the pins are configured as INPUT_PULLUP, you can use
 
 .. note::
 
-    Arduino PIN 13 usually has a LED conected to it and using it as digital input with the built in internal
+    Arduino PIN 13 usually has a LED connected to it and using it as digital input with the built in internal
     pull up might be problematic, using it as an output is preferred.
 
 To setup binary sensors, create a custom platform as below, list in braces all the sensors you want,
diff --git a/cookbook/dual-r2-cover.rst b/cookbook/dual-r2-cover.rst
index 0e2387384..257536d1d 100644
--- a/cookbook/dual-r2-cover.rst
+++ b/cookbook/dual-r2-cover.rst
@@ -25,7 +25,7 @@ for some motors.
 
     Controlling the cover to quickly (sending new open/close commands within a minute of previous commands)
     might cause unexpected behaviour (eg: cover stopping halfway). This is because the delayed relay off
-    feature is implemented using asynchronous automations. So every time a open/close command is sent a
+    feature is implemented using asynchronous automations. So every time an open/close command is sent a
     delayed relay off command is added and old ones are not removed.
 
 .. code-block:: yaml
diff --git a/devices/sonoff_4ch.rst b/devices/sonoff_4ch.rst
index c775ded36..d36094a9e 100644
--- a/devices/sonoff_4ch.rst
+++ b/devices/sonoff_4ch.rst
@@ -107,7 +107,7 @@ When you're done, it should look something like this:
 .. note::
 
     On some older 4CHs, the ``RX`` and ``TX`` pins are swapped (sometimes even the written silkscreen is
-    wrong). If your upload fails with a ``error: espcomm_upload_mem failed`` message it's most likely due
+    wrong). If your upload fails with an ``error: espcomm_upload_mem failed`` message it's most likely due
     to the pins being swapped. In that case, just swap ``RX`` and ``TX`` and try again - you won't break
     anything if they're swapped.
 
diff --git a/devices/sonoff_s20.rst b/devices/sonoff_s20.rst
index 4461ba310..8fd8683f8 100644
--- a/devices/sonoff_s20.rst
+++ b/devices/sonoff_s20.rst
@@ -109,7 +109,7 @@ It's best to just use a multimeter and double check if it's unclear.
 .. note::
 
     On some older S20s, the ``RX`` and ``TX`` pins are swapped (sometimes even the written silkscreen is
-    wrong). If your upload fails with a ``error: espcomm_upload_mem failed`` message it's most likely due
+    wrong). If your upload fails with an ``error: espcomm_upload_mem failed`` message it's most likely due
     to the pins being swapped. In that case, just swap ``RX`` and ``TX`` and try again - you won't break
     anything if they're swapped.
 
diff --git a/devices/sonoff_t1_uk_3gang_v1.1.rst b/devices/sonoff_t1_uk_3gang_v1.1.rst
index e9e353d67..c109f46ab 100644
--- a/devices/sonoff_t1_uk_3gang_v1.1.rst
+++ b/devices/sonoff_t1_uk_3gang_v1.1.rst
@@ -108,7 +108,7 @@ provided **you are not touching any live contacts**, only the wires.
 .. note::
 
     On some older T1 UK 3 Gangs, the ``RX`` and ``TX`` pins are swapped (sometimes even the written silkscreen is
-    wrong). If your upload fails with a ``error: espcomm_upload_mem failed`` message it's most likely due
+    wrong). If your upload fails with an ``error: espcomm_upload_mem failed`` message it's most likely due
     to the pins being swapped. In that case, just swap ``RX`` and ``TX`` and try again - you won't break
     anything if they're swapped.
 
diff --git a/guides/automations.rst b/guides/automations.rst
index 2dcda1d3e..9e2a2cda5 100644
--- a/guides/automations.rst
+++ b/guides/automations.rst
@@ -69,7 +69,7 @@ Woah, hold on there. Please explain what's going on here! Sure :) Let's step thr
          # ...
          id: dehumidifier1
 
-First, we have to give the dehumidifier an :ref:`config-id` so that we can
+First, we have to give the dehumidifier a :ref:`config-id` so that we can
 later use it inside our awesome automation.
 
 .. code-block:: yaml
diff --git a/guides/contributing.rst b/guides/contributing.rst
index 4459da8bd..335f0203e 100644
--- a/guides/contributing.rst
+++ b/guides/contributing.rst
@@ -202,7 +202,7 @@ RST primer:
   New pages need to be added to the ``imgtable`` list. The syntax is CSV with <PAGE NAME>, <FILE NAME> (without RST),
   <IMAGE> (in top-level images/ directory). The aspect ratio of these images should be 8:10 (or 10:8) but exceptions are possible.
 
-  Because these images are served on the main page, they need to be compressed heavily. SVGs are prefered over JPGs
+  Because these images are served on the main page, they need to be compressed heavily. SVGs are preferred over JPGs
   and JPGs should be max. 300x300px.
   If you have imagemagick installed, you can use this command to convert the thumbnail:
 

From 49104f0d4edf6b9c809c7d8f8335c85a6650de1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 21 Oct 2019 21:39:26 +0300
Subject: [PATCH 4/6] Add missing actual install step in getting started with
 Hass.io (#373)

---
 guides/getting_started_hassio.rst       |   4 ++++
 guides/images/hassio_addons_section.png | Bin 0 -> 8471 bytes
 2 files changed, 4 insertions(+)
 create mode 100644 guides/images/hassio_addons_section.png

diff --git a/guides/getting_started_hassio.rst b/guides/getting_started_hassio.rst
index 2874606d7..ffddb9878 100644
--- a/guides/getting_started_hassio.rst
+++ b/guides/getting_started_hassio.rst
@@ -25,6 +25,10 @@ https://github.com/esphome/hassio
 
 .. figure:: images/hassio_repo.png
 
+Then, scroll down and locate the ESPHome Hass.io Add-Ons section. Click on ESPHome, then INSTALL.
+
+.. figure:: images/hassio_addons_section.png
+
 After that, wait a bit until the add-on is installed (this can take a while) and
 go to the add-on page. Start the add-on and then click "Open Web UI".
 
diff --git a/guides/images/hassio_addons_section.png b/guides/images/hassio_addons_section.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb35f9d0eedc54f68652fd041b9f44e390c6dbf4
GIT binary patch
literal 8471
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

literal 0
HcmV?d00001


From bba6e904e100ebfca9889ea10cb94081f8a6c8ee Mon Sep 17 00:00:00 2001
From: mbo18 <mbo18@users.noreply.github.com>
Date: Tue, 22 Oct 2019 22:02:12 +0200
Subject: [PATCH 5/6] Update time.rst to add GPS as source (#375)

* Update time.rst to add GPS as source

Just saw that GPS was missing in the time documentation as a time source (the GPS component documentation redirect to the time page for configuration details)

* travis
---
 components/time.rst | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/components/time.rst b/components/time.rst
index 9fe41dfda..53f57c2e1 100644
--- a/components/time.rst
+++ b/components/time.rst
@@ -6,11 +6,11 @@ Time
 .. seo::
     :description: Instructions for setting up real time clock sources in ESPHome like network based time.
     :image: clock-outline.png
-    :keywords: NTP, SNTP, RTC
+    :keywords: GPS, NTP, RTC, SNTP
 
 The ``time`` component allows you to set up real time clock time sources for ESPHome.
 You can then get the current time in :ref:`lambdas <config-lambda>`.
-Currently only sntp (internet-based) and homeassistant time sources are supported.
+Currently only sntp (internet-based), homeassistant time and GPS sources are supported.
 
 Home Assistant Time Source
 --------------------------
@@ -61,6 +61,29 @@ Configuration variables:
 - **on_time** (*Optional*, :ref:`Automation <automation>`): Automation to run at specific intervals using
   a cron-like syntax. See :ref:`time-on_time`.
 
+GPS Time Source
+---------------
+
+You first need to set up the :doc:`GPS </components/gps>` component.
+
+.. code-block:: yaml
+
+    # Example configuration entry
+    time:
+      - platform: gps
+        id: gps_time
+
+Configuration variables:
+
+- **id** (*Optional*, :ref:`config-id`): Specify the ID of the time for use in lambdas.
+- **timezone** (*Optional*, string): Manually tell ESPHome 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)
+  or the simpler `TZ database name <https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>`__ in the form
+  <Region>/<City>. ESPHome tries to automatically infer the timezone string based on the timezone of the computer
+  that is running ESPHome, but this might not always be accurate.
+- **on_time** (*Optional*, :ref:`Automation <automation>`): Automation to run at specific intervals using
+  a cron-like syntax. See :ref:`time-on_time`.
+
 Use In Lambdas
 --------------
 

From 89210f9d59c272c445372f4ded87a6d8931207e7 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 22 Oct 2019 22:59:42 +0200
Subject: [PATCH 6/6] Remove reference to  main.cpp

---
 guides/faq.rst | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/guides/faq.rst b/guides/faq.rst
index 64898b746..23dccf138 100644
--- a/guides/faq.rst
+++ b/guides/faq.rst
@@ -27,9 +27,7 @@ Tips for using ESPHome
 
        esphome livingroom.yaml logs
 
-4. You can always find the source ESPHome generates under ``<NODE_NAME>/src/main.cpp``. It's even
-   possible to edit anything outside of the ``AUTO GENERATED CODE BEGIN/END`` lines for creating
-   :doc:`custom sensors </components/sensor/custom>`.
+4. You can always find the source ESPHome generates under ``<NODE_NAME>/src/``.
 
 5. You can view the full list of command line interface options here: :doc:`/guides/cli`