FLUID-4323: Remove any asides from the article; reposition TOC
Merge remote-tracking branch 'acheetham/FLUID-4323-demo' into demo

* acheetham/FLUID-4323-demo:
  FLUID-4323: Remove any asides from the article; reposition TOC