Version Control With Subversion Source

* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.advanced.finalword): Rework a little to reflect
the fact that merge tracking isn't new anymore.

* en/book/ch04-branching-and-merging.xml
(svn.branchemerge.basicmerging.stayinsync): Add a tip regarding
1.7's new subtree mergeinfo recording behavior.

Typo.

"brances" -> "braces"

Ticket #315, part 1: "Initial setup" (cf.
http://www.svnbook.de/ticket/315).

svn 1.7 now only has one administrative area

Follow-up to r4158: Give fair warning of the *actual* problem!

* en/book/ch04-branching-and-merging.xml
(svn.branchemerge.basicmerging.reintegrate): Footnote more 1.7's
more permissive attitude towards shallow targets, but give fair
warning of potential problems.

* en/book/ch04-branching-and-merging.xml
(svn.branchemerge.basicmerging.reintegrate): Footnote more 1.7's
more permissive attitude towards shallow targets, but give fair
warning of potential problems.

* en/book/ch04-branching-and-merging.xml
(svn.branchemerge.basicmerging.reintegrate): Mention reintegrate's
increased flexibility re subtree merges in 1.7, but do it in
a footnote; this is really not something we want to encourage
(though apparently some folks like to work this way).

Add myself to COMMITTERS

* en/book/ch04-branching-and-merging.xml
(svn.branchmerge.basicmerging.mergeinfo): Describe how
'svn mergeinfo' handles non-inheritable mergeinfo and subtree
mergeinfo in 1.7.