Fix some stupid mistakes I made when adding des' CVS primer:

• $FreeBSD$ shouldn't be expanded when used in the explanation of conflicts.
• Add some markup bits I missed, fix typoes, fix broken hyphenation caused by joining lines together which had hyphenated words split over them.