Merge pull request #819 from joshmoore/12311-auto-memory

12311 auto memory docs
Merge pull request #852 from hflynn/sysadmin-tidy

Tidy Upgrade page incl. Paris requests for 5.0.3
move %time% template expansion term to only user-owned
Expand note to higlight write-once nature of dropbox
merge dev_5_0 -D org: PR 860 (move %time% template expansion term to only user-owned)
merge dev_5_0 -D org: PR 862 (DropBox note)
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Updating ed60a3e..8004c06
Merged PRs (fast-forward):
  # PR 852 hflynn 'Tidy Upgrade page incl. Paris requests for 5.0.3'
  # PR 819 joshmoore '12311 auto memory docs'

Merged PRs:
  # PR 860 mtbc 'move %time% template expansion term to only user-owned'
  # PR 862 ximenesuk 'DropBox note'
Generated by OMERO-5.0-merge-push#97 (http://ci.openmicroscopy.org/job/OMERO-5.0-merge-push/97/)