Avoid a 301 permanent redirect.
Part of SF patch #773007.

Also fixed a number of mostly cosmetic markup errors.
1 file changed