Version Control With Subversion Source

Revert a change to the build system which was accidentally included in r3533.

* src/tools/Makefile.base-rules
(version): Restore the line that appends the date to the version file.

Fix some mark-up.

* src/en/book/ch09-reference.xml
(svn.ref.svn.c.propset): Use <command> and not <replaceable> for alternative
command names.

Tweaks to <option> mark-up. Also, accidentally, a change to the build system,
which I subsequently reverted in r3535.

* src/en/book/ch03-advanced-topics.xml
(svn.serverconfig.netmodel.credcache): Fix mark-up of "store-auth-creds":
we use <literal> not <option> for run-time configuration file options.

* src/en/book/ch09-reference.xml
Fix the use of <replaceable> mark-up when used in conjunction with
<option>. Add a missing space before an option.

* src/tools/Makefile.base-rules
(version): Comment out the line that appends the date to the version file,
in order to avoid re-building the book when nothing has changed. (This
change was not intended to be part of this commit.)

Add short options after using long options in prose, per HACKING.

* src/en/book/ch01-fundamental-concepts.xml,
* src/en/book/ch02-basic-usage.xml,
* src/en/book/ch03-advanced-topics.xml,
* src/en/book/ch06-server-configuration.xml,
* src/en/book/ch09-reference.xml
Add short options after long options.

Patch by: Larry Shatzer, Jr. <larrys {_AT_} gmail.com>

Update the reference chapter to include a description of the tree-conflict
marker column in "svn status" output. Also minor related changes.

Found by: Fabian Cenedese <Cenedese {_AT_} indel.ch>

* src/en/book/ch09-reference.xml
(svn.ref.svn.c.status): Add a description of the tree conflict field.
Update other column numbers. Update the examples accordingly. Add a
description of the eighth column being blank, to avoid uncertainty.
Fix grammar.

* trunk/src/de/book/ch09-reference.xml
- Fixes ticket #260 (cf. http://www.svnbook.de/report/6).

* trunk/src/de/book/ch09-reference.xml
- Fixes ticket #259 (cf. http://www.svnbook.de/report/6).

* src/zh/po/svnbook.po:
Sync with source files, no translation change.

* en/book/ch03-advanced-topics.xml,
en/book/ch09-reference.xml
Update the remaining "svn proplist" examples to use the v1.6 output format.

Suggested by: Fabian Cenedese <Cenedese {_AT_} indel.ch>

* src/en/book/ch04-branching-and-merging.xml
Correct the syntax summary of "svn mergeinfo".

Patch by: Larry Shatzer, Jr. <larrys {_AT_} gmail.com>