adding INDEX_TEMPLATE and TEMPLATE_DIRS to the doc
spelling mistake
spelling mistake
Update install-web.txt

Minor wording changes
spelling mistake
ldap over ssl instruction improvement
small grammar and spelling fixes
Fix travix.yml to recognize SPHINXOPTS envvar
Merge pull request #809 from sbesson/rebased/develop/travis_fix

Travis fix (rebased onto develop)
Updated Zeiss link as requested to Jason
Adding example server set up page
Actually adding new page! And processor working
Merge pull request #743 from sbesson/5.0_job_renaming

Propose redesign of OMERO and Bio-Formats 5.0 CI jobs
merge develop -D org: PR 799 (Linux walkthrough (rebased onto develop))
merge develop -D org: PR 805 (Adding contributing doc link & Zeiss link update)
merge develop -D org: PR 806 (Webstart template (rebased onto develop))
merge develop -D org: PR 807 (ldap over ssl instruction improvement (rebased onto develop))
merge develop -D org: PR 810 (Adding example server setup page  (rebased onto develop))
merge develop -D org

Repository: openmicroscopy/ome-documentation
Updating 0b47a1b..c848b7d
Merged PRs (fast-forward):
  # PR 743 sbesson 'Propose redesign of OMERO and Bio-Formats 5.0 CI jobs'
  # PR 809 sbesson 'Travis fix (rebased onto develop)'

Merged PRs:
  # PR 799 manics 'Linux walkthrough (rebased onto develop)'
  # PR 805 hflynn 'Adding contributing doc link & Zeiss link update'
  # PR 806 aleksandra-tarkowska 'Webstart template (rebased onto develop)'
  # PR 807 aleksandra-tarkowska 'ldap over ssl instruction improvement (rebased onto develop)'
  # PR 810 hflynn 'Adding example server setup page  (rebased onto develop)'

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