From cfb22336c73eaa469867cc4b0525f042223dd66d Mon Sep 17 00:00:00 2001
From: Krystian Stasiowski <sdkrystian@gmail.com>
Date: Fri, 3 Apr 2020 23:19:53 -0400
Subject: [PATCH] [temp.param] Remove definitions in footnote and fix wording
 referring to non-type template parameters

---
 source/templates.tex | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/source/templates.tex b/source/templates.tex
index 8630072b29..36c9709bf0 100644
--- a/source/templates.tex
+++ b/source/templates.tex
@@ -277,17 +277,16 @@
 \tcode{typename}
 followed by a
 \grammarterm{qualified-id}
-denotes the type in a non-type%
+denotes the type in a \grammarterm{parameter-declaration}.%
 \footnote{Since template
 \grammarterm{template-parameter}{s}
 and template
 \grammarterm{template-argument}{s}
 are treated as types for descriptive purposes, the terms
-\term{non-type parameter}
-and
-\term{non-type argument}
-are used to refer to non-type, non-template parameters and arguments.}
-\grammarterm{parameter-declaration}.
+non-type \grammarterm{template-parameter} and
+non-type \grammarterm{template-argument}
+are used to refer to non-type, non-template \grammarterm{template-parameter}{s}
+and \grammarterm{template-argument}{s}.}
 A \grammarterm{template-parameter} of the form
 \tcode{class} \grammarterm{identifier} is a \grammarterm{type-parameter}.
 \begin{example}