As a testimony to how much support Wi-Fi networking continues to receive, I will include a few links and suggest you look at the list of powerful companies spending their money and aligning themselves with partners in this area. It should be noted just how recent some of these news items are. It's pretty apparent that the changes mean big things for Wi-Fi.

I'm fairly new to my understanding of Wi-Fi, but it looks to me like the city wide Wi-Fi deployments mean that you can expect Wi-Fi and Wi-Max technologies to both be a part of city wide networks. Additionally, I'm of the belief that Muni-Wi-Fi is a term or technology name that correctly implies the combination of those 2 technologies in such a network. Mesh networks which are a fundamental method for deploying such city wide networks also make use of both Wi-Fi and Wi-Max in these rollouts.

http://www.wimax.com/commentary/news/wimax_industry_news/news7-07-2006mw1

http://news.com.com/AT38T+teams+with+startup+in+citywide+Wi-Fi+bid/2100-1037_3-6096822.html