::::::You might want to take a look at my proposal at Wikipedia talk:Template messages/User talk namespace#Edit warring and breaking 3RR: not always the same thing! Seems you've come a cropper from this template the same way I did.    

 ==Re:River Song== 
 Thing is you seem to have misunderstood what I was trying to achieve by altering the prose text on River at Companion (Doctor Who). The idea was, like with the Third Doctor's UNIT friends, to state that she's sometimes considered a companion without asserting that she definitely is. You've changed it to read that she IS a companion, which makes the whole section redundant. If she's in the Eleventh Doctor table, anything else can be expressed through footnotes as with other characters. (Incidentally, the bottom paragraph doesn't read correctly since your edits but I am unable to change as I'm not 100% on what your intended meaning is.) 
 The problem is, asserting that she's definitely a companion for series 6 presents difficulties. The source only calls her a "companion", it doesn't specify any particular episodes and it's hard to use that to say she's a companion in series 6 but not 5 or 4. But conversely, I don't think anyone considers it correct to call her a companion of the Tenth Doctor. If she's in the table, it means she has to be added to Template:Eleventhdoctorcompanions and the articles for specific episodes, and despite the slight narrative change I mentioned on the project page I don't feel there's really enough to distinguish between series 6 and her previous appearances. That's why I feel that we should leave her off the companions list until she travels with the Doctor properly (for want of a better term).