Installation: Specify what to do for N/A in package lists
Installation: homebrew mplayer provides mencoder
reorder lists of operating systems to promote Linux

suggested by @manics
reword sentence to remove active voice

suggested by @bpindelski
Adding bullet points to lists
Adding more links to version history
Merge pull request #948 from mtbc/server-config

improve and update server configuration documentation
Merge pull request #949 from hflynn/history

Adding OMERO version history to docs
merge develop -Dorg -Ssuccess-only: PR 950 (Installation: Specify what to do for N/A in package lists)
merge develop -Dorg -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Updating 371b2ca..889b4f3
Previously merged:
  # PR 949 hflynn 'Adding OMERO version history to docs'
  # PR 948 mtbc 'improve and update server configuration documentation'

Merged PRs:
  # PR 950 rleigh-dundee 'Installation: Specify what to do for N/A in package lists'

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