Changes re FormParam not supported on fields and properties.
svn path=/trunk/; revision=467
diff --git a/spec/chapters/annotations.tex b/spec/chapters/annotations.tex
index 96d93fe..7ca320d 100644
--- a/spec/chapters/annotations.tex
+++ b/spec/chapters/annotations.tex
@@ -24,7 +24,7 @@
\hline
\code{QueryParam} & \raggedright Parameter, field or method & \raggedright Specifies that the value of a method parameter, class field, or bean property is to be extracted from a URI query parameter. The value of the annotation identifies the name of a query parameter. \tabularnewline
\hline
-\code{FormParam} & \raggedright Parameter & \raggedright Specifies that the value of a method parameter is to be extracted from a form parameter in a request entity body. The value of the annotation identifies the name of a form parameter. \tabularnewline
+\code{FormParam} & \raggedright Parameter, field or method & \raggedright Specifies that the value of a method parameter is to be extracted from a form parameter in a request entity body. The value of the annotation identifies the name of a form parameter. Note that whilst the annotation target allows use on fields and methods, the specification only requires support for use on resource method parameters.\tabularnewline
\hline
\code{MatrixParam} & \raggedright Parameter, field or method & \raggedright Specifies that the value of a method parameter, class field, or bean property is to be extracted from a URI matrix parameter. The value of the annotation identifies the name of a matrix parameter. \tabularnewline
\hline
diff --git a/spec/chapters/changes.tex b/spec/chapters/changes.tex
index 593bae5..4952eb6 100644
--- a/spec/chapters/changes.tex
+++ b/spec/chapters/changes.tex
@@ -8,6 +8,7 @@
\item Chapter \ref{applications}: Renamed ApplicationConfig class to Application.
\item Chapter \ref{resources}: UriBuilder reworked to always encode components.
\item Sections \ref{resource_class_constructor} and \ref{provider_class_constructor}: Added requirement to warn when choice of constructor is ambiguous.
+\item Section \ref{resource_field}: \code{FormParam} no longer required to be supported on fields or properties.
\item Section \ref{resource_method_return}: Added text describing how to determine raw and generic types from method return type and returned instance.
\item Section \ref{uritemplates}: Template parameters can specify the regular expression that forms their capturing group.
\item Section \ref{reqpreproc}: Make pre-processed URIs available rather than original request URI. Added URI normalization.
diff --git a/spec/chapters/resources.tex b/spec/chapters/resources.tex
index 9e52ee3..ad1c012 100644
--- a/spec/chapters/resources.tex
+++ b/spec/chapters/resources.tex
@@ -78,7 +78,7 @@
The value of a non-annotated parameter, called the entity parameter, is mapped from the request entity body. Conversion between an entity body and a Java type is the responsibility of an entity provider, see section \ref{entity_providers}.
-Resource methods MUST NOT have more than one parameter that is not annotated with one of the above-listed annotations. If a sibling method parameter, class field, or property, is annotated with \FormParam, the type of the entity parameter MUST be \code{Multi\-valued\-Map<String, String>}.
+Resource methods MUST NOT have more than one parameter that is not annotated with one of the above-listed annotations.
\subsection{Return Type}
\label{resource_method_return}
