Comment 2 for bug 1090684

Thanks Max -- feel free to commit all your manual changes directly as long as you check they compile first. We'll do a proofread run to tweak grammar / spelling before the release.