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 be161c6..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)'
  # PR 743 sbesson 'Propose redesign of OMERO and Bio-Formats 5.0 CI jobs'
  # PR 809 sbesson 'Travis fix (rebased onto develop)'
  # PR 802 snoopycrimecop 'Update index.txt'
  # PR 801 sbesson 'Add Edit on Github button (rebased onto develop)'
  # PR 783 mtbc 'document new // separator in omero.fs.repo.path (rebased from dev_5_0)'
  # PR 782 will-moore 'Custom web login 11961 (rebased onto develop)'
  # PR 795 manics 'Root password reset command (rebased onto develop)'
  # PR 786 mtbc 'warn that in-place ln_s can be slower for HCS (rebased from dev_5_0)'
  # PR 797 ximenesuk 'Add DropBox Windows requirements'
  # PR 793 hflynn 'Ice35 support for Windows (rebased to develop)'
  # PR 791 hflynn 'Limitations update for 5.0.2 (rebased onto develop)'
  # PR 792 bpindelski 'Remove repetition of the word "files" (rebased onto develop)'
  # PR 787 manics 'Add code-signing documentation (rebased onto develop)'
  # PR 776 sbesson 'Remove all references to CI jobs in the official documentation'
  # PR 772 rleigh-dundee 'make: Convert variables to ant properties'
  # PR 771 hflynn 'Adding pyramid generation data duplication warning to in-place import (rebased onto develop)'
  # PR 760 rleigh-dundee 'Make Ice 3.4 the minimum supported version'
  # PR 768 hflynn 'Rephrasing CONTRIBUTING re: branch for PRs (rebased onto develop)'
  # PR 769 hflynn 'Making API doc links point at release version (rebased onto develop)'
  # PR 766 rleigh-dundee 'ant: Default all properties and handle empty vars in conf.py'
  # PR 758 hflynn 'Adding API doc links to OMERO docs front page (rebased onto develop)'
  # PR 759 hflynn 'ticket 10030 fix - contributing file for docs repo (rebased onto develop)'
  # PR 761 rleigh-dundee 'Delegate all Makefile targets to ant'

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#260 (http://ci.openmicroscopy.org/job/OMERO-5.1-merge-push/260/)