Merge branch '4.4' into 5.3

* 4.4:
  Restore the contents directive
  Fix bugs seen by `_build/build.php` diagnostics in 4.4

Author: javiereguiluz

index.rst

@@ -71,9 +71,9 @@ Components
 .. toctree::
     :hidden:
 
-    components/index
+    components/
 
-Read the :doc:`Components </components/index>` documentation.
+Read the :doc:`Components </components/>` documentation.
 
 Reference Documents
 -------------------