Before I upgrade from 2.0.1 to 2.0.2, I hope that I can get some clarification on this issue.
I initially installed WordPress in my root folder. I then followed the instructions given here: http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory
So now, index.php and .htaccess are in the root, while the WP core files are in a directory called 'wordpress'.
I've reached the stage of upgrading which requires me to upload the new WP files to the appropriate folder.
My question is: which is the appropriate folder?
Do I upload all the new files into the wordpress directory and delete the old index.php and .htaccess from the root (then follow the instructions to give WP its own directory again)?
Or do I upload the new files, overwriting the respective files in their current folders?
Or do I upload everything in the root, then copy over wp-config.php and the wp-content folder to the root?
I just realised that I didn't follow the instructions in 'Giving WP its own directory' to the letter. Step 7: I moved index.php and .htaccess to the root instead of copying.
I'm really confused.