Kerry's Terrorism Plan

What is the Kerry plan for the war on terror, and is it different from the Bush Doctrine currently in place? From the Kerry website:

1. Launch And Lead A New Era Of Alliances


• "we need to build real and enduring alliances."


• "... offer the UN the lead role in assisting Iraq..."


2. Modernize The World's Most Powerful Military To Meet New Threats


• "add 40,000 active-duty Army troops"


3. Deploy All That Is In America's Arsenal


• "...make the next Director of the CIA a true Director of National Intelligence with real control of intelligence personnel and budgets"


• "We will launch a 'name and shame' campaign against those that are financing terror." (specifically mentioning Saudi Arabia)


• "Create a high-level Presidential envoy empowered to bring other nations together to secure and stop the spread of [WMD]"


4. Free America From Its Dangerous Dependence On Mideast Oil


• "embark on a historic effort to create alternative fuels and the vehicles of the future"

Clarifying an important difference:
In a conference call with reporters before the speech, Kerry foreign policy advisor Samuel R. "Sandy" Berger said those remarks were not meant to embrace Bush's doctrine of launching preemptive attacks against states the U.S. views as a threat.