PT10 demo question

[Hanslemonverm]

I'm currently running a HD2-rig on PT8HD and I also have a macbook with an Mbox 2 pro. I want to get rid of the mbox pro and use my two Mackie Onyx Blackbirds for preproduction recordings. I want to install the demo on my macbook and check how it runs with the Blackbirds before I upgrade. I'm currently negotiating with a reseller to buy a PT HD10 license upgrade.
I got both the PT 10 and the PT HD10 ilok license in my ilok account. I downloaded the HD version and now I'm wondering... these are my questions:

- Is the demo version the same as the full version of PT 10 HD and will it be unlocked when I add the PT 10HD license that I buy from the reseller. Or will I have to download another file from Avid?
- If I buy a Pro Tools 10HD upgrade license , will I also get the PT 10 license to use it on my macbook? Is it automatically included?


thanks
Hans