Looking back to the ancients is not a fruitless endeavor. Take Callwell's Small Wars: Their principles and practice (the 1903 edition is available from Google Books as a pdf download), chap 1, p.1:

Small war is a term which has come largely into use of late years, and which it is somewhat difficult to define. Practically it may be said to include all campaigns other than those where both the opposing sides consist of regular troops. It comprises the expeditions against savages and semi-civilised races by disciplined soldiers, campaigns undertaken to suppress rebellious and guerilla warfare in all parts of the world where organized armies are struggling against opponents who will not meet them in the open field. It thus obviously covers operations very varying in their scope and in their conditions.

The expression " small war " has in reality no particular connection with the scale on which any campaign may be carried out; it is simply used to denote, in default of a better, operations of regular armies against irregular, or comparatively speaking irregular, forces.
....
[JMM note: In the text, a brief digression where Callwell suggests that the 1894 Sino-Japanese War might "almost be described as a small war" since the Japanese were a "highly trained, armed, organized, and disciplined army" and the Chinese forces "could not possibly be described as regular troops in the proper sense of the word".]
....
Small wars include the partisan warfare which usually arises when trained soldiers are employed in the quelling of sedition and of insurrections in civilized countries; they include campaigns of conquest when a Great Power adds the territory of barbarous races to its possessions; and they include punitive expeditions against tribes bordering upon distant colonies.
Both small wars and "big wars", are conflicts (violence between armed forces) which still fall into the broad category of "armed conflicts" legally. Another continuing legal concept viable from Callwell's time to our own is the distinction between regular forces (read generally as the armed forces of a nation-state) and irregular forces (read generally as the armed forces of a non-state actor) in legal terms.

Callwell does not deal with the "political struggle" (read that generally as civil affairs, but it goes well beyond that as viewed by Mao and Giap, including low intensity violence). Presumbly, he relied on British colonial administrators to handle that in cases where it was needed.

A few years back, John Sulllivan wrote a thesis with the long winded title, The Marine Corps’ Small Wars Manual and Colonel C.E. Callwell’s Small Wars - Relevant to the Twenty-First Century or Irrelevant Anachronisms? (in SWC library), where he summed several definitions (I've switched the order to put Callwell, the oldest of the four, first):

Appendix C – Small Wars & Other Associated Definitions

small wars

Small Wars – Small wars include all campaigns other than those where both the opposing sides consist of regular troops. Small wars cover operations varying in their scope and in their conditions. Small wars denote operations of regular armies against irregular, or comparatively speaking irregular, forces.[99][99] Callwell, Small Wars, 21.

Small Wars Manual - Small wars are operations undertaken under executive authority, wherein military force is combined with diplomatic pressure in the internal or external affairs of another state whose government is unstable, inadequate, or unsatisfactory for the preservation of life and of such interests as are determined by the foreign policy of our Nation.[98][98] U.S. Marine Corps, Small Wars Manual, 1940, 1-1.

military operations other than war (MOOTW)

DOD Dictionary of Military Terms - Operations that encompass the use of military capabilities across the range of military operations short of war. These military actions can be applied to complement any combination of the other instruments of national power and occur before, during, and after war.[100][100] http://www.dtic.mil/doctrine/jel/dod...a/m/index.html [JMM: no longer among the definitions "in force"]

low intensity conflict (LIC)

U.S. Army Field Manual 100-20 - a political-military confrontation between contending states or groups below conventional war and above the routine, peaceful competition among states. It frequently involves protracted struggles of competing principles and ideologies. Low-intensity conflict ranges from subversion to the use of the armed forces. It is waged by a combination of means, employing political, economic, informational, and military instruments. Low-intensity conflicts are often localized, generally in the Third World, but contain regional and global security implications.[101][101] http://en.wikipedia.org/wiki/Low_intensity_conflict [JMM: definition in 1990]
The trend in these definitions emphasize the shift away from a purely military definition (in Callwell's Small Wars), to inclusion of diplomatic concerns and the military in support thereof (in the 1940 USMC Small Wars Manual), to military operations short of war ("to complement any combination of the other instruments of national power"), and to LIC where the conflict is expressly defined in terms of a "a political-military confrontation", which "is waged by a combination of means, employing political, economic, informational, and military instruments."

Those examples illustrate no shocking changes in military doctrine qua the "military struggle", but they do present an illustration of the progressive inclusion of aspects of the "political struggle" in US military doctrine.

Dayuhan presented an example of the "political struggle"; timely because of an article in Foreign Affairs, And Justice for All, citing a UN estimate that 4 billion people are ruled under corrupt crimiinal and civil justice systems:

The areas of the Philippines where communist influence remains significant are generally fairly remote, and are generally ruled under what are effectively feudal dynasties. Land reform or reparation are less the issues than the corrupt and abusive character of local governance, and the immunity from legal process enjoyed by the politically influential families. I actually think this could be resolved in most of the affected areas, with sufficient political will, and that the impact on the insurgency would be substantial.
Obviously Steve presents a problem that can only be solved via the "political struggle". So, who is tasked to come up with the solution on the counter-revolutionary side - military or civilians ? The insurgents, if good ole Coms, will present Peoples Courts as the answer (the Taliban, Taliban Courts).

Thus, What is to be done; and who should do it ?

Part of the answer to those questions depends on whether a pollitical solution is needed to end the insurgency. A political solution could be a negotiated settlement, but it could also be the political solution of the dominant party being forced down the other party's throat.

Regards

Mike