Patch from Brian Denny.
Patch from Brian Denny.

* doc/book/book/ch06.xml: Fix a typo and an incorrect usage of
  'svn merge'.

jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion,jmckaskill/subversion