Merge pull request #819 from jonboulle/master

docs: several more changes
docs: collapse security into architecture