Do I Make world and make kernel afetr CVSUP

[keith at smmc.qld.edu.au]

Hi all,
I am following a Schlacter firewall tute and after changing the kernel
file it says 2 things that conflict
it tells me to simply make world then make kernel
but actually talks about make bulidworld and make kernel and make
installworld
I have cvsupped all srcs and a few ports
Which do I do on mt CVSUPPED to 4.8 (was 4.7) FBSD
Thanks
Keith