Merge "Doc change: fixing links and code indents" into honeycomb