merge dev_5_0 -Dorg -Ssuccess-only: PR 951 (improve and update server configuration documentation (rebased from develop))
merge dev_5_0 -Dorg -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Updating b230059..7e549b4
Previously merged:
  # PR 952 hflynn 'Adding OMERO version history to docs (rebased onto dev_5_0)'

Merged PRs:
  # PR 951 mtbc 'improve and update server configuration documentation (rebased from develop)'

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