You have to wait a while but about 5:16 into the video you can catch a glimpse of the "fabled" sword fight scene.
http://www.youtube.com/watch?v=SDtaHH7r6l4
Where would that fit in the bombardment scene, a small little side boat?
No, maybe on top of the fort, right where the shadows are.
And I know where in Paris' version it's located, too, because I've not only read about it (in that book on both ride and movie by Jason Surrell), but I've also actually been on that version of the ride, when I managed to squeeze in a few hours at Disneyland Paris while in France as part of a trip to Europe to celebrate the end of high school. That was back in 2003.
Oh, and one last thing that should happen to POTC: alter the fire effects so that it looks realistic and not just flapping curtains. This effect will be implemented into all versions of the ride.
And don't think I've forgotten about the rest of the Disney resorts the world over. Eventually, (I don't know when, but eventually) I will put up a thread that ties into this thread, but features only the non-California Disney resorts.
Oh, and for the commercials, please let's try not to blur the boundaries between CA and FL, please? Disney park commercials have a tendency to do so nowadays.