Merge the following from the English version.
Note that this is a white-space cleanup change and no content change.

1.16 -> 1.17 platforms/amd64.sgml