Patch from Brian Denny.
Patch from Brian Denny.

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


git-svn-id: f8a4e5e023278da1e04e203c7fe051e3c4285d88@845358 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,wbond/subversion,wbond/subversion,wbond/subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,wbond/subversion,YueLinHo/Subversion