Some bits of docs
Re-do 977adab33bcc8fd5071773705e7239ec708e3bb3 which wasn't merged OK due to renaming