Merge the two Sphinx projects together.
Merge branch 'merge_docs'
1150605 - fix error in docker recipe
Merge pull request #45 from beav/fix-typo

1150605 - fix error in docker recipe