Merge branch 'bugfix/example_index' into 'master'

fix example index Fix duplicate index 14 example and the index in some rst files. See merge request !270
espressif · Dec 2, 2016 · f394632 · f394632
2 parents bd20288 + 667d0ef
commit f394632
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 2 deletions.
diff --git a/docs/api/esp_eth.rst b/docs/api/esp_eth.rst
@@ -4,7 +4,7 @@ ETHERNET
 Application Example
 -------------------
 
-ethernet example: `examples/14_ethernet <https://github.com/espressif/esp-idf/tree/master/examples/14_ethernet>`_.
+ethernet example: `examples/17_ethernet <https://github.com/espressif/esp-idf/tree/master/examples/17_ethernet>`_.
 
 API Reference
 -------------

diff --git a/docs/api/pcnt.rst b/docs/api/pcnt.rst
@@ -9,7 +9,7 @@ The PCNT (Pulse Counter) module is designed to count the number of rising and/or
 Application Example
 -------------------
 
-Pulse counter with control signal and event interrupt example: `examples/12_pcnt <https://github.com/espressif/esp-idf/tree/master/examples/12_pcnt>`_.
+Pulse counter with control signal and event interrupt example: `examples/16_pcnt <https://github.com/espressif/esp-idf/tree/master/examples/16_pcnt>`_.
 
 API Reference
 -------------

diff --git a/examples/14_ethernet/Makefile → examples/17_ethernet/Makefile b/examples/14_ethernet/Makefile → examples/17_ethernet/Makefile
diff --git a/examples/14_ethernet/README.md → examples/17_ethernet/README.md b/examples/14_ethernet/README.md → examples/17_ethernet/README.md
diff --git a/examples/14_ethernet/main/component.mk → examples/17_ethernet/main/component.mk b/examples/14_ethernet/main/component.mk → examples/17_ethernet/main/component.mk
diff --git a/examples/14_ethernet/main/ethernet_main.c → examples/17_ethernet/main/ethernet_main.c b/examples/14_ethernet/main/ethernet_main.c → examples/17_ethernet/main/ethernet_main.c