Version Control With Subversion Source

The official documentation of the Subversion version control system

Brought to you by: cmpilato, danielshahaf

Synchronise the English and Norwegian svnbook with "make sync". Updated

changes between r1223:1240.

* src/nb/LAST_UPDATED
Updated to 1240 by "make sync".

* src/nb/README
Merged r1228.

* src/nb/REVIEW
Merged r1229.

* src/nb/TODO
Merged r1231, r1232, r1233, r1234.

* src/nb/book/ch04.xml
Merged and updated r1231, r1232, r1235, r1238. New "The Key Concept
Behind Merging" section.

* src/nb/book/ch06.xml
Merged r1232.

Authored by: sunny256 2005-04-26

Parent: [r1240]