http://www.thailand-immigration.org/thailand-marriage-visa

This website says the requirement for a marriage visa is:

-400,000b in a Thai bank account

-40,000b monthly income

Is it either or both?

That website is incorrectly referring to a 1 year extension of stay as a visa.

If you want to apply for an extension of stay based on marriage you need a minimum of 400K in the bank for 2 months prior to the application date OR a certified (by your embassy) income of a minimum 40K pm.

If you want an actual Visa you can get one at certain Embassies/Consulates without any money in the bank.

If you want a 12 Month Extension of Stay from Immigration you need 400,000 Baht in the bank OR 40,000 monthly income.

That is not a official website. It is a commercial website. Don't trust any info on it to be accurate.

Are you wanting info to apply for a visa at an embassy or consultative or a extension of stay based upon marriage?