Fixes for the reported sphinx errors 

Just a resync PR before Basic Usage uploads