consistently refer to constant **template** parameter/argument

Author: cor3ntin

source/declarations.tex

@@ -7185,7 +7185,7 @@
 in the scope of \tcode{E}\iref{class.member.lookup}
 finds at least one declaration
 that is a function template whose first template parameter
-is a constant parameter,
+is a constant template parameter,
 the initializer is
 \tcode{\exposidnc{e}.get<i>()}. Otherwise, the initializer is \tcode{get<i>(\exposid{e})},
 where \tcode{get} undergoes argument-dependent lookup\iref{basic.lookup.argdep}.

source/templates.tex

@@ -296,9 +296,9 @@
 and template
 \grammarterm{template-argument}{s}
 are treated as types for descriptive purposes, the terms
-\term{constant parameter}
+\term{constant template parameter}
 and
-\term{constant argument}
+\term{constant template argument}
 are used to refer to constant, non-template parameters and arguments.
 \end{footnote}
 \grammarterm{parameter-declaration}.
@@ -3453,8 +3453,8 @@
 \end{example}
 
 \pnum
-A constant argument is non-specialized if it is the name of a constant
-parameter.
+A constant template argument is non-specialized if it is the name of a constant
+template parameter.
 All other constant arguments are specialized.
 
 \pnum
@@ -3463,8 +3463,8 @@
 
 \begin{itemize}
 \item
-The type of a template parameter corresponding to a specialized constant argument
-shall not be dependent on a parameter of the partial specialization.
+The type of a template parameter corresponding to a specialized constant template
+argument shall not be dependent on a parameter of the partial specialization.
 \begin{example}
 \begin{codeblock}
 template <class T, T t> struct C {};
@@ -8325,7 +8325,7 @@
 is compared with an actual type (call it
 \tcode{A}),
 and an attempt is made to find template argument values (a type for a type
-parameter, a value for a constant parameter, or a template for a
+parameter, a value for a constant template parameter, or a template for a
 template parameter) that will make
 \tcode{P},
 after substitution of the deduced values (call it the deduced
@@ -8580,7 +8580,7 @@
 \tcode{T},
 a template template argument
 \tcode{TT},
-or a template constant argument
+or a constant template argument
 \tcode{i}
 can be deduced if
 \tcode{P}