Updating docs to reflect removing support for short circuiting in v2.0
release. Also modified comment in configure function.
Merge branch 'feature-docs' into development