Weapon Focus Monowhip, Power of the Attack? Options

[JaronK]

If a Weapon Focus Monowhip (let's say force 1) is used in Astral Combat by a shaman (let's say he's charisma 8), what's the power? On page 191 of the BBB it says "When used in astral combat, the weapon focus's Power is determined using Charisma instead of Strength." Now, since Monowhips don't use strength, and just do 10S, I'd assume in astral combat it does 10S, from this paragraph. However, on page 176 of the same book, the Astral Damage Codes table says an armed attack does (Charisma) + weapon focus damage, so I'd think from that he'd do 8S. Which is correct?

Likewise, would the same mage weilding a weapon focus Staff do (Charisma)M or (Charisma + 2)M?

JaronK