The Haynes manual I have does cover all of the detailed steps involved with replacing the waterpump and timing belt.

Simplest answer is yes, you have to remove the timing belt, after disconnecting the battery, after setting the engine to TDC on #1, after etc...