[temp.concept] Move grammar non-terminal concept-definition here.

Also move concept-name here, both from [temp.pre].

Author: jensmaurer

source/templates.tex

@@ -49,16 +49,6 @@
   constraint-logical-and-expression \terminal{\&\&} primary-expression
 \end{bnf}
 
-\begin{bnf}
-\nontermdef{concept-definition}\br
-  \keyword{concept} concept-name \terminal{=} constraint-expression \terminal{;}
-\end{bnf}
-
-\begin{bnf}
-\nontermdef{concept-name}\br
-  identifier
-\end{bnf}
-
 \begin{bnf}
 \nontermdef{type-constraint}\br
   \opt{nested-name-specifier} concept-name\br
@@ -4038,6 +4028,16 @@
 A \defn{concept} is a template
 that defines constraints on its template arguments.
 
+\begin{bnf}
+\nontermdef{concept-definition}\br
+  \keyword{concept} concept-name \terminal{=} constraint-expression \terminal{;}
+\end{bnf}
+
+\begin{bnf}
+\nontermdef{concept-name}\br
+  identifier
+\end{bnf}
+
 \pnum
 A \grammarterm{concept-definition}
 declares a concept.