Merge the following from the English version:

1.16 -> 1.20 docproj/docproj.sgml
1.11 -> 1.13 docproj/who.sgml

Submitted by: Hiroki Kobayashi <solidsneak _at_ hyper dot cx>
References: [doc-jp-work 1422, 1423, 1425]