Merge "Minor tidy-up in plugin documentation"