non-type template parameter should be non-type \grammarterm{template-parameter} more consistently

[Tsche]

Currently the C++ standard uses non-type \grammarterm{template-parameter} 15 times, but uses non-type template parameter in the following 11 places:

[lex.ext]/5
[dcl.type.auto.deduct]/2.4
[temp.param]/11
[temp.dep.type]/2
[temp.dep.constexpr]/2.3
[temp.deduct.general]/11.8
[temp.deduct.call]/1
[temp.deduct.type]/13
[temp.over.link]/6.3
[rand.eng.general]/6
[rand.adapt.general]/6

I believe it would be nice to use \grammarterm{template-parameter} in most if not all of those places.

[Eisenwave]

On a side note, I am surprised that "non-type template parameter" isn't a defined term (neither is "template parameter"), and I cannot find it in the index.

It's definitely wrong to refer to it as the version without \grammarterm then.

[frederick-vs-ja]

It seems better to me to properly define non-type template parameter, type template parameter, and template template parameter in [basic.scope.temp] and then use "plain English" forms.

[jensmaurer]

The cleanup is part of P2841.