diff --git a/lib/OpenLayers/Feature/Vector.js b/lib/OpenLayers/Feature/Vector.js
index 4e96ea6b53..b0e91009c4 100644
--- a/lib/OpenLayers/Feature/Vector.js
+++ b/lib/OpenLayers/Feature/Vector.js
@@ -297,7 +297,7 @@ OpenLayers.Feature.Vector = OpenLayers.Class(OpenLayers.Feature, {
      * Moves the feature and redraws it at its new location
      *
      * Parameters:
-     * location - {OpenLayers.LonLat or OpenLayers.Pixel} the
+     * location - {<OpenLayers.LonLat> or <OpenLayers.Pixel>} the
      *         location to which to move the feature.
      */
     move: function(location) {
diff --git a/lib/OpenLayers/Format/ArcXML.js b/lib/OpenLayers/Format/ArcXML.js
index a3b9e1dc07..72ac2096c9 100644
--- a/lib/OpenLayers/Format/ArcXML.js
+++ b/lib/OpenLayers/Format/ArcXML.js
@@ -135,7 +135,7 @@ OpenLayers.Format.ArcXML = OpenLayers.Class(OpenLayers.Format.XML, {
      *
      * Parameters:
      * imsize - {Object} An ArcXML imagesize object.
-     * olsize - {OpenLayers.Size} The image size to set.
+     * olsize - {<OpenLayers.Size>} The image size to set.
      */
     addImageSize: function(imsize, olsize) {
         if (olsize !== null) {
@@ -152,7 +152,7 @@ OpenLayers.Format.ArcXML = OpenLayers.Class(OpenLayers.Format.XML, {
      *
      * Parameters:
      * featOrFilt - {Object} A featurecoordsys or filtercoordsys ArcXML structure.
-     * fsys - {String} or {OpenLayers.Projection} or {filtercoordsys} or 
+     * fsys - {String} or {<OpenLayers.Projection>} or {filtercoordsys} or 
      * {featurecoordsys} A projection representation. If it's a {String}, 
      * the value is assumed to be the SRID.  If it's a {OpenLayers.Projection} 
      * AND Proj4js is available, the projection number and name are extracted 
@@ -873,7 +873,7 @@ OpenLayers.Format.ArcXML = OpenLayers.Class(OpenLayers.Format.XML, {
      * node - {<DOMElement>} An element to parse <COORDS> or <POINT> arcxml data from.
      *
      * Returns:
-     * {OpenLayers.Geometry.LinearRing} A linear ring represented by the node's points.
+     * {<OpenLayers.Geometry.LinearRing>} A linear ring represented by the node's points.
      */
     parsePointGeometry: function(node) {
         var ringPoints = [];
diff --git a/lib/OpenLayers/Format/GPX.js b/lib/OpenLayers/Format/GPX.js
index d75e09ec72..c6a67f9953 100644
--- a/lib/OpenLayers/Format/GPX.js
+++ b/lib/OpenLayers/Format/GPX.js
@@ -281,7 +281,7 @@ OpenLayers.Format.GPX = OpenLayers.Class(OpenLayers.Format.XML, {
      *
      * Parameters:
      * trknode
-     * geometry - {OpenLayers.Geometry}
+     * geometry - {<OpenLayers.Geometry>}
      */
     buildTrkSegNode: function(geometry) {
         var node,
@@ -311,7 +311,7 @@ OpenLayers.Format.GPX = OpenLayers.Class(OpenLayers.Format.XML, {
      * Builds a trkpt node given a point 
      *
      * Parameters:
-     * point - {OpenLayers.Geometry.Point}
+     * point - {<OpenLayers.Geometry.Point>}
      *
      * Returns:
      * {DOMElement} A trkpt node
@@ -328,7 +328,7 @@ OpenLayers.Format.GPX = OpenLayers.Class(OpenLayers.Format.XML, {
      * Builds a wpt node given a point
      *
      * Parameters:
-     * feature - {OpenLayers.Feature.Vector}
+     * feature - {<OpenLayers.Feature.Vector>}
      *
      * Returns:
      * {DOMElement} A wpt node
@@ -347,7 +347,7 @@ OpenLayers.Format.GPX = OpenLayers.Class(OpenLayers.Format.XML, {
      *
      * Parameters:
      * node - {DOMElement} the node to append the attribute nodes to.
-     * feature - {OpenLayers.Feature.Vector}
+     * feature - {<OpenLayers.Feature.Vector>}
      */
     appendAttributesNode: function(node, feature) {
         var name = this.createElementNS(this.gpxns, 'name');
diff --git a/lib/OpenLayers/Geometry/Collection.js b/lib/OpenLayers/Geometry/Collection.js
index dc02e162b5..965c69e208 100644
--- a/lib/OpenLayers/Geometry/Collection.js
+++ b/lib/OpenLayers/Geometry/Collection.js
@@ -407,7 +407,7 @@ OpenLayers.Geometry.Collection = OpenLayers.Class(OpenLayers.Geometry, {
      * ratio - {Float} Optional x:y ratio for resizing.  Default ratio is 1.
      * 
      * Returns:
-     * {OpenLayers.Geometry} - The current geometry. 
+     * {<OpenLayers.Geometry>} - The current geometry. 
      */
     resize: function(scale, origin, ratio) {
         for(var i=0; i<this.components.length; ++i) {
diff --git a/lib/OpenLayers/Layer/Bing.js b/lib/OpenLayers/Layer/Bing.js
index 92fe773bb4..85c27acdeb 100644
--- a/lib/OpenLayers/Layer/Bing.js
+++ b/lib/OpenLayers/Layer/Bing.js
@@ -22,7 +22,7 @@
 OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
 
     /**
-     * APIProperty: key
+     * Property: key
      * {String} API key for Bing maps, get your own key 
      *     at http://bingmapsportal.com/ .
      */
diff --git a/lib/OpenLayers/Util.js b/lib/OpenLayers/Util.js
index 61ec5bc2c1..9b6a85712b 100644
--- a/lib/OpenLayers/Util.js
+++ b/lib/OpenLayers/Util.js
@@ -1491,7 +1491,7 @@ OpenLayers.Util.getBrowserName = function() {
  *         this node instead of the body root when calculating dimensions. 
  * 
  * Returns:
- * {OpenLayers.Size}
+ * {<OpenLayers.Size>}
  */
 OpenLayers.Util.getRenderedDimensions = function(contentHTML, size, options) {