diff --git a/docs/esp8266_contents.rst b/docs/esp8266_contents.rst
deleted file mode 100644
index 7c35460bd955225c685c0444610501ba9fc0ea2f..0000000000000000000000000000000000000000
--- a/docs/esp8266_contents.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-MicroPython documentation contents
-==================================
-
-.. toctree::
-
-    esp8266/quickref.rst
-    esp8266/general.rst
-    esp8266/tutorial/index.rst
-    library/index.rst
-    reference/index.rst
-    genrst/index.rst
-    license.rst
diff --git a/docs/esp8266_index.rst b/docs/esp8266_index.rst
index 8654c43aa072257ea88530c06c7a35ac4a2f4972..d332348973efd66bbd934b270c6bb3efa877376f 100644
--- a/docs/esp8266_index.rst
+++ b/docs/esp8266_index.rst
@@ -4,10 +4,12 @@ MicroPython documentation and references
 .. toctree::
 
     esp8266/quickref.rst
+    esp8266/general.rst
+    esp8266/tutorial/index.rst
     library/index.rst
+    reference/index.rst
     genrst/index.rst
     license.rst
-    esp8266_contents.rst
 
 Indices and tables
 ==================
diff --git a/docs/pyboard_contents.rst b/docs/pyboard_contents.rst
deleted file mode 100644
index 658dd366f2028d9565481cca88e29fa23bc3ecf9..0000000000000000000000000000000000000000
--- a/docs/pyboard_contents.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-MicroPython documentation contents
-==================================
-
-.. toctree::
-
-    pyboard/quickref.rst
-    pyboard/general.rst
-    pyboard/tutorial/index.rst
-    library/index.rst
-    reference/index.rst
-    pyboard/hardware/index.rst
-    genrst/index.rst
-    license.rst
-
diff --git a/docs/pyboard_index.rst b/docs/pyboard_index.rst
index 4caa4cc88339dccaa57820a00f6fa05efd60b15a..ea82f89d610baa628cc5a39310fff6869ac1766f 100644
--- a/docs/pyboard_index.rst
+++ b/docs/pyboard_index.rst
@@ -6,11 +6,11 @@ MicroPython documentation and references
     pyboard/quickref.rst
     pyboard/general.rst
     pyboard/tutorial/index.rst
-    library/index.rst
     pyboard/hardware/index.rst
+    library/index.rst
+    reference/index.rst
     genrst/index.rst
     license.rst
-    pyboard_contents.rst
 
 Indices and tables
 ==================
diff --git a/docs/topindex.html b/docs/topindex.html
index f32f3cea6b4cd15fc7cc09376372e0d10b92a3bb..5e4cc2b40d54d9daa4aaa11775499df0a82fba61 100644
--- a/docs/topindex.html
+++ b/docs/topindex.html
@@ -88,7 +88,7 @@
     </td>
     <td width="40%" style="padding-left:2em;">
       <p class="biglink">
-        <a class="biglink" href="{{ pathto(port + "_contents") }}">Table of contents</a><br/>
+        <a class="biglink" href="{{ pathto(port + "_index") }}">Table of contents</a><br/>
         <span class="linkdescr">a list of all sections and subsections</span>
       </p>
     </td></tr>
diff --git a/docs/unix_contents.rst b/docs/unix_contents.rst
deleted file mode 100644
index 8c5a586b298d54d62740edbb6a258b15429126c8..0000000000000000000000000000000000000000
--- a/docs/unix_contents.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-MicroPython documentation contents
-==================================
-
-.. toctree::
-
-    library/index.rst
-    reference/index.rst
-    genrst/index.rst
-    license.rst
diff --git a/docs/unix_index.rst b/docs/unix_index.rst
index 7fa1753c2375650e1a32ecf1cdd3bb301bfa1b88..07f245a30d58cd5a65a16f2d48558f446c668aac 100644
--- a/docs/unix_index.rst
+++ b/docs/unix_index.rst
@@ -4,9 +4,9 @@ MicroPython documentation and references
 .. toctree::
 
     library/index.rst
+    reference/index.rst
     genrst/index.rst
     license.rst
-    unix_contents.rst
 
 Indices and tables
 ==================
diff --git a/docs/wipy_contents.rst b/docs/wipy_contents.rst
deleted file mode 100644
index 0e50a7c6ee6585b079514b12d07c71ccc3fc9d69..0000000000000000000000000000000000000000
--- a/docs/wipy_contents.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-MicroPython documentation contents
-==================================
-
-.. toctree::
-
-    wipy/quickref.rst
-    wipy/general.rst
-    wipy/tutorial/index.rst
-    library/index.rst
-    reference/index.rst
-    genrst/index.rst
-    license.rst
diff --git a/docs/wipy_index.rst b/docs/wipy_index.rst
index a390aecb1eafac51fda042955bc691f4db1d5102..7edba8f5453498ea8ffc99ba76e8fb2d15c3268d 100644
--- a/docs/wipy_index.rst
+++ b/docs/wipy_index.rst
@@ -7,9 +7,9 @@ MicroPython documentation and references
     wipy/general.rst
     wipy/tutorial/index.rst
     library/index.rst
+    reference/index.rst
     genrst/index.rst
     license.rst
-    wipy_contents.rst
 
 Indices and tables
 ==================