merge develop -D org: PR 799 (Linux walkthrough (rebased onto develop))
merge develop -D org

Repository: openmicroscopy/ome-documentation
Updating 1f51804..6e003c4
Merged PRs (fast-forward):
  # PR 817 ximenesuk 'Update DropBox documentation (rebased onto develop)'
  # PR 812 sbesson 'Remaining changes post 5.0.x job migration'
  # PR 816 will-moore 'Webgateway mip 5150 (rebased onto develop)'
  # PR 814 bpindelski 'Add LDAP error message explanation.'

Merged PRs:
  # PR 799 manics 'Linux walkthrough (rebased onto develop)'

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