Merge with master; merge Doxygen config

diff --cc docs/Doxyfile
index d5970ee5e908aec30e00df458dcc8ba5d9c1ed2a,0e4549a10f87913d54c6cce9d0284b5c07ac691a..1f53a85931bee33058278247da41fc844d9986a5
--- 1/docs/Doxyfile
--- 2/docs/Doxyfile
+++ b/docs/Doxyfile
@@@ -1,8 -1,12 +1,14 @@@
  PROJECT_NAME = "ESP32 Programming Guide"
  
- INPUT = ../components/esp32/include/esp_wifi.h ../components/driver/include/driver ../components/bt/include \
-               ../components/nvs_flash/include ../components/log/include ../components/vfs/include \
-               ../components/esp32/include/esp_int_wdt.h ../components/esp32/include/esp_task_wdt.h
+ INPUT = ../components/esp32/include/esp_wifi.h \
+       ../components/driver/include/driver \
+       ../components/bt/include \
+       ../components/nvs_flash/include \
+       ../components/log/include \
+       ../components/vfs/include \
 -      ../components/spi_flash/include
++      ../components/spi_flash/include \
++      ../components/esp32/include/esp_int_wdt.h \
++      ../components/esp32/include/esp_task_wdt.h
  
  WARN_NO_PARAMDOC      = YES
  

diff --cc docs/index.rst
Simple merge