Merge the following from the English version:

1.7 -> 1.9 diskless-x/article.sgml
1.9 -> 1.11 ipsec-must/article.sgml