Merge "Tidy up buck documentation"