Each time across the needle is one row - so the 2nd one you list is correct: 1 row of knit stitch + 1 row of purl stitch = 2 rows of stocking stitch.
Mirl56 at Ravelry, too.
Learn from the mistakes of others. You canít live long enough to make them all yourself. Eleanor Roosevelt
Lady Feb Sweater
more shawlettes, socks