Current correct woody URL's for apt-get?

[montefin <montefin@finux.com>]

Hi,

I upgraded from potato [Frozen] to woody just before potato [Frozen]
went stable.

I have continued to use the following URL's in /etc/apt/sources.list for
my apt-get upgrades:

deb http://http.us.debian.org/debian woody main contrib non-free
deb http://non-us.debian.org/debian-non-US woody/non-US main contrib
non-free
deb-src http://http.us.debian.org/debian woody main contrib non-free

I have not done an apt-get upgrade in two weeks.

I just now did an apt-get update using the URL's above. Then an apt-get
--simulate upgrade. Things seem fine.

I know at some point I should change those URL's to unstable.

After viewing the Debian Releases page at
http://www.debian.org/releases/ it looks like they should be:

deb http://http.us.debian.org/debian unstable main contrib non-free
deb http://non-us.debian.org/debian-non-US unstable/non-US main contrib
non-free
deb-src http://http.us.debian.org/debian unstable main contrib non-free

But I thought I would check with the masters before I proceeded.

Thanks for any input,

montefin
----------
Apochryphal Fact: 347 paranoids were murdered last year.