proper syntax for variables

[Duane Cox]

Hello, I'm running a some cvs checkout of freeradius dated 2.0.0 pre0 from
august 2006
It's been running flawlessly in production, so I've been hesitant to upgrade
it, but it's time...

I have a question about the variables, and perhaps they have changed because
all the new docs show another way.

What is correct:

%{NAS-Port:-%{NAS-Port-Id}}  or  %{%{NAS-Port}:-%{NAS-Port-Id}}

Also this one...

%{Acct-Output-Octets:-0}  or %{%{Acct-Output-Octets}:-0}

Or will any of the above be OK?

I wasn't sure if I needed to change any of my variables prior to the upgrade
to 2.0.0 pre2

Thanks
Duane Cox