Version Control With Subversion Source

Sync the Norwegian and English book up to r2570, merged {r2569, r2570}
from the ora-2e-reorg branch. Which is long gone, but we have a time
machine available.

* src/nb/book/ch-introduction.xml
(svn.intro.whatis, svn.intro.history, svn.intro.features,
svn.intro.architecture, svn.intro.components): Moved to
ch-preface.xml.

* src/nb/book/ch-preface.xml
(svn.intro.whatis) Moved from ch-introduction.xml.
(svn.intro.history, svn.intro.features, svn.intro.architecture,
svn.components): Moved from ch-introduction.xml as sect2’s under
svn.intro.whatis.

* src/nb/LAST_UPDATED
Updated by "make sync HEAD=2570".

* src/nb/TRANSLATION-STATUS
* src/nb/METHOD
Rename file names. Should have been part of r2751.

Perform the same actions as in r2568, rename all *.xml files to more
descriptive names.

In src/nb/book/, perform the following renames:

appa.xml --> app-svn-for-cvs-users.xml
appb.xml --> app-webdav.xml
appc.xml --> app-third-party-tools.xml
ch00.xml --> ch-preface.xml
ch01.xml --> ch-introduction.xml
ch02.xml --> ch-basic-concepts.xml
ch03.xml --> ch-guided-tour.xml
ch04.xml --> ch-branching-and-merging.xml
ch05.xml --> ch-repository-admin.xml
ch06.xml --> ch-server-configuration.xml
ch07.xml --> ch-advanced-topics.xml
ch08.xml --> ch-developer-info.xml
ch09.xml --> ch-reference.xml

* src/nb/book/book.xml
Track file renames.

* src/nb/Makefile
($BOOKFILES, $BDFILES): Rename file names as above.

* src/nb/LAST_UPDATED
Manually changed to 2568.

* /trunk/src/nb/Makefile
($COLLAB): Use https:// instead of http:// against the svnbook
repository, you never know who’s listening.

* src/nb/book/book.xml: "make bookdiff" complains after r2596, so make
it happy. Removed the r from &svn.version; .

Delete the nb-ora2e-sync branch. All revisions on the ora-2e-reorg
branch satisfy make valid, so there’s no need for it.

Branch: nb-ora2e-sync

Define the mergesvn property to keep in sync with trunk.

Create new nb-ora2e-sync branch for syncing the Norwegian and English
book.

Sync the Norwegian and English book up to r2563, the point where the
ora-2e-reorg branch was created. Exciting things ahead, I’m going in.

* src/nb/LAST_UPDATED
Updated by "make sync HEAD=2563".

* src/nb/book/ch05.xml
Merged r2517.

Book Spanish.
M book/ch03.xml
advance in revision of section 5