Deconflict #3310 and correct the description
Land todb-r7#7, fix indents and grammar