Version Control With Subversion Source

[ Hello to all my friends and fans at RCN Cable! 38% packet ]
[ loss is certainly an improvement, but still well into the ]
[ "crappy" category of net connectivity. What are you guys ]
[ doing over there anyway, sleeping? Work with me here... ]

* /trunk/doc/book/book/ch03.xml: Add detailed section on conflict
resolution, some bits about update/checkout -r, and a few other
tweaks. Ready to ship it out.