merge develop -D org: PR 883 (Document client requirements for in-place import on Windows. (rebased onto develop))
merge develop -D org: PR 898 (Cpp: Document building with cmake)
merge develop -D org

Repository: openmicroscopy/ome-documentation
Updating bb47f12..8f81cf5
Merged PRs (fast-forward):
  # PR 906 sbesson 'Fine tune config (rebased onto develop)'
  # PR 904 sbesson 'Update auto-generated properties'
  # PR 909 sbesson 'Remove limitations (rebased onto develop)'

Merged PRs:
  # PR 883 bpindelski 'Document client requirements for in-place import on Windows. (rebased onto develop)'
  # PR 898 rleigh-dundee 'Cpp: Document building with cmake'

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