“McCain voted for legislation that ensured that these terrorists would be classified as unlawful combatants and subjected to military tribunals.”
McCain can vote for what he want, but he is too stupid to figure out the ramifications. There is case law that says any CONUS detainee gets the rights to a writ.
The web page you cited does not supersede the congressional legislation of ‘06.