It probably should cover riots. Unless of course the riot is in support of [good thing]. Implicit to any definition of terrorism is the qualification that it doesn't count if it's done to support [thing you support]. Naturally.

As they say, one man's terrorist is another man's freedom fighter.