merge develop -D org: PR 799 (Linux walkthrough (rebased onto develop))
merge develop -D org: PR 864 (move %time% template expansion term to only user-owned (rebased from dev_5_0))
merge develop -D org: PR 865 (Added documentation for Active Directory LDAP)
merge develop -D org

Repository: openmicroscopy/ome-documentation
Updating 191511b..ce96fa7
Merged PRs (fast-forward):
  # PR 858 hflynn 'Tidy Upgrade page incl. Paris requests for 5.0.3 (rebased onto develop)'
  # PR 861 hflynn 'Fix Dave Duhlman links in Model docs'
  # PR 857 sbesson 'Document orphaned datasets/plates retrieval via getProjects/getScreens (rebased onto develop)'
  # PR 854 mtbc 'Managed repository template path expansions (rebased from dev_5_0)'
  # PR 856 hflynn 'Removing developer standards page'
  # PR 824 sbesson 'OME DCO'
  # PR 834 aleksandra-tarkowska 'Session engine'
  # PR 849 hflynn 'Reformatting VA docs to make them less scary  (rebased onto develop)'
  # PR 846 hflynn 'Insert OMERO sidebar template after page TOC sidebar (rebased onto develop)'
  # PR 850 hflynn 'Re-working OMERO sysadmin index page (rebased onto develop)'
  # PR 843 aleksandra-tarkowska 'adding HTTP response header'
  # PR 845 manics 'Clarify fastcgi (rebased onto develop)'
  # PR 827 aleksandra-tarkowska 'Nginx doc'

Merged PRs:
  # PR 799 manics 'Linux walkthrough (rebased onto develop)'
  # PR 864 mtbc 'move %time% template expansion term to only user-owned (rebased from dev_5_0)'
  # PR 865 dpwrussell 'Added documentation for Active Directory LDAP'
Generated by OMERO-5.1-merge-push#330 (http://ci.openmicroscopy.org/job/OMERO-5.1-merge-push/330/)