Witcher 2 silver box clarification

im not finding much info most sources talk about the original 2 disc set an not the silver box. so for the silver box release, did they just move all the bonus content over to disc 2 an fit the whole game on disc 1?