Merge branch 'doc/versions' into 'master'

[esp-idf] / .gitignore

diff --git a/.gitignore b/.gitignore
index 2b5352ff21b2b676b625969945b42e61cfc6c0af..84039cf1440c014f0f0e4fcc5e1fc3ad4a9ba981 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -26,14 +26,14 @@ examples/**/sdkconfig
 examples/**/sdkconfig.old
 examples/**/build
 
-#Doc build artifacts
-docs/_build/
-docs/doxygen-warning-log.txt
-docs/sphinx-warning-log.txt
-docs/sphinx-warning-log-sanitized.txt
-docs/xml/
-docs/xml_in/
-docs/man/
+# Doc build artifacts
+docs/*/_build/
+docs/*/doxygen-warning-log.txt
+docs/*/sphinx-warning-log.txt
+docs/*/sphinx-warning-log-sanitized.txt
+docs/*/xml/
+docs/*/xml_in/
+docs/*/man/
 docs/doxygen_sqlite3.db
 
 # Unit test app files
@@ -43,6 +43,11 @@ tools/unit-test-app/build
 tools/unit-test-app/builds
 tools/unit-test-app/output
 
+# IDF monitor test
+tools/test_idf_monitor/outputs
+
+TEST_LOGS
+
 # AWS IoT Examples require device-specific certs/keys
 examples/protocols/aws_iot/*/main/certs/*.pem.*
 
@@ -51,3 +56,5 @@ examples/protocols/aws_iot/*/main/certs/*.pem.*
 *.gcno
 coverage.info
 coverage_report/
+
+test_multi_heap_host