Ben Smithurst ff5aaba5d8 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.		2000-07-26 17:53:17 +00:00
..
article.sgml	Fix some stupid mistakes I made when adding des' CVS primer:	2000-07-26 17:53:17 +00:00
Makefile	$Id$ -> $FreeBSD$	1999-09-06 06:53:43 +00:00