Conflicts in the FAQ are fixed by incorporating Jacob's rewritten post-0.68 version. (But owing to considerable git confusion I haven't managed to get his name on to this commit anywhere.)