Update to r47098:

resort some content and remove mention of dbus and hald dependencies to Xorg.

Reviewed by: bcr
Differential Revision: https://reviews.freebsd.org/D4587