Full merge from trunk at revision 41356 of entire boost-root tree.

[SVN r41370]

doc/ref/iteration_params_x.html

@@ -42,7 +42,7 @@
 			</dd>
 			<dt>[flags]</dt>
 			<dd>
-				A quoted or angle-bracketed filename to used as the target of a <i>file-iteration</i>.
+				The flags associated with this <i>file-iteration</i> used to discriminate between different <i>file-iterations</i> in the same file.
 			</dd>
 		</dl>
 	<h4>Remarks</h4>