Slightly expanded re-indexing intro
New CLI reindex commands
Clarify *when* to re-index
Migrate troubleshooting text to search.txt
Add note about fewer results during indexing
Fix indent in bullets
Clarify that FileAnnotations are not under 'annotation:'
Replace broken links with TODOs
Suggested improvements from Petr
More improvements of why corruption can occur
Handle double hyphen with mem
Use bold rather than italics
merge dev_5_0 -D org: PR 868 (5.0.3: CLI documentation)
merge dev_5_0 -D org: PR 870 (New search docs)
merge dev_5_0 -D org: PR 875 (Expand setup.py test/py.test options description)
merge dev_5_0 -D org: PR 881 (Adv config example)
merge dev_5_0 -D org

Repository: openmicroscopy/ome-documentation
Updating c6247bb..afe4ce5
Merged PRs (fast-forward):
  # PR 877 rleigh-dundee 'Update recommended PostgreSQL version to 9.2 for float bug fix'
  # PR 866 bpindelski 'Document client requirements for in-place import on Windows.'
  # PR 873 mtbc 'add note about consequences of "damaging" in-place import files'

Merged PRs:
  # PR 868 sbesson '5.0.3: CLI documentation'
  # PR 870 joshmoore 'New search docs'
  # PR 875 sbesson 'Expand setup.py test/py.test options description'
  # PR 881 joshmoore 'Adv config example'

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