Template:Martial arts: Difference between revisions

Browse history interactively
← Previous editNext edit →

Oknazevad (talk | contribs)

1 user group
111,158 edits
Content deleted Content added
VisualWikitext
108.65.4.30 (talk)
No edit summary
Oknazevad (talk | contribs)
Extended confirmed users
111,158 edits
Re-add aikido; it may not be a perfect fit under grappling, but unless it is put there, it's doesn't appear at all, which is not a good thing. Also, tweak some piping.
Line 15: Line 15:
| list4 = [[Sparring]]{{·}} [[Randori]]{{·}} [[Form (martial arts)|Forms (kata)]]{{·}}[[Pushing hands]]{{·}} [[Punching bag]] {{·}} [[List of practice weapons|Practice weapon]]
| list4 = [[Sparring]]{{·}} [[Randori]]{{·}} [[Form (martial arts)|Forms (kata)]]{{·}}[[Pushing hands]]{{·}} [[Punching bag]] {{·}} [[List of practice weapons|Practice weapon]]
| group5 = [[Grappling]]
| group5 = [[Grappling]]
| list5 = [[Folk wrestling]]{{·}} [[Brazilian Jiu-Jitsu]]{{·}} [[Catch Wrestling]]{{·}} [[Judo]]{{·}} [[Luta livre esportiva|Lucha Libre]]{{·}} [[Shoot wrestling]]{{·}} [[Greco-Roman wrestling]]{{·}} [[Freestyle wrestling]]{{·}} [[Jujutsu]]
| list5 = [[Aikido]]{{·}} [[Folk wrestling]]{{·}} [[Brazilian Jiu-Jitsu]]{{·}} [[Catch Wrestling]]{{·}} [[Judo]]{{·}} [[Luta livre esportiva|Luta livre]]{{·}} [[Shoot wrestling]]{{·}} [[Greco-Roman wrestling]]{{·}} [[Freestyle wrestling]]{{·}} [[Jujutsu]]
| group6 = [[Contact sport#Full-contact|Full contact]] [[Combat sport|sports]]
| group6 = [[Contact sport#Full-contact|Full contact]] [[Combat sport|sports]]
| list6 =[[Bare-knuckle boxing]]{{·}}[[professional boxing|Boxing]] {{·}} [[Capoeira]] {{·}} [[Full contact karate]] {{·}} [[Kickboxing]]{{·}} [[Mixed martial arts]]{{·}} [[Muay Thai]]{{·}} [[Sanshou]]{{·}} [[Shooto]]{{·}} [[Sambo (martial art)|Sambo]]{{·}} [[Shoot boxing]]{{·}} [[Taekwondo]]
| list6 =[[Bare-knuckle boxing]]{{·}}[[professional boxing|Boxing]] {{·}} [[Capoeira]] {{·}} [[Full contact karate]] {{·}} [[Kickboxing]]{{·}} [[Mixed martial arts]]{{·}} [[Muay Thai]]{{·}} [[Sanshou]]{{·}} [[Shooto]]{{·}} [[Sambo (martial art)|Sambo]]{{·}} [[Shoot boxing]]{{·}} [[Taekwondo]]
| group7 = [[Self-defense]]/[[Combative]]s
| group7 = [[Self-defense]]/[[Combative]]s
| list7 = [[Bartitsu]]{{·}} [[Krav Maga]]{{·}} [[Marine Corps Martial Arts Program|MCMAP]]{{·}} [[Systema]]{{·}} [[Keysi Fighting Method|Keysi Fighting Method (KFM)]]{{·}} [[Right of self-defense|Legal aspects]]
| list7 = [[Bartitsu]]{{·}} [[Krav Maga]]{{·}} [[Marine Corps Martial Arts Program|MCMAP]]{{·}} [[Systema]]{{·}} [[Keysi Fighting Method|KFM]]{{·}} [[Right of self-defense|Legal aspects]]
| group8 = Entertainment
| group8 = Entertainment
| list8 = [[Wuxia]]{{·}} [[Mock combat]]{{·}} [[Fight choreography]]{{·}} [[Martial arts film]]{{·}} [[Professional wrestling]]{{·}} [[List of fictional martial arts|Fiction]]
| list8 = [[Wuxia]]{{·}} [[Mock combat]]{{·}} [[Fight choreography]]{{·}} [[Martial arts film]]{{·}} [[Professional wrestling]]{{·}} [[List of fictional martial arts|Fiction]]

Revision as of 13:51, 15 May 2012

allikas: https://en.wikipedia.org/wiki/Special%3ADiff%2F492693223