Please confirm Froyo manual update procedure

[aviduser]

I know this has been covered, but I have seen at least two variations on the procedure.

One is this:
1. Download the official Android 2.2 firmware for your current build (see links above)
2. Copy the file to your MicroSD card and name it update.zip (Pro tip: not update.zip.zip)
3. Power off your phone.
4. Hold down the VOLUME DOWN button and power it back on.
The phone will now search for files like PB00IMG.zip, etc. This is normal.
5. Scroll down to recovery and press the POWER button.
When you see the ?/!\? symbol, press the POWER button and the Volume Up button at the same time. You should be presented with a menu and one of the options should be ?Apply sdcard:update.zip?.
6. Use the trackball to navigate to ?apply sdcard:update.zip? and select it.
7. When you see ?Install from sdcard complete?, select ?reboot system now?.

The other is this:

1. Download the Froyo update.
2. Rename the file above into ?update.zip? and copy it into the root folder of your microSD card. Turn off the phone.
3. Boot the N1 into the recovery mode by holding the trackball and pressing once on the power button.
4. Select the ?Bootloader? and then the ?Recovery? option.
5. Wait until the phone restarts ( you should see a big exclamation point ) and then press the ?Volume up? and the ?Power ? button at the same time.
6. Select ?Apply sdcard:update.zip? using the trackball.
7. Success. You have managed to update the Nexus One to Android 2.2

Is this just two ways of doing the same thing? What am I missing? And, most importantly, which way should I do the update?

I have been waiting for the OTA now and am growing impatient. Come on, Google, I have been a good user--one might even say I have been an aviduser .

Thanks,

aviduser

 

[aviduser]

Well I did it using method one. It worked.

I am having some issues with a few apps, including Phone (uh oh).