Correct usages of "final variable" and "constant variable"

Author: eernstg

specification/dartLangSpec.tex

@@ -1429,7 +1429,6 @@ \section{Variables}
 is a variable whose declaration includes the modifier \FINAL.
 
 
-
 \subsection{Implicitly Induced Getters and Setters}
 \LMLabel{implicitlyInducedGettersAndSetters}
 
@@ -2339,8 +2338,8 @@ \subsection{Formal Parameters}
 the formal parameter scope of $f$.
 
 \LMHash{}%
-It is a \Error{compile-time error} if a formal parameter
-is declared as a constant variable (\ref{variables}).
+It is a \Error{compile-time error} if a formal parameter declaration
+has the modifier \CONST.
 % We put the following error here because it's shared among all kinds of
 % functions except one.
 It is a \Error{compile-time error} if an optional formal parameter
@@ -8642,7 +8641,7 @@ \subsection{Constants}
   that is not qualified by a deferred prefix,
   is a potentially constant and constant expression.
   \commentary{%
-    For example, if class $C$ declares a constant class variable $v$, !!!TODO!!!
+    For example, if class $C$ declares a static constant variable $v$,
     \code{$C$.$v$} is a constant.
     The same is true if $C$ is accessed via a prefix $p$;
     \code{$p$.$C$.$v$} is a constant unless $p$ is a deferred prefix.%
@@ -18971,7 +18970,7 @@ \subsection{Local Variable Declaration}
 Otherwise, the variable $v$ is bound to $o$.
 
 \LMHash{}%
-Let $D$ be a \LATE{} and \FINAL{} local variable declaration
+Let $D$ be a \LATE{} and final local variable declaration
 that declares a variable $v$.
 If an object $o$ is assigned to $v$
 in a situation where $v$ is unbound
@@ -19295,7 +19294,7 @@ \subsubsection{For-in}
 It follows that it is a compile-time error
 % The following error exists also in the case where \id{} is definitely
 % unassigned before the loop: The loop could run >1 time.
-if $D$ is empty and \id{} is a final variable.
+if $D$ is empty and \id{} is a final or constant variable.
 Also, it is a dynamic error if $e$ has type \DYNAMIC,
 but $e$ evaluates to an instance of a type
 which is not a subtype of \code{Iterable<Object?>}.%