merge develop -D org: PR 935 (Add documentation for the various doc auto-generation jobs)
merge develop -D org: PR 938 (omero: Cpp: Document FindIce changes)
merge develop -D org

Repository: openmicroscopy/ome-documentation
Updating 35fcb00..00d1926
Merged PRs (fast-forward):
  # PR 936 sbesson 'Add documentation for OMERO & Bio-Formats 5.1 docs release jobs'
  # PR 934 hflynn 'Adding preview note to 5.1 docs for pre-release'
  # PR 932 sbesson 'Update auto-generated properties'
  # PR 930 sbesson 'Fix memory command on server upgrade page (rebased onto develop)'
  # PR 929 ximenesuk ' DropBox configuration clarification (rebased onto develop)'
  # PR 933 hflynn 'Include LDAP OR docs from Jake Carroll (rebased onto develop)'

Merged PRs:
  # PR 935 sbesson 'Add documentation for the various doc auto-generation jobs'
  # PR 938 rleigh-dundee 'omero: Cpp: Document FindIce changes'

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