Merge "Yet more documentation updates"