Which distinction between tawshīʿ and specific-after-general is correct?

Iṭnāb: Clarification after Ambiguity, Tawshīʿ, Repetition and Īghāl