Merge pull request #933 from hflynn/rebased/develop/ldap-OR-clause

Include LDAP OR docs from Jake Carroll (rebased onto develop)
Merge pull request #929 from ximenesuk/rebased/develop/dropbox-tweak

 DropBox configuration clarification (rebased onto develop)
Merge pull request #930 from sbesson/rebased/develop/memory_emergency_pr

Fix memory command on server upgrade page (rebased onto develop)
Update auto-generated properties

Repository: openmicroscopy/ome-documentation
Already up-to-date.

Generated by OMERO-5.1-latest-docs-autogen#37 (http://ci.openmicroscopy.org/job/OMERO-5.1-latest-docs-autogen/37/)
Adding preview note to 5.1 docs for pre-release
Unifying notes into one warning box
Merge pull request #932 from snoopycrimecop/develop/latest/autogen

Update auto-generated properties
Add documentation for the various doc auto-generation jobs
Merge pull request #934 from hflynn/5-1-note

Adding preview note to 5.1 docs for pre-release
Add documentation for OMERO & Bio-Formats 5.1 docs release jobs
Merge pull request #936 from sbesson/5.1-release

Add documentation for OMERO & Bio-Formats 5.1 docs release jobs
merge develop -D org: PR 935 (Add documentation for the various doc auto-generation jobs)
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'

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