Awesome link dude! I'm gonna bookmark this.
You can't go wrong with that set of directions. I thought I had more pics but I only have a few.
A few things to you may want to consider when doing the water pump.
All new hoses including heater hoses, bypass hose and radiator hoses
Definately get the inlet tube that screws in to the new water pump.
It's recommended to change the t-stat at this time. I would also change the housing as well. They're know to warp and sometimes crack.
I only use Felpro Gaskets
Obviously run new coolant. Don't reuse unless you have super low mileage or just changed it recently.
I changed everything listed above when I did my pump. The parts were cheap enough and it will save time in the long run for the little extra that it does cost. I don't like doing things twice so I do everything the 1st time.
Here's a pic of the pump and you will see the inlet tube connected to it that you should replace. These normally rot out.
Replace the t-stat housing. Normally about $14.00.
Quick view with the parts out
Change your hoses
You don't need to remove the power steering pump entirely from the Jeep. You can just set it aside.
Just a little tip. When you go to reinstall the power steering pump, make sure you set the wire back in this slot where it belongs. Made that mistake once.