If you want to go back to the beginning of where we are today, you probably want to read something like Secret Armies by John Adams. Special forces were spawned to wage low-intensity conflict/warfare and attack or respond to unconventional threats.
The terrorology field has blossomed post-2001 and there are more definitions, but everything still files nicely: state/non-state and religious, political, cultural. If you ask me, they're all the same.
Regardless of what the lawyers--politicians--add to the body of definitions, definitions of terrorism are very gray unlike conventional war.
Low-intensity conflict is how wars are waged today and the definitions aren't as black and white as conventional war.
A revolution would be a disaster, because the new government would likely be much worse.
Can you tell me where to look for info on this, though? Or do you have a link?