upgrade of database, use of configure.php

I had a go at upgrading and maybe I am not understanding correctly the instructions:

If your /zen_new folder doesn't have "/includes/configure.php" and "/admin/includes/configure.php" files, copy them from your old store folder.

EDIT your "/zen_new/includes/configure.php" file and ensure that your DATABASE_NAME matches your NEW database. Also verify database username and password in case that information has changed. Save this file, and be sure to upload it as part of the next step. Repeat for the /admin/includes/configure.php file as well:This is saying use the two configure.php from your old site with the new/merged fileset. But the 1.5 configure.php are different structurally so surely it should say copy the configures from the 1.5 demo site you have been playing with and edit the paths and db details to point to the merged site and old db copy that is to be upgraded?

The only changes to configure.php -- both in the admin and catalog -- were omissions (old defines removed) and comment text. Neither of these will impact an upgraded store, so using your current configure.php is perfectly fine.

You are of course welcome to "rebuild" configure.php for your own sanity's sake, but changes were made with copy/paste in mind.

I was thinking of the new admin configure code to deal with the renamed directory automatically. I guess that is not essential.

It's not essential to renaming the admin because this code doesn't impact admin renaming at all.

So it's less than "not essential," it's actually irrelevant. :smile:

Whoops, looks like I spoke too soon. Totally forgot that the install process has been rewritten to actually generate configure.php on the fly if not already present. The dist-configure.php files are unused in the process (you can actually delete them before uploading).

I suggest you let the installer create fresh files for you, and work with them. Apologies for misleading you.