Version Control With Subversion Source

* trunk/src/de/book/ch06-server-configuration.xml
- Ticket #196 (cf. http://www.svnbook.de/report/6).

* src/en/book/ch02-basic-usage.xml
(svn.tour.treeconflicts): Move material related to 1.5
into a side-bar. Also, we don't "force" users to resolve
conflicts, so phrase it as "giving the opportunity"
instead. Also, add a footnote explaining that files
with textual conflicts can of course be committed with
their conflict markers intact, so when we say Subversion
was "forcing" users to resolve text conflicts, this has
to be taken with a grain of salt.

Suggested by: julianfoad
(footnote added by myself)

* src/en/book/ch02-basic-usage.xml
(svn.tour.treeconflicts): New section that introduces
the basics of tree conflicts. Still needs to be extended
with actual examples.

Review and great input by: cmpilato
Neels Hofmeyr
sussman

* src/en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve, svn.tour.cycle.resolve.diff): The text was
referring to a 'diff' command during interactive conflict resolution.
But the command is actually called 'diff-full'.

Review by: kfogel
julianfoad

* book/ch-reference.xml : Changes from Oleksandr Gavenko <gavenkoa-at-gmail.com> with a few additional DocBook tags.

* trunk/src/de/book/ch04-branching-and-merging.xml
- Inserted missing hyphen.

* trunk/src/de/book/ch04-branching-and-merging.xml
- Typo fixes.

* trunk/src/de/book/ch04-branching-and-merging.xml
- Tickets ##177--170 (cf. http://www.svnbook.de/report/6).

* trunk/src/de/book/ch04-branching-and-merging.xml
- Ticket #176 (cf. http://www.svnbook.de/report/6).

* HACKING
* Makefile
* ruGlossary.xml
Changes from Oleksandr Gavenko <gavenkoa-at-gmail.com>