@@ -2425,10 +2425,10 @@
 
 \pnum
 An implementation shall not predefine the \tcode{main} function. This
-function shall not be overloaded. It shall have a return type of type
+function shall not be overloaded. It shall have a declared return type of type
 \tcode{int}, but otherwise its type is \impldef{parameters to \tcode{main}}.
 \indextext{\idxcode{main()}!implementation-defined parameters~to}%
-All implementations shall allow both
+An implementation shall allow both
 
 \begin{itemize}
 \item a function of \tcode{()} returning \tcode{int} and
 
@@ -952,10 +952,7 @@
 
 \pnum
 The \tcode{constexpr} specifier has no
-effect on the type of a \tcode{constexpr} function or a \tcode{constexpr} constructor.
-The class of
-which a \tcode{constexpr} function is a member shall be a literal
-type~(\ref{basic.types}). \enterexample
+effect on the type of a \tcode{constexpr} function or a \tcode{constexpr} constructor.  \enterexample
 \begin{codeblock}
 class debug_flag { 
 public: 
 
@@ -6210,6 +6210,12 @@
 and the deduction is done as
 described in~\ref{temp.deduct.type}.
 
+\pnum
+A placeholder type~(\ref{dcl.spec.auto}) in the return type of a
+function template is a non-deduced context. If template argument
+deduction succeeds for such a function, the return type is determined
+from instantiation of the function body.
+
 \rSec3[temp.deduct.conv]{Deducing conversion function template arguments}
 
 \pnum