merge develop -Dorg -Ssuccess-only: PR 938 (omero: Cpp: Document FindIce changes)
merge develop -Dorg -Ssuccess-only: PR 940 (Tidying a couple of sysadmin docs issues from my absence)
merge develop -Dorg -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Updating 00d1926..c8357b1
Previously merged:
  # PR 939 bpindelski 'Remove long subparagraphs.'
  # PR 935 sbesson 'Add documentation for the various doc auto-generation jobs'

Merged PRs:
  # PR 938 rleigh-dundee 'omero: Cpp: Document FindIce changes'
  # PR 940 hflynn 'Tidying a couple of sysadmin docs issues from my absence'

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