Updates, corrections, and word smything.
Updates, corrections, and word smything.

This commit was SVN r2745.

ggouaillardet/hwloc,shekkbuilder/hwloc,shekkbuilder/hwloc,shekkbuilder/hwloc,shekkbuilder/hwloc,ggouaillardet/hwloc,ggouaillardet/hwloc,ggouaillardet/hwloc