Merge the following from the English version:

1.21 -> 1.22 docproj/current.sgml