Merge pull request #915 from bpindelski/rebased/develop/dev-java

Deprecate omero_client.jar. (rebased onto develop)
Further clarification of in-place on Windows.
Capitalise POSIX.
Correctly use the :file: environment.
Merge pull request #916 from bpindelski/rebased/develop/inplace-windows

Further clarification of in-place on Windows. (rebased onto develop)
adding HTTPS server references
small fixes
merge develop -D org: PR 898 (Cpp: Document building with cmake)
merge develop -D org: PR 914 (Documentation for network hopping for developer laptops)
merge develop -D org: PR 920 (adding HTTPS server references (rebased onto develop))
merge develop -D org

Repository: openmicroscopy/ome-documentation
Updating 08a33dd..4a6fb01
Merged PRs (fast-forward):
  # PR 916 bpindelski 'Further clarification of in-place on Windows. (rebased onto develop)'
  # PR 915 bpindelski 'Deprecate omero_client.jar. (rebased onto develop)'

Merged PRs:
  # PR 898 rleigh-dundee 'Cpp: Document building with cmake'
  # PR 914 dpwrussell 'Documentation for network hopping for developer laptops'
  # PR 920 aleksandra-tarkowska 'adding HTTPS server references (rebased onto develop)'

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