Merge branch 'feature/add_doc_about_app_desc_t' into 'master'

author Angus Gratton <angus@espressif.com>

Mon, 24 Jun 2019 10:40:02 +0000 (18:40 +0800)

committer Angus Gratton <angus@espressif.com>

Mon, 24 Jun 2019 10:40:02 +0000 (18:40 +0800)
author Angus Gratton <angus@espressif.com>
Mon, 24 Jun 2019 10:40:02 +0000 (18:40 +0800)
committer Angus Gratton <angus@espressif.com>
Mon, 24 Jun 2019 10:40:02 +0000 (18:40 +0800)
diff --cc docs/Doxyfile
Simple merge
diff --cc docs/en/api-reference/system/ota.rst
Simple merge
author	Angus Gratton <angus@espressif.com>
	Mon, 24 Jun 2019 10:40:02 +0000 (18:40 +0800)
committer	Angus Gratton <angus@espressif.com>
	Mon, 24 Jun 2019 10:40:02 +0000 (18:40 +0800)
		1	2
docs/Doxyfile	patch \|	diff1 \|	diff2 \|	blob \| history
docs/en/api-reference/system/ota.rst	patch \|	diff1 \|	diff2 \|	blob \| history