merge develop -D org: PR 799 (Linux walkthrough (rebased onto develop))
merge develop -D org: PR 812 (Remaining changes post 5.0.x job migration)
merge develop -D org

Repository: openmicroscopy/ome-documentation
Updating c848b7d..1f51804
Merged PRs (fast-forward):
  # PR 806 aleksandra-tarkowska 'Webstart template (rebased onto develop)'
  # PR 807 aleksandra-tarkowska 'ldap over ssl instruction improvement (rebased onto develop)'
  # PR 805 hflynn 'Adding contributing doc link & Zeiss link update'
  # PR 810 hflynn 'Adding example server setup page  (rebased onto develop)'

Merged PRs:
  # PR 799 manics 'Linux walkthrough (rebased onto develop)'
  # PR 812 sbesson 'Remaining changes post 5.0.x job migration'

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