Kerry did two tours. That is correct. Neither was of one year duration. A ship-bound "tour" was the first, his assignment on Swift boats was the second.
In the tin-can Navy, we always referred to our deployments as cruises and never as tours. Out of respect, the term tour was reserved for the folks who were serving in-country. There was a world of difference between the two and we knew it.