updating jquery text
small fix
Merge pull request #1029 from aleksandra-tarkowska/csrf

csrf protection
Fixing use of :option: for new sphinx
Merge pull request #1033 from hflynn/sphinx-fix-dev_5

Fixing use of :option: for new sphinx (dev_5_0)
merge dev_5_0 -Dorg -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Updating 6dd7ecb..ff78db9
Previously merged:
  # PR 1033 hflynn 'Fixing use of :option: for new sphinx (dev_5_0)'
  # PR 1029 aleksandra-tarkowska 'csrf protection'
  # PR 1030 hflynn 'Updating build no. for linux walkthrough'
  # PR 1028 snoopycrimecop 'Update auto-generated properties'
  # PR 1026 hflynn 'Adding note about openjdk8 not being supported'

Generated by OME-5.0-merge-push#265 (http://ci.openmicroscopy.org/job/OME-5.0-merge-push/265/)