Reword DropBox config a little.
Whitespace change.
Include LDAP OR docs from Jake Carroll
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)
Update auto-generated properties

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

Generated by OMERO-5.1-latest-docs-autogen#36 (http://ci.openmicroscopy.org/job/OMERO-5.1-latest-docs-autogen/36/)