This is handy: "which" or "that" - a brief guide to when to use what from the people at the Chicago Manual of Style.
The Q & A section of their website looks like a pedants' mecca. This reminds me of a joke Tim Spence used to regret having told. Q: Who started the Pedants' Revolt? A: Which Tyler.