Damage Per Swing

I've come across two different formulas for Average Damage Per Swing. Is anyone able to shed light on them?
One was (Weapon DPS+AP/14)*Weapon Speed
The other I saw was (Weapon DPS+AP*3.5)*Weapon Speed
I'm pretty much new to the whole melee class thing seeing how I've played support in live during every-freaking-expansion and I'm trying to postulate as much as I can about my class and its absolute potential, but I keep running into conflicting data all over the place. It sounds like the second formula is the current formula for live(?) Is the first formula vanilla's?
http://www.wowwiki.com/Attack_power
Also, how does this all factor into armor against a mob and actual damage done? I understand life would probably be much easier if we just had Target Dummies, but
Apologies for the scrub questions...
One was (Weapon DPS+AP/14)*Weapon Speed
The other I saw was (Weapon DPS+AP*3.5)*Weapon Speed
I'm pretty much new to the whole melee class thing seeing how I've played support in live during every-freaking-expansion and I'm trying to postulate as much as I can about my class and its absolute potential, but I keep running into conflicting data all over the place. It sounds like the second formula is the current formula for live(?) Is the first formula vanilla's?
http://www.wowwiki.com/Attack_power
Also, how does this all factor into armor against a mob and actual damage done? I understand life would probably be much easier if we just had Target Dummies, but

Apologies for the scrub questions...