SVN : Documentation also on a branch?

Question

I follow a dev=trunk release=branch convention. this works great for the source code but what do ppl do for the documentation (unfortunately it is in MS Word (LaTex is too much for our corporate business/system analysts).

do you also keep docs on a branch and merge (it is a pain) after release?
or do you keep docs only on trunk?

Answer 1

Rule #1 of documentation is it must be kept in sync with the code. Obeying this rule requires that the documentation be branched and merged along with the code. When merges are required, you can use the compare feature in Word or some other solution to tell what changed.