Just my two cents - it is a bad idea to short the CMOS jumper without removing the battery. It will short your battery too.
Pulling the battery also will not always accomplish your objective.
The short answer is - do both if you want to restore factory defaults on a particular system.
-S