Hi Will,
Yes. All of the upgrade topics are in the book, and there is a table (like a mini ToC), in the intro that explains which upgrade topics are located where in the book. Keep in mind though that if you're doing the upgrade exam, MOST of the book won't apply to you. We feel bad about that, but it's all we could do.
BTW, there are also tables in the intro for the SCPJ 5 and
SCJP 6 (or whatever they're called) exams. So, if for some reason you want to take those older exams, you can use this book as well.