Update sphinx conf and Makefile