merge dev_5_0 -D org: PR 778 (document new // separator in omero.fs.repo.path)
merge dev_5_0 -D org: PR 779 (Webstart template)
merge dev_5_0 -D org: PR 780 (warn that in-place ln_s can be slower for HCS)
merge dev_5_0 -D org: PR 781 (ldap over ssl instruction improvement)
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Updating 25ff911..9618b4c
Merged PRs (fast-forward):
  # PR 777 sbesson 'Remove all references to CI jobs in the official documentation (rebased onto dev_5_0)'
  # PR 774 will-moore 'Custom web login 11961'
  # PR 775 rleigh-dundee 'build: Support JENKINS_JOB'
  # PR 773 rleigh-dundee 'make: Convert variables to ant properties'
  # PR 763 rleigh-dundee 'Deprecate Ice 3.3 and note its removal for 5.1'
  # PR 770 hflynn 'Adding pyramid generation data duplication warning to in-place import'
  # PR 765 hflynn 'Making API doc links point at release version'
  # PR 764 hflynn 'Rephrasing CONTRIBUTING re: branch for PRs'
  # PR 767 rleigh-dundee 'ant: Default all properties and handle empty vars in conf.py'
  # PR 762 rleigh-dundee 'Delegate all Makefile targets to ant'
  # PR 757 hflynn 'ticket 10030 fix - contributing file for docs repo'
  # PR 749 hflynn 'Adding API doc links to OMERO docs front page'

Merged PRs:
  # PR 778 mtbc 'document new // separator in omero.fs.repo.path'
  # PR 779 aleksandra-tarkowska 'Webstart template'
  # PR 780 mtbc 'warn that in-place ln_s can be slower for HCS'
  # PR 781 aleksandra-tarkowska 'ldap over ssl instruction improvement'

Generated by OMERO-5.0-merge-daily#670 (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-daily/670/)