CWG2682 Templated function vs. function template

Author: burblebee

source/declarations.tex

@@ -1751,8 +1751,8 @@
 \end{example}
 
 \pnum
-Return type deduction for a templated entity
-that is a function or function template with a placeholder in its
+Return type deduction for a templated
+function with a placeholder in its
 declared type occurs when the definition is instantiated even if the function
 body contains a \tcode{return} statement with a non-type-dependent operand.
 \begin{note}

source/templates.tex

@@ -172,6 +172,13 @@
 templated entity is a templated entity.
 \end{note}
 
+A \defnadj{templated}{function} is
+a function template or a function that is templated.
+A \defnadj{templated}{class} is
+a class template or a class that is templated.
+A \defnadj{templated}{variable} is
+a variable template or a variable that is templated.
+
 \pnum
 A \grammarterm{template-declaration} is written
 in terms of its template parameters.