getting-started.txt
Click on Display User from drop-down menu missing the drop-down menu

collaboration.txt
- corrected organise to organize
- corrected collaboration.txt - wrong name for image 3 to:
collaborationShowGroups.jpg
- replaced collaborationShowUsers.jpg with corrected version (image 4)
- missing "in" the data tree - inserted
- text updated **NB.** The following "points" apply  ... - points added
- 2 line spaces inserted above NB to make clearer
- add - to change "the" permissions settings
- replace user/s with user(s)

imageJ.txt
C:/ etc - / replaced with \
applications to Applications
"plugins" to **plugins**
Bioformats to Bio-formats
getting-started.txt
data manager to Data Manager

importing-data.txt
| removed from sub-lists

managing-data.txt
add bullet points
"to all images in dataset." replaced with "to all images in a dataset or plate, or to the selected images."

measurement-tool.txt
"load ROIs from saved file" replaced by "load ROIs from saved local file"
"time point/s" replaced with "time sequence/s"
Time changed to time throughout

scripts.txt
"Scripts are written in Python and run on the server." replaced by "Scripts are usually written in Python and run on the server. They could be written in another language, but a Python wrapper is used."
"You can view or download the Python script itself if you are interested. - remove "Python"

viewing-data.txt
"Time" replaced with "time"
"Colour" changed to "color"
"T-stack" changed to "time sequence"
"if image has ROIs" to "if the image has ROIs"
image/s to image(s)

web-client.txt
rename to OMERO.web
" or - double click on the image or thumbnail. " rearranged
Unified Z/T name
colour to color
left hand to left-hand (same for right)
add "Java" to Web Start

Outputting
Title changed to Exporting images"
Export as an OME-TIFF file
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 224 (Training material)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 227 (Add sections on locking and remote shares to unix/windows)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken: PR 231 (Migrate the VM installation instructions to the Sphinx documentation)
merge dev_4_4 -D org -I include -E conflict -E needs-fixes -E broken

Repository: openmicroscopy/ome-documentation
Updating 858e9f2..982b908
Merged PRs:
  # PR 224 gusferguson 'Training material'
  # PR 227 joshmoore 'Add sections on locking and remote shares to unix/windows'
  # PR 231 sbesson 'Migrate the VM installation instructions to the Sphinx documentation'

Generated by OMERO-merge-stable#136 (http://hudson.openmicroscopy.org.uk/job/OMERO-merge-stable/136/)