with the "water in your drinks" stuff, you need to be careful. soda, tea and coffee all have water in them, but the caffeene acts as a diuretic. My rule of thumb is to drink twice as much water as caffenated bevrages. And since i drink a 2 liter at work most days, when i get home it's 2 liters of water. the other two being 1 liter before i leave and another liter throughout the day at work.
keep in mind that i work in a dry, dusty warehouse in Orlando, the middle of a freaking swamp so i'm always sweating. I'll also go through a 64 ounce bottle of haterade and then refill the bottle with water and kill that too...