doxy: merge main.doxy back into hwloc.doxy

To followup netloc removal.

Signed-off-by: Brice Goglin <[email protected]>

Author: bgoglin