Middle ground between pedantic and dummy arch users
Merge branch 'develop' of https://github.com/syncany/syncany-docs into develop