Version Control With Subversion Source

First pass at documenting interactive conflict resolution. Still
needs a little cleaning up, and I haven't gotten to chapter 9 yet.

Fixes most of Issue#77

* src/en/book/ch02-basic-usage.xml: ..Hmmm...This thing is really
VIBRATING! ..It's getting WARM, too!

Keep filling out chapter 4.

* src/en/book/ch04-branching-and-merging.xml: document log/blame -g

Keep filling out chapter 4.

* src/en/book/ch04-branching-and-merging.xml: checkpoint work.

Some minor modify: just one blank line added and some notes about mail list threads.

Modified dictionary entry branches. The new version is:
branches=branch

Added example in paragraph: 'Discorso diretto'

Keep filling out chapter 4.

* src/en/book/ch04-branching-and-merging.xml: more work on TODO sections.

new convention proposal introduced.

Foreword.xml:
- 'FAQ sheet' is now translated as 'pagina delle FAQ'
- 'note-taking' is now translated as 'prender nota'
- replaced all forms such as: 'chiedere domande' with 'porre domande'
- replaced 'promemorie' with 'promemoria' (even when plural)
- 'groupware' is now translated as 'software collaborativo'
- direct speech is now prefixed with a colon
- 'pronouncements' is now translated as 'dichiarazioni'
- replaced 'la gente chiede sempre le stesse domande base' with 'le persone ponevano sempre le stesse domande base'
- replaced 'sulle' with 'nelle' in the sentence:
'le persone ponevano sempre le stesse domande base sulle(nelle) mailing list di Subversion'
- replaced the sentence:
'Rami e tag funzionano nella stessa maniera.....?'
with:
'Branch e tag funzionano come negli altri sistemi...?'
- replaced 'path of least resistance' with 'la via più facile'
- replaced 'può sembrare qualche sorta di telepatia' with 'potrà sembrare misteriosamente telepatica'
- few minor fixes to italian grammar

Fix some output syntax in the new chapter 4.

* src/en/book/ch04-branching-and-merging.xml: fix merge output.