Changes from PR.212 -- those already ok-ed.

Replaces "part of"  #212.
The last-but-one commit is the common ancestor with https://github.com/pp-mo/iris/tree/old_doc_changes
The top/last commit contains the changes which were 'already ok'.

Reviewer: iedwards