[over.over] Extract the non-template function case from the description

of the target type and rearrange so that it better parallels the
function template specialization case.

Author: zygoloid

source/overloading.tex

@@ -3141,18 +3141,12 @@
 \indextext{overloaded function!address of}
 
 \pnum
-A use of a function name without arguments is resolved
-to a function, a pointer to function or a pointer to
-member function for a specific function from a set of selected functions,
+A use of a function name without arguments is resolved to
+a function, a pointer to function, or a pointer to member function
+for a specific function
+that is chosen from a set of selected functions
+determined based on the target type required in the context (if any),
 as described below.
-A function with type \tcode{F} is selected for the function type \tcode{FT}
-of the target type required in the context if \tcode{F}
-(after possibly applying the function pointer conversion\iref{conv.fctptr})
-is identical to \tcode{FT}.
-\begin{note}
-That is, the class of which the function is a member is ignored when matching a
-pointer-to-member-function type.
-\end{note}
 The target can be
 \begin{itemize}
 \item
@@ -3173,13 +3167,24 @@
 a non-type
 \grammarterm{template-parameter}\iref{temp.arg.nontype}.
 \end{itemize}
-If there is no target, all functions named are selected.
 The function name can be preceded by the \tcode{\&} operator.
 \begin{note}
 Any redundant set of parentheses surrounding the function name is
 ignored\iref{expr.prim.paren}.
 \end{note}
 
+\pnum
+If there is no target, all non-template functions named are selected.
+Otherwise, a non-template function with type \tcode{F}
+is selected for the function type \tcode{FT} of the target type
+if \tcode{F}
+(after possibly applying the function pointer conversion\iref{conv.fctptr})
+is identical to \tcode{FT}.
+\begin{note}
+That is, the class of which the function is a member is ignored when matching a
+pointer-to-member-function type.
+\end{note}
+
 \pnum
 For each function template designated by the name,
 template argument deduction is done\iref{temp.deduct.funcaddr}, and
@@ -3208,6 +3213,7 @@
 reference to function type.
 Non-static member functions match targets of
 pointer-to-member-function type.
+%% FIXME: Should this only apply after the eliminations in the next paragraph?
 If a non-static member function is selected, the reference to the overloaded
 function name is required to have the form of a pointer to member as
 described in~\ref{expr.unary.op}.