K 10
svn:author
V 3
ben
K 8
svn:date
V 27
2000-07-26T17:53:17.000000Z
K 7
svn:log
V 295
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.

END