What's a good tool for annotating code?

Question

Does anyone use a tool for code collaboration? We already have an existing system that manages our SDLC, so I don't want a separate system. I'm looking for a some tool to annotate code, with comments, that we can archive in our SDLC system.

For instance, right now we're using MS Word with the built-in change-tracking and commenting. I'd like to find something more lightweight, or more geared towards code.

I know there are code review systems out there; that's not what I'm looking for. Just a tool for marking-up code.

Answer 1

I don't have any experience with this personally, but it sounds as though it could do the job:
http://kelp.sourceforge.net/

Answer 2

+1 for Chad, and Kelp. I've used Code Striker, but you say you explicitly don't want a code review system (which is used for marking up code, nonetheless.)

Answer 3

http://smartbear.com/