documentation updates darcs-hash:20040511075116-5007d-1a6e3c79dbe20cbfe54ca2b524017800e2c37ef1.gz
conflict resolution darcs-hash:20040510024853-5007d-ba78120dfdaf26f2017c5dffcad93ba30f30b777.gz
merged Brian and Adams changes darcs-hash:20040505102459-3ac31-0836e8073d58e25ff7b46a1fd05c34cb8a017aae.gz