PNA / Merge Edit

I decided to add both tags, although this rather is an either/or decision. Either this article needs to be copyedited, formatted, cited and everything - or we decide to merge it with the main article Klingon, since this one, alone, could be seen as nothing more than a dictionary definition. It basically depends on what exactly can be done with the article. For the moment, I'd prefer merging. -- Cid Highwind 11:08, 9 November 2006 (UTC)

I've rewritten the article to reflect mentions of the warrior caste/class on Enterprise. A merge may still be in order, however. --From Andoria with Love 00:06, 10 November 2006 (UTC)