you're right, Ludens.
I forgot to mention the +1 attack was only vs spears/pikes, but that was what I meant ;)
anyway, you probably put it a bit more clearly than I did.
so, yeah, it's like you said.