Merge "Adding and improving function and param descriptions in HtmlFormatter"