Fix signature of linkAnnotation in OMERO.matlab documentation page
Merge pull request #979 from sbesson/rebased/dev_5_0/linkannotation_doc

Fix signature of linkAnnotation in OMERO.matlab documentation page (rebased onto dev_5_0)
Update IIS app pool setting doc.
Correct indentation.
Merge pull request #982 from bpindelski/rebased/dev_5_0/12504_timeout

Update IIS app pool setting doc (fix #12504). (rebased onto dev_5_0)
merge dev_5_0 -Dorg -Ssuccess-only

Repository: openmicroscopy/ome-documentation
Updating decb655..c846ab4
Previously merged:
  # PR 982 bpindelski 'Update IIS app pool setting doc (fix #12504). (rebased onto dev_5_0)'
  # PR 979 sbesson 'Fix signature of linkAnnotation in OMERO.matlab documentation page (rebased onto dev_5_0)'

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