[dcl.type.elab] Don't start a normative paragraph with a note

Rather than having a paragraph consist of a note plus normative text,
move the note into its own paragraph. Consolidate the notes serving as
a pointer to name lookup rules, distinct from the note that applies
only to friend declarations. Clarify that the next paragraph is talking
about any elaborated-type-specifier at all, not just the ones in p4.

source/declarations.tex

@@ -1533,17 +1533,20 @@
 \begin{note}
 A \grammarterm{using-directive} in the target scope is ignored
 if it refers to a namespace not contained by that scope.
-\ref{basic.lookup.elab} describes how name lookup proceeds
-in an \grammarterm{elaborated-type-specifier}.
 \end{note}
 
 \pnum
 \begin{note}
+\ref{basic.lookup.elab} describes how name lookup proceeds
+in an \grammarterm{elaborated-type-specifier}.
 An \grammarterm{elaborated-type-specifier} can be used to refer to
 a previously declared \grammarterm{class-name} or \grammarterm{enum-name}
 even if the name has been hidden by a non-type declaration.
 \end{note}
+
+\pnum
 If the \grammarterm{identifier} or \grammarterm{simple-template-id}
+in an \grammarterm{elaborated-type-specifier}
 resolves to a \grammarterm{class-name} or
 \grammarterm{enum-name}, the \grammarterm{elaborated-type-specifier}
 introduces it into the declaration the same way a
@@ -1563,7 +1566,7 @@
 
 \pnum
 The \grammarterm{class-key} or \keyword{enum} keyword
-present in the
+present in an
 \grammarterm{elaborated-type-specifier} shall agree in kind with the
 declaration to which the name in the
 \grammarterm{elaborated-type-specifier} refers. This rule also applies to