Merge branch 'master' into driver_merge_tmp/merge_timer

# Conflicts:
#	docs/index.rst

diff --cc docs/index.rst
index c8aff538bc72244b5a4b2c83e4cc5332081e3e07,6858bdfbdcf42a65d467d86103a4ca918088cfc1..a643a17836a61da11d17dd4e28cb81f90e1bd163
--- 1/docs/index.rst
--- 2/docs/index.rst
+++ b/docs/index.rst
@@@ -97,12 -97,12 +97,12 @@@ Contents
     Wi-Fi <api/esp_wifi>
     Bluetooth <api/bt>
     Watchdogs <api/wdts>
--
 -   api/gpio
 -   api/uart
 -   api/ledc
 -   api/rmt
 +   GPIO <api/gpio>
 +   UART <api/uart>
 +   LED Control <api/ledc>
 +   Remote Control <api/rmt>
 +   Timer <api/timer>
+    Pulse Counter <api/pcnt>
     SPI Flash and Partition APIs <api/spi_flash>
     Logging <api/log>
     Non-Volatile Storage <api/nvs_flash>