DOC: More sensible CNI link text.
New version of the docs
Merge branch 'temp-branch' into gh-pages