beacon merge from xiphos devel
documentation updates re: beacons.