Long story short, I was wrong to categorize martial adept abilities as "per encounter"?

Only when you gain a maneuver by a feat it becomes per encounter, correct?