[basic.pre,basic.lookup.general] Cleanup definition of term 'name loo…

…kup'

source/basic.tex

@@ -103,11 +103,13 @@
 or the \tcode{*\keyword{this}} object\iref{expr.prim.this}.
 
 \pnum
-Some names denote types or templates. In general,
-whenever a name is encountered it is necessary to determine whether that name denotes
-one of these entities before continuing to parse the program that contains it. The
-process that determines this is called
-\defnx{name lookup}{lookup!name}\iref{basic.lookup}.
+\begin{note}
+Some names denote types or templates.
+In general, whenever a name is encountered
+it is necessary to look it up\iref{basic.lookup}
+to determine whether that name denotes one of these entities
+before continuing to parse the program that contains it.
+\end{note}
 
 \pnum
 Two names are \defnx{the same}{name!same} if
@@ -1519,13 +1521,13 @@
 \indextext{scope!name lookup and|see{lookup, name}}%
 
 \pnum
+\defnx{Name lookup}{lookup!name} associates the use of a name
+with a set of declarations\iref{basic.def} of that name.
 The name lookup rules apply uniformly to all names (including
 \grammarterm{typedef-name}{s}\iref{dcl.typedef},
 \grammarterm{namespace-name}{s}\iref{basic.namespace}, and
 \grammarterm{class-name}{s}\iref{class.name}) wherever the grammar allows
-such names in the context discussed by a particular rule. Name lookup
-associates the use of a name with a set of declarations\iref{basic.def} of
-that name.
+such names in the context discussed by a particular rule.
 Unless otherwise specified,
 the program is ill-formed if no declarations are found.
 If the declarations found by name lookup