diff --git a/lib/OpenLayers/Control/DragPan.js b/lib/OpenLayers/Control/DragPan.js
index 4891046773..34e31be905 100644
--- a/lib/OpenLayers/Control/DragPan.js
+++ b/lib/OpenLayers/Control/DragPan.js
@@ -47,7 +47,7 @@ OpenLayers.Control.DragPan = OpenLayers.Class(OpenLayers.Control, {
 
     /**
      * Property: kinetic
-     * {OpenLayers.Kinetic} The OpenLayers.Kinetic object.
+     * {<OpenLayers.Kinetic>} The OpenLayers.Kinetic object.
      */
     kinetic: null,
 
diff --git a/lib/OpenLayers/Control/Graticule.js b/lib/OpenLayers/Control/Graticule.js
index bda9637b3c..72162d46d5 100644
--- a/lib/OpenLayers/Control/Graticule.js
+++ b/lib/OpenLayers/Control/Graticule.js
@@ -98,7 +98,7 @@ OpenLayers.Control.Graticule = OpenLayers.Class(OpenLayers.Control, {
 
     /**
      * Property: gratLayer
-     * {OpenLayers.Layer.Vector} vector layer used to draw the graticule on
+     * {<OpenLayers.Layer.Vector>} vector layer used to draw the graticule on
      */
     gratLayer: null,
 
diff --git a/lib/OpenLayers/Control/Snapping.js b/lib/OpenLayers/Control/Snapping.js
index f35cea28e9..792f0183a4 100644
--- a/lib/OpenLayers/Control/Snapping.js
+++ b/lib/OpenLayers/Control/Snapping.js
@@ -115,7 +115,7 @@ OpenLayers.Control.Snapping = OpenLayers.Class(OpenLayers.Control, {
      *     the control.
      *
      * Valid options:
-     * layer - {OpenLayers.Layer.Vector} The editable layer.  Features from this
+     * layer - {<OpenLayers.Layer.Vector>} The editable layer.  Features from this
      *     layer that are digitized or modified may have vertices snapped to
      *     features from any of the target layers.
      * targets - {Array(Object | OpenLayers.Layer.Vector)} A list of objects for
@@ -141,7 +141,7 @@ OpenLayers.Control.Snapping = OpenLayers.Class(OpenLayers.Control, {
      *     continues after an eligible feature is found in a target layer.
      *
      * Valid target properties:
-     * layer - {OpenLayers.Layer.Vector} A target layer.  Features from this
+     * layer - {<OpenLayers.Layer.Vector>} A target layer.  Features from this
      *     layer will be eligible to act as snapping target for the editable
      *     layer.
      * tolerance - {Float} The distance (in pixels) at which snapping may occur.
@@ -159,7 +159,7 @@ OpenLayers.Control.Snapping = OpenLayers.Class(OpenLayers.Control, {
      * edgeTolerance - {Float} Optional distance at which snapping may occur
      *     for edges specifically.  If none is provided, <tolerance> will be
      *     used.
-     * filter - {OpenLayers.Filter} Optional filter to evaluate to determine if
+     * filter - {<OpenLayers.Filter>} Optional filter to evaluate to determine if
      *     feature is eligible for snapping.  If filter evaluates to true for a
      *     target feature a vertex may be snapped to the feature. 
      * minResolution - {Number} If a minResolution is provided, snapping to this
@@ -198,7 +198,7 @@ OpenLayers.Control.Snapping = OpenLayers.Class(OpenLayers.Control, {
      *     layer is set.
      *
      * Parameters:
-     * layer - {OpenLayers.Layer.Vector}  The new editable layer.
+     * layer - {<OpenLayers.Layer.Vector>}  The new editable layer.
      */
     setLayer: function(layer) {
         if(this.active) {
diff --git a/lib/OpenLayers/Control/Split.js b/lib/OpenLayers/Control/Split.js
index bf5d1f3111..413b8c9f4e 100644
--- a/lib/OpenLayers/Control/Split.js
+++ b/lib/OpenLayers/Control/Split.js
@@ -106,7 +106,7 @@ OpenLayers.Control.Split = OpenLayers.Class(OpenLayers.Control, {
     
     /**
      * APIProperty: targetFilter
-     * {OpenLayers.Filter} Optional filter that will be evaluated
+     * {<OpenLayers.Filter>} Optional filter that will be evaluated
      *     to determine if a feature from the target layer is eligible for
      *     splitting.
      */
@@ -114,7 +114,7 @@ OpenLayers.Control.Split = OpenLayers.Class(OpenLayers.Control, {
     
     /**
      * APIProperty: sourceFilter
-     * {OpenLayers.Filter} Optional filter that will be evaluated
+     * {<OpenLayers.Filter>} Optional filter that will be evaluated
      *     to determine if a feature from the target layer is eligible for
      *     splitting.
      */
@@ -141,10 +141,10 @@ OpenLayers.Control.Split = OpenLayers.Class(OpenLayers.Control, {
      *     the control.
      *
      * Valid options:
-     * layer - {OpenLayers.Layer.Vector} The target layer.  Features from this
+     * layer - {<OpenLayers.Layer.Vector>} The target layer.  Features from this
      *     layer will be split by new or modified features on the source layer
      *     or temporary sketch layer.
-     * source - {OpenLayers.Layer.Vector} Optional source layer.  If provided
+     * source - {<OpenLayers.Layer.Vector>} Optional source layer.  If provided
      *     newly created features or modified features will be used to split
      *     features on the target layer.  If not provided, a temporary sketch
      *     layer will be created for drawing lines.
@@ -158,10 +158,10 @@ OpenLayers.Control.Split = OpenLayers.Class(OpenLayers.Control, {
      * mutual - {Boolean} If source and target are the same, split source
      *     features and target features where they intersect.  Default is
      *     true.  If false, only target features will be split.
-     * targetFilter - {OpenLayers.Filter} Optional filter that will be evaluated
+     * targetFilter - {<OpenLayers.Filter>} Optional filter that will be evaluated
      *     to determine if a feature from the target layer is eligible for
      *     splitting.
-     * sourceFilter - {OpenLayers.Filter} Optional filter that will be evaluated
+     * sourceFilter - {<OpenLayers.Filter>} Optional filter that will be evaluated
      *     to determine if a feature from the target layer is eligible for
      *     splitting.
      */
@@ -180,7 +180,7 @@ OpenLayers.Control.Split = OpenLayers.Class(OpenLayers.Control, {
      * Set the source layer for edits layer.
      *
      * Parameters:
-     * layer - {OpenLayers.Layer.Vector}  The new source layer layer.  If
+     * layer - {<OpenLayers.Layer.Vector>}  The new source layer layer.  If
      *     null, a temporary sketch layer will be created.
      */
     setSource: function(layer) {
diff --git a/lib/OpenLayers/Format/ArcXML.js b/lib/OpenLayers/Format/ArcXML.js
index 72ac2096c9..b87364c4e5 100644
--- a/lib/OpenLayers/Format/ArcXML.js
+++ b/lib/OpenLayers/Format/ArcXML.js
@@ -205,7 +205,7 @@ OpenLayers.Format.ArcXML = OpenLayers.Class(OpenLayers.Format.XML, {
      * data - {String} or {DOMElement} data to read/parse.
      *
      * Returns:
-     * {OpenLayers.Format.ArcXML.Response} An ArcXML response. Note that this response
+     * {<OpenLayers.Format.ArcXML.Response>} An ArcXML response. Note that this response
      *     data may change in the future. 
      */
     read: function(data) {
diff --git a/lib/OpenLayers/Geometry/LinearRing.js b/lib/OpenLayers/Geometry/LinearRing.js
index 9e9602fcaa..c8b960915c 100644
--- a/lib/OpenLayers/Geometry/LinearRing.js
+++ b/lib/OpenLayers/Geometry/LinearRing.js
@@ -153,7 +153,7 @@ OpenLayers.Geometry.LinearRing = OpenLayers.Class(
      * 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, len=this.components.length; i<len - 1; ++i) {
diff --git a/lib/OpenLayers/Geometry/Point.js b/lib/OpenLayers/Geometry/Point.js
index 06cf770e99..a6000bc4c6 100644
--- a/lib/OpenLayers/Geometry/Point.js
+++ b/lib/OpenLayers/Geometry/Point.js
@@ -212,7 +212,7 @@ OpenLayers.Geometry.Point = 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) {
         ratio = (ratio == undefined) ? 1 : ratio;
diff --git a/lib/OpenLayers/Layer/ArcGISCache.js b/lib/OpenLayers/Layer/ArcGISCache.js
index 30a5fd3366..9c500e4533 100644
--- a/lib/OpenLayers/Layer/ArcGISCache.js
+++ b/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();
diff --git a/lib/OpenLayers/Layer/Grid.js b/lib/OpenLayers/Layer/Grid.js
index d893c438cf..fca45f3eba 100644
--- a/lib/OpenLayers/Layer/Grid.js
+++ b/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;
diff --git a/lib/OpenLayers/Layer/PointGrid.js b/lib/OpenLayers/Layer/PointGrid.js
index c0508cb667..37f338f70f 100644
--- a/lib/OpenLayers/Layer/PointGrid.js
+++ b/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.
diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js
index 98e00fb5f1..3514e857c7 100644
--- a/lib/OpenLayers/Map.js
+++ b/lib/OpenLayers/Map.js
@@ -359,7 +359,7 @@ OpenLayers.Map = OpenLayers.Class({
     
     /**
      * Property: panTween
-     * {OpenLayers.Tween} Animated panning tween object, see panTo()
+     * {<OpenLayers.Tween>} Animated panning tween object, see panTo()
      */
     panTween: null,
 
diff --git a/lib/OpenLayers/Protocol.js b/lib/OpenLayers/Protocol.js
index 0d00449f66..beae1cf694 100644
--- a/lib/OpenLayers/Protocol.js
+++ b/lib/OpenLayers/Protocol.js
@@ -36,7 +36,7 @@ OpenLayers.Protocol = OpenLayers.Class({
    
     /**
      * Property: defaultFilter
-     * {OpenLayers.Filter} Optional default filter to read requests
+     * {<OpenLayers.Filter>} Optional default filter to read requests
      */
     defaultFilter: null,
     
@@ -59,7 +59,7 @@ OpenLayers.Protocol = OpenLayers.Class({
      * Merge filter passed to the read method with the default one
      *
      * Parameters:
-     * filter - {OpenLayers.Filter}
+     * filter - {<OpenLayers.Filter>}
      */
     mergeWithDefaultFilter: function(filter) {
         var merged;
diff --git a/lib/OpenLayers/Protocol/WFS/v1.js b/lib/OpenLayers/Protocol/WFS/v1.js
index e531085842..53cd0a70ea 100644
--- a/lib/OpenLayers/Protocol/WFS/v1.js
+++ b/lib/OpenLayers/Protocol/WFS/v1.js
@@ -384,7 +384,7 @@ OpenLayers.Protocol.WFS.v1 = OpenLayers.Class(OpenLayers.Protocol, {
      * Send a request that deletes all features by their filter.
      * 
      * Parameters:
-     * filter - {OpenLayers.Filter} filter
+     * filter - {<OpenLayers.Filter>} filter
      */
     filterDelete: function(filter, options) {
         options = OpenLayers.Util.extend({}, options);
diff --git a/lib/OpenLayers/Strategy/Fixed.js b/lib/OpenLayers/Strategy/Fixed.js
index aba9b848f1..e559f8c59e 100644
--- a/lib/OpenLayers/Strategy/Fixed.js
+++ b/lib/OpenLayers/Strategy/Fixed.js
@@ -105,7 +105,7 @@ OpenLayers.Strategy.Fixed = OpenLayers.Class(OpenLayers.Strategy, {
      * Add all features to the layer.
      *
      * Parameters:
-     * mapProjection - {OpenLayers.Projection} the map projection
+     * mapProjection - {<OpenLayers.Projection>} the map projection
      * resp - {Object} options to pass to protocol read.
      */
     merge: function(mapProjection, resp) {
diff --git a/lib/OpenLayers/Style.js b/lib/OpenLayers/Style.js
index f6eaefcf02..1af88dfba2 100644
--- a/lib/OpenLayers/Style.js
+++ b/lib/OpenLayers/Style.js
@@ -202,7 +202,7 @@ OpenLayers.Style = OpenLayers.Class({
      * Method: applySymbolizer
      *
      * Parameters:
-     * rule - {OpenLayers.Rule}
+     * rule - {<OpenLayers.Rule>}
      * style - {Object}
      * feature - {<OpenLayer.Feature.Vector>}
      *