merge the 1.1 updated documentation into docs templates

Need the updated documentation with 1.1 to be merged into the main docs.

Mark: this is assigned to you because you have supplied it, but Amy needs some guidance on how to handle the merge. The problem is that your generated docs make changes to the section of docs that had been previously edited and are part of the 1.0 docs.

Guidance needed: can you either generate just the 1.1 changed set, or let us know that it'll have to be manually merged. Also, how will we handle this going forward.