Merge branch 'master' into osm

Conflicts:
	apidoc_config/Menu.txt

lib/OpenLayers/Layer/ArcGISCache.js

@@ -363,7 +363,7 @@ OpenLayers.Layer.ArcGISCache = OpenLayers.Class(OpenLayers.Layer.XYZ, {
      * Get this layer's maximum extent.
      *
      * Returns:
-     * {OpenLayers.Bounds}
+     * {<OpenLayers.Bounds>}
      */
     getMaxExtent: function() {
         var resolution = this.map.getResolution();

lib/OpenLayers/Layer/Bing.js

@@ -21,6 +21,13 @@
  */
 OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
 
+    /**
+     * Property: key
+     * {String} API key for Bing maps, get your own key 
+     *     at http://bingmapsportal.com/ .
+     */
+    key: null,
+
     /**
      * Property: serverResolutions
      * {Array} the resolutions provided by the Bing servers.
@@ -82,7 +89,7 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
      * (end)
      *
      * Parameters:
-     * config - {Object} Configuration properties for the layer.
+     * options - {Object} Configuration properties for the layer.
      *
      * Required configuration properties:
      * key - {String} Bing Maps API key for your application. Get one at

lib/OpenLayers/Layer/GeoRSS.js

@@ -15,7 +15,6 @@
  * 
  * Inherits from:
  *  - <OpenLayers.Layer.Markers>
- *  - <OpenLayers.Layer>
  */
 OpenLayers.Layer.GeoRSS = OpenLayers.Class(OpenLayers.Layer.Markers, {
 

lib/OpenLayers/Layer/Google.js

@@ -205,7 +205,7 @@ OpenLayers.Layer.Google = OpenLayers.Class(
      * APIMethod: setOpacity
      * Sets the opacity for the entire layer (all images)
      * 
-     * Parameter:
+     * Parameters:
      * opacity - {Float}
      */
     setOpacity: function(opacity) {

lib/OpenLayers/Layer/Grid.js

@@ -817,7 +817,7 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
      *     potential specific implementations in sub-classes.)
      *
      * Returns:
-     * {OpenLayers.Bounds}
+     * {<OpenLayers.Bounds>}
      */
     getMaxExtent: function() {
         return this.maxExtent;

lib/OpenLayers/Layer/Image.js

@@ -12,7 +12,10 @@
  * Class: OpenLayers.Layer.Image
  * Instances of OpenLayers.Layer.Image are used to display data from a web
  * accessible image as a map layer.  Create a new image layer with the
- * <OpenLayers.Layer.Image> constructor.  Inherits from <OpenLayers.Layer>.
+ * <OpenLayers.Layer.Image> constructor.
+ *
+ * Inherits from:
+ *  - <OpenLayers.Layer>
  */
 OpenLayers.Layer.Image = OpenLayers.Class(OpenLayers.Layer, {
 

lib/OpenLayers/Layer/MapServer.js

@@ -114,7 +114,7 @@ OpenLayers.Layer.MapServer = OpenLayers.Class(OpenLayers.Layer.Grid, {
      * Method: getFullRequestString
      * combine the layer's url with its params and these newParams. 
      *   
-     * Parameter:
+     * Parameters:
      * newParams - {Object} New parameters that should be added to the 
      *                      request string.
      * altUrl - {String} (optional) Replace the URL in the full request  

lib/OpenLayers/Layer/Markers.js

@@ -64,7 +64,7 @@ OpenLayers.Layer.Markers = OpenLayers.Class(OpenLayers.Layer, {
      * APIMethod: setOpacity
      * Sets the opacity for all the markers.
      * 
-     * Parameter:
+     * Parameters:
      * opacity - {Float}
      */
     setOpacity: function(opacity) {

lib/OpenLayers/Layer/PointGrid.js

@@ -69,7 +69,7 @@ OpenLayers.Layer.PointGrid = OpenLayers.Class(OpenLayers.Layer.Vector, {
 
     /**
      * APIProperty: origin
-     * {OpenLayers.LonLat} Grid origin.  The grid lattice will be aligned with 
+     * {<OpenLayers.LonLat>} Grid origin.  The grid lattice will be aligned with 
      * the origin.  If not set at construction, the center of the map's maximum 
      * extent is used.  Read-only.  Use the <setOrigin> method to modify this 
      * value.

lib/OpenLayers/Layer/Text.js

@@ -234,6 +234,9 @@ OpenLayers.Layer.Text = OpenLayers.Class(OpenLayers.Layer.Markers, {
      * 
      * Parameters:
      * evt - {Event} 
+     *
+     * Context:
+     * - {<OpenLayers.Feature>}
      */
     markerClick: function(evt) {
         var sameMarkerClicked = (this == this.layer.selectedFeature);