Improving Unix guide usability
Avoid suggesting higher Python version.
Move the note about Python 3 support.
Add Josh's suggestion.
Merge pull request #16 from bpindelski/ice_python

Avoid suggesting higher Python version.
Make it clearer that envvars must be updated
Fix some unescaped \'s
Merge pull request #17 from manics/sysadmin-windows-cleanups

Sysadmin windows cleanups
Fixing UNIX install doc re:ICE etc
Merge branch 'install' of github.com:hflynn/ome-documentation into install
Douglas' comments + Windows Ice clarification
Merge remote-tracking branch 'origin/dev_5_0'

Conflicts:
	omero/sysadmins/windows/server-installation.txt
Fixing Roger's comments
Move schema-changes page from OMERO to Contributing documentation

Conflicts:
	contributing/index.txt
Move commit extlink to Contributing documentation

Conflicts:
	contributing/conf.py
	contributing/standards.txt
Remove moved file
merge dev_5_0 -D org: PR 703 (Updates to sysadmin installation docs)
merge dev_5_0 -D org: PR 705 (Move schema changes to the contributing documentation (rebased onto dev_5_0))
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Already up-to-date.

Merged PRs:
  # PR 703 hflynn 'Updates to sysadmin installation docs'
  # PR 705 sbesson 'Move schema changes to the contributing documentation (rebased onto dev_5_0)'

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