According to Think Progress, where you can read the version that went to a vote (warning: PDF the size of Texas) today in the Senate.

The paragraphs below were REMOVED:

(3) that it should be the policy of the United States to combat, contain, and [stop] the violent activities and destabilizing influence inside Iraq of the Government of the Islamic Republic of Iran, its foreign facilitators such as Lebanese Hezbollah, and its indigenous Iraqi proxies;

(4) to support the prudent and calibrated use of all instruments of United States national power in Iraq, including diplomatic, economic, intelligence, and military instruments, in support of the policy described in paragraph (3) with respect to the Government of the Islamic Republic of Iran and its proxies.

This paragraph was added:

“Secretary of Defense Robert Gates stated on September 16, 2007 that “I think that the administration believes at this point that continuing to try and deal with the Iranian threat, the Iranian challenge, through diplomatic and economic means is by the preferable approach. That is the one we are using. We always say all options are on the table, but clearly, the diplomatic and economic approach is the one that we are pursuing.”

SecDef AND CentCom don't want a war with Iran. This is very much NOT the way things were when we got the wars in Afghanistan and Iraq started.

Will Bush listen?
Does He care?
Quien sabe?