Greg Jennings

Just to be clear...

War = Organized violence between states and non-state actors to achieve political ends.
Warefare = The collection of techniques used to carry out war.
Battle = A component of the hierarchy of combat (fighting) in war.

and, while I'm at it,

Warrior = One whose avocation is war.

Contrasted with:

Martial Art = A codified system or tradition of fighting practiced for self defense, competition, health or personal development.

...and while I'm at it, how many of those "martial" arts were not developed by or commonly practiced by warriors.

Martial Artist = One who practices a martial art.

I don't claim that those are "end all and be all" definitions. But, they'll serve to to ease communication...at least when I'm the party being communicated with.