Merge "Fix Line Length etc for existing docs"