Merge "Improve some parameter docs"