I have a Samsung Galaxy S which would have been due it's Froyo update.

A mate said he would update it for me manually.

My phone on the whole works (except the clock is never right) as it should but would prefer to have the vanilla update when it is ready.

Will I be able to get the update when it is ready or will I have to rollback to 2.1?

If I need to rollback could someone give me a link (or step by step instructions) please?

My friend isn't get anywhere near my phone again.....

Froyo has only just started to roll out(though theres a hacked version available).
As i have posted elswhere, im on 3 network and Froyo is not available for this and some other networks just yet.
All networks should get Froyo by end of November.

Dont know anything about any Vanilla update, thats new to me.

By vanilla I meant the basic, untouched upgrade.