Include link to new generated config.txt
Add explicit refs to troubleshooting
Move upgrade notification to the bottom
Add 'diagnostics' section to Windows
Simplify IPv6 instructions & link term
Add scc travis-merge to the Travis build
Set up Git config for scc travis-merge
Merge pull request #897 from snoopycrimecop/dev_5_0/latest/autogen

Update auto-generated properties
Merge pull request #893 from joshmoore/fine-tune-config

Fine tune config
Review all links to omero.properties

Only keep links to omero.properties for the build system or variables not parsed into the glossary, e.g. omero.upgrade.urls)
Do not use omero.properties as the default source extlink
Review all references to configuration properties

Use :term: markup when possible
Use a term markup for omero.checksum.provided
merge dev_5_0 -D org: PR 894 (Added documentation for Active Directory LDAP)
merge dev_5_0 -D org: PR 896 (Remove limitations)
merge dev_5_0 -D org: PR 900 (OMERO configuration properties)
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Excluded PRs:
  # PR 899 rleigh-dundee 'Cpp: Document building with cmake (dev_5_0)' (exclude comment)
Updating 10293bf..6ba46f8
Merged PRs (fast-forward):
  # PR 893 joshmoore 'Fine tune config'
  # PR 897 sbesson 'Update auto-generated properties'

Merged PRs:
  # PR 894 sbesson 'Added documentation for Active Directory LDAP'
  # PR 896 joshmoore 'Remove limitations'
  # PR 900 sbesson 'OMERO configuration properties'

Generated by OME-5.0-merge-push#127 (http://ci.openmicroscopy.org/job/OME-5.0-merge-push/127/)