Some more for the same section: If you've postponed a conflict,... should be If you've postponed a conflict resolution,... In the paragraphs describing the arguments to the --accept option, the repective arguments should be tagged with "literal" instead of "replaceable" elements. Cheers Jens