Fix swapped variable names
Minor formatting fix
Merge pull request #2 from hflynn/ci_release_servers

Minor formatting fix
Merge pull request #1024 from hflynn/rebased/develop/fix-cli-variables-dev_5_0

Variable names in example are swapped (rebased onto develop)
Final tidying
Merge pull request #3 from hflynn/ci_release_servers

Final tidying
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 990 (for users who have compiled isapi_wsgi on x64)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 1014 (Ldap.txt: cleanup and update column names.)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 1021 (Review documentation for release infrastructure)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only: PR 1022 (In-place import user & group set-up plus minor tidy)
merge develop -Dorg -Ijburel/openmicroscopy:qa-submit-new -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Updating d7681c9..0b62c18
Previously merged:
  # PR 1024 hflynn 'Variable names in example are swapped (rebased onto develop)'

Merged PRs:
  # PR 990 kennethgillen 'for users who have compiled isapi_wsgi on x64'
  # PR 1014 bpindelski 'Ldap.txt: cleanup and update column names.'
  # PR 1021 sbesson 'Review documentation for release infrastructure'
  # PR 1022 hflynn 'In-place import user & group set-up plus minor tidy'

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