Boo is of course correct (who would dare to argue with her? lol) as this is the general usage for these terms.
There are also Cold Water Marine setups which cater for specimens which are found in the colder climates - such as around the UK - so a setup with those flashy coral fish is in reality a Tropical Marine tank in the UK and the aquariums with setups for neons, guppies etc is a Tropical Fresh water setup. A tank with water that isn't heated such as goldfish is a Cold Fresh water setup.
Doh @ my post....ruddy war water? LOL, I did of course mean warm water!
Bless you wildwood xx - im often wrong on many things, but i know a teensy bit about fishies, considering I've three tanks scattered throughout my house.
My ambition is to have a marine tank- but the cost of running one and the scary prices of the fish themselves is putting me off- how gutted would you be if one of those beauties ended up belly up?