diff --git a/lib/OpenLayers/Layer/WFS.js b/lib/OpenLayers/Layer/WFS.js
index 84254faab1..4dfcddf0d7 100644
--- a/lib/OpenLayers/Layer/WFS.js
+++ b/lib/OpenLayers/Layer/WFS.js
@@ -59,6 +59,8 @@ OpenLayers.Layer.WFS = OpenLayers.Class(
       * APIProperty: format
       * {<OpenLayers.Format>} The format you want the data to be parsed with.
       * Must be passed in the constructor. Should be a class, not an instance.
+      * This option can only be used if no featureClass is passed / vectorMode
+      * is false: if a featureClass is passed, then this parameter is ignored.
       */
     format: null,
 
@@ -78,7 +80,8 @@ OpenLayers.Layer.WFS = OpenLayers.Class(
 
     /**
      * Property: vectorMode
-     * {Boolean} Should be calculated automatically.
+     * {Boolean} Should be calculated automatically. Determines whether the
+     *     layer is in vector mode or marker mode.
      */
     vectorMode: true,