Thinking about what tolerance actually means

This BBC News page has some commentary about the origins of the word tolerance and what it means to people today.

I would be curious to know how this word has developed in the American context. Is it tolerance to let my neighbor or fellow citizen do what s/he wants as long as it doesn’t impinge on my freedoms?