diff --git a/apidoc_config/Menu.txt b/apidoc_config/Menu.txt
index b2e5e5140b..a6400557f5 100644
--- a/apidoc_config/Menu.txt
+++ b/apidoc_config/Menu.txt
@@ -38,12 +38,12 @@ Group: OpenLayers  {
    Group: BaseTypes  {
 
       File: Base Types  (no auto-title, OpenLayers/BaseTypes.js)
-      File: Bounds  (OpenLayers/BaseTypes/Bounds.js)
+      File: Bounds  (no auto-title, OpenLayers/BaseTypes/Bounds.js)
       File: Class  (no auto-title, OpenLayers/BaseTypes/Class.js)
-      File: Element  (OpenLayers/BaseTypes/Element.js)
-      File: LonLat  (OpenLayers/BaseTypes/LonLat.js)
-      File: Pixel  (OpenLayers/BaseTypes/Pixel.js)
-      File: Size  (OpenLayers/BaseTypes/Size.js)
+      File: Element  (no auto-title, OpenLayers/BaseTypes/Element.js)
+      File: LonLat  (no auto-title, OpenLayers/BaseTypes/LonLat.js)
+      File: Pixel  (no auto-title, OpenLayers/BaseTypes/Pixel.js)
+      File: Size  (no auto-title, OpenLayers/BaseTypes/Size.js)
       }  # Group: BaseTypes
 
    File: Console  (no auto-title, OpenLayers/Console.js)
@@ -85,90 +85,92 @@ Group: OpenLayers  {
 
    Group: Format  {
 
-      File: Format  (no auto-title, OpenLayers/Format.js)
-      File: GeoJSON  (OpenLayers/Format/GeoJSON.js)
-      File: GeoRSS  (OpenLayers/Format/GeoRSS.js)
-      File: GML  (OpenLayers/Format/GML.js)
-      File: JSON  (OpenLayers/Format/JSON.js)
-      File: KML  (OpenLayers/Format/KML.js)
-      File: WFS  (OpenLayers/Format/WFS.js)
+      File: Format  (OpenLayers/Format.js)
+      File: GeoJSON  (no auto-title, OpenLayers/Format/GeoJSON.js)
+      File: GeoRSS  (no auto-title, OpenLayers/Format/GeoRSS.js)
+      File: GML  (no auto-title, OpenLayers/Format/GML.js)
+      File: JSON  (no auto-title, OpenLayers/Format/JSON.js)
+      File: KML  (no auto-title, OpenLayers/Format/KML.js)
+      File: WFS  (no auto-title, OpenLayers/Format/WFS.js)
       File: WKT  (no auto-title, OpenLayers/Format/WKT.js)
-      File: XML  (OpenLayers/Format/XML.js)
+      File: XML  (no auto-title, OpenLayers/Format/XML.js)
       }  # Group: Format
 
    Group: Geometry  {
 
-      File: Geometry  (no auto-title, OpenLayers/Geometry.js)
+      File: Geometry  (OpenLayers/Geometry.js)
       File: Collection  (no auto-title, OpenLayers/Geometry/Collection.js)
-      File: Curve  (OpenLayers/Geometry/Curve.js)
-      File: LinearRing  (OpenLayers/Geometry/LinearRing.js)
+      File: Curve  (no auto-title, OpenLayers/Geometry/Curve.js)
+      File: LinearRing  (no auto-title, OpenLayers/Geometry/LinearRing.js)
       File: LineString  (no auto-title, OpenLayers/Geometry/LineString.js)
       File: MultiLineString  (no auto-title, OpenLayers/Geometry/MultiLineString.js)
       File: MultiPoint  (no auto-title, OpenLayers/Geometry/MultiPoint.js)
       File: MultiPolygon  (no auto-title, OpenLayers/Geometry/MultiPolygon.js)
       File: Point  (no auto-title, OpenLayers/Geometry/Point.js)
       File: Polygon  (no auto-title, OpenLayers/Geometry/Polygon.js)
-      File: Rectangle  (OpenLayers/Geometry/Rectangle.js)
-      File: Surface  (OpenLayers/Geometry/Surface.js)
+      File: Rectangle  (no auto-title, OpenLayers/Geometry/Rectangle.js)
+      File: Surface  (no auto-title, OpenLayers/Geometry/Surface.js)
       }  # Group: Geometry
 
    Group: Handler  {
 
-      File: Handler  (no auto-title, OpenLayers/Handler.js)
-      File: Box  (OpenLayers/Handler/Box.js)
+      File: Handler  (OpenLayers/Handler.js)
+      File: Box  (no auto-title, OpenLayers/Handler/Box.js)
       File: Drag  (no auto-title, OpenLayers/Handler/Drag.js)
       File: Feature  (no auto-title, OpenLayers/Handler/Feature.js)
       File: Keyboard  (no auto-title, OpenLayers/Handler/Keyboard.js)
       File: MouseWheel  (no auto-title, OpenLayers/Handler/MouseWheel.js)
       File: Path  (no auto-title, OpenLayers/Handler/Path.js)
       File: Point  (no auto-title, OpenLayers/Handler/Point.js)
-      File: Polygon  (OpenLayers/Handler/Polygon.js)
+      File: Polygon  (no auto-title, OpenLayers/Handler/Polygon.js)
+      File: RegularPolygon  (no auto-title, OpenLayers/Handler/RegularPolygon.js)
       }  # Group: Handler
 
    File: Icon  (no auto-title, OpenLayers/Icon.js)
 
    Group: Layer  {
 
-      File: Layer  (no auto-title, OpenLayers/Layer.js)
-      File: Boxes  (OpenLayers/Layer/Boxes.js)
-      File: EventPane  (OpenLayers/Layer/EventPane.js)
-      File: FixedZoomLevels  (OpenLayers/Layer/FixedZoomLevels.js)
+      File: Layer  (OpenLayers/Layer.js)
+      File: Boxes  (no auto-title, OpenLayers/Layer/Boxes.js)
+      File: EventPane  (no auto-title, OpenLayers/Layer/EventPane.js)
+      File: FixedZoomLevels  (no auto-title, OpenLayers/Layer/FixedZoomLevels.js)
       File: GeoRSS  (no auto-title, OpenLayers/Layer/GeoRSS.js)
       File: GML  (no auto-title, OpenLayers/Layer/GML.js)
-      File: Gooogle  (no auto-title, OpenLayers/Layer/Google.js)
-      File: Grid  (OpenLayers/Layer/Grid.js)
-      File: HTTPRequest  (OpenLayers/Layer/HTTPRequest.js)
+      File: Google  (no auto-title, OpenLayers/Layer/Google.js)
+      File: Grid  (no auto-title, OpenLayers/Layer/Grid.js)
+      File: HTTPRequest  (no auto-title, OpenLayers/Layer/HTTPRequest.js)
       File: Image  (no auto-title, OpenLayers/Layer/Image.js)
-      File: KaMap  (OpenLayers/Layer/KaMap.js)
-      File: MapServer  (OpenLayers/Layer/MapServer.js)
-      File: MapServer.Untiled  (OpenLayers/Layer/MapServer/Untiled.js)
+      File: KaMap  (no auto-title, OpenLayers/Layer/KaMap.js)
+      File: MapServer  (no auto-title, OpenLayers/Layer/MapServer.js)
+      File: MapServer.Untiled  (no auto-title, OpenLayers/Layer/MapServer/Untiled.js)
       File: Markers  (no auto-title, OpenLayers/Layer/Markers.js)
-      File: MultiMap  (OpenLayers/Layer/MultiMap.js)
-      File: Text  (OpenLayers/Layer/Text.js)
-      File: TileCache  (OpenLayers/Layer/TileCache.js)
-      File: TMS  (OpenLayers/Layer/TMS.js)
+      File: MultiMap  (no auto-title, OpenLayers/Layer/MultiMap.js)
+      File: SphericalMercator  (no auto-title, OpenLayers/Layer/SphericalMercator.js)
+      File: Text  (no auto-title, OpenLayers/Layer/Text.js)
+      File: TileCache  (no auto-title, OpenLayers/Layer/TileCache.js)
+      File: TMS  (no auto-title, OpenLayers/Layer/TMS.js)
       File: Vector  (no auto-title, OpenLayers/Layer/Vector.js)
-      File: VirtualEarth  (OpenLayers/Layer/VirtualEarth.js)
-      File: WFS  (OpenLayers/Layer/WFS.js)
+      File: VirtualEarth  (no auto-title, OpenLayers/Layer/VirtualEarth.js)
+      File: WFS  (no auto-title, OpenLayers/Layer/WFS.js)
       File: WMS  (no auto-title, OpenLayers/Layer/WMS.js)
       File: WMS.Untiled  (no auto-title, OpenLayers/Layer/WMS/Untiled.js)
-      File: WorldWind  (OpenLayers/Layer/WorldWind.js)
-      File: Yahoo  (OpenLayers/Layer/Yahoo.js)
+      File: WorldWind  (no auto-title, OpenLayers/Layer/WorldWind.js)
+      File: Yahoo  (no auto-title, OpenLayers/Layer/Yahoo.js)
       }  # Group: Layer
 
    File: Map  (no auto-title, OpenLayers/Map.js)
 
    Group: Marker  {
 
-      File: Marker  (no auto-title, OpenLayers/Marker.js)
+      File: Marker  (OpenLayers/Marker.js)
       File: Box  (no auto-title, OpenLayers/Marker/Box.js)
       }  # Group: Marker
 
    Group: Popup  {
 
-      File: Popup  (no auto-title, OpenLayers/Popup.js)
+      File: Popup  (OpenLayers/Popup.js)
       File: Anchored  (no auto-title, OpenLayers/Popup/Anchored.js)
-      File: AnchoredBubble  (OpenLayers/Popup/AnchoredBubble.js)
+      File: AnchoredBubble  (no auto-title, OpenLayers/Popup/AnchoredBubble.js)
       }  # Group: Popup
 
    Group: Renderer  {
@@ -181,7 +183,7 @@ Group: OpenLayers  {
 
    Group: Tile  {
 
-      File: Tile  (no auto-title, OpenLayers/Tile.js)
+      File: Tile  (OpenLayers/Tile.js)
       File: Image  (no auto-title, OpenLayers/Tile/Image.js)
       File: WFS  (no auto-title, OpenLayers/Tile/WFS.js)
       }  # Group: Tile
diff --git a/doc_config/Menu.txt b/doc_config/Menu.txt
index e497397029..a201a2c55c 100644
--- a/doc_config/Menu.txt
+++ b/doc_config/Menu.txt
@@ -38,19 +38,19 @@ Group: OpenLayers  {
    Group: BaseTypes  {
 
       File: Base Types  (no auto-title, OpenLayers/BaseTypes.js)
-      File: Bounds  (OpenLayers/BaseTypes/Bounds.js)
+      File: Bounds  (no auto-title, OpenLayers/BaseTypes/Bounds.js)
       File: Class  (no auto-title, OpenLayers/BaseTypes/Class.js)
-      File: Element  (OpenLayers/BaseTypes/Element.js)
-      File: LonLat  (OpenLayers/BaseTypes/LonLat.js)
-      File: Pixel  (OpenLayers/BaseTypes/Pixel.js)
-      File: Size  (OpenLayers/BaseTypes/Size.js)
+      File: Element  (no auto-title, OpenLayers/BaseTypes/Element.js)
+      File: LonLat  (no auto-title, OpenLayers/BaseTypes/LonLat.js)
+      File: Pixel  (no auto-title, OpenLayers/BaseTypes/Pixel.js)
+      File: Size  (no auto-title, OpenLayers/BaseTypes/Size.js)
       }  # Group: BaseTypes
 
    File: Console  (no auto-title, OpenLayers/Console.js)
 
    Group: Control  {
 
-      File: Control  (no auto-title, OpenLayers/Control.js)
+      File: Control  (OpenLayers/Control.js)
       File: ArgParser  (no auto-title, OpenLayers/Control/ArgParser.js)
       File: ZoomToMaxExtent  (no auto-title, OpenLayers/Control/ZoomToMaxExtent.js)
       File: OverviewMap  (no auto-title, OpenLayers/Control/OverviewMap.js)
@@ -71,89 +71,91 @@ Group: OpenLayers  {
       File: Scale  (no auto-title, OpenLayers/Control/Scale.js)
       File: SelectFeature  (no auto-title, OpenLayers/Control/SelectFeature.js)
       File: ZoomBox  (no auto-title, OpenLayers/Control/ZoomBox.js)
-      File: PanZoom  (OpenLayers/Control/PanZoom.js)
+      File: PanZoom  (no auto-title, OpenLayers/Control/PanZoom.js)
       }  # Group: Control
 
    File: Events  (no auto-title, OpenLayers/Events.js)
 
    Group: Feature  {
 
-      File: Feature  (no auto-title, OpenLayers/Feature.js)
+      File: Feature  (OpenLayers/Feature.js)
       File: WFS  (no auto-title, OpenLayers/Feature/WFS.js)
       File: Vector  (no auto-title, OpenLayers/Feature/Vector.js)
       }  # Group: Feature
 
    Group: Format  {
 
-      File: Format  (no auto-title, OpenLayers/Format.js)
-      File: GeoJSON  (OpenLayers/Format/GeoJSON.js)
-      File: GeoRSS  (OpenLayers/Format/GeoRSS.js)
-      File: GML  (OpenLayers/Format/GML.js)
-      File: JSON  (OpenLayers/Format/JSON.js)
-      File: KML  (OpenLayers/Format/KML.js)
-      File: WFS  (OpenLayers/Format/WFS.js)
+      File: Format  (OpenLayers/Format.js)
+      File: GeoJSON  (no auto-title, OpenLayers/Format/GeoJSON.js)
+      File: GeoRSS  (no auto-title, OpenLayers/Format/GeoRSS.js)
+      File: GML  (no auto-title, OpenLayers/Format/GML.js)
+      File: JSON  (no auto-title, OpenLayers/Format/JSON.js)
+      File: KML  (no auto-title, OpenLayers/Format/KML.js)
+      File: WFS  (no auto-title, OpenLayers/Format/WFS.js)
       File: WKT  (no auto-title, OpenLayers/Format/WKT.js)
-      File: XML  (OpenLayers/Format/XML.js)
+      File: XML  (no auto-title, OpenLayers/Format/XML.js)
       }  # Group: Format
 
    Group: Geometry  {
 
-      File: Geometry  (no auto-title, OpenLayers/Geometry.js)
+      File: Geometry  (OpenLayers/Geometry.js)
       File: Collection  (no auto-title, OpenLayers/Geometry/Collection.js)
-      File: Curve  (OpenLayers/Geometry/Curve.js)
-      File: LinearRing  (OpenLayers/Geometry/LinearRing.js)
+      File: Curve  (no auto-title, OpenLayers/Geometry/Curve.js)
+      File: LinearRing  (no auto-title, OpenLayers/Geometry/LinearRing.js)
       File: LineString  (no auto-title, OpenLayers/Geometry/LineString.js)
       File: MultiLineString  (no auto-title, OpenLayers/Geometry/MultiLineString.js)
       File: MultiPoint  (no auto-title, OpenLayers/Geometry/MultiPoint.js)
       File: MultiPolygon  (no auto-title, OpenLayers/Geometry/MultiPolygon.js)
       File: Point  (no auto-title, OpenLayers/Geometry/Point.js)
       File: Polygon  (no auto-title, OpenLayers/Geometry/Polygon.js)
-      File: Rectangle  (OpenLayers/Geometry/Rectangle.js)
-      File: Surface  (OpenLayers/Geometry/Surface.js)
+      File: Rectangle  (no auto-title, OpenLayers/Geometry/Rectangle.js)
+      File: Surface  (no auto-title, OpenLayers/Geometry/Surface.js)
       }  # Group: Geometry
 
    Group: Handler  {
 
-      File: Handler  (no auto-title, OpenLayers/Handler.js)
-      File: Box  (OpenLayers/Handler/Box.js)
+      File: Handler  (OpenLayers/Handler.js)
+      File: Box  (no auto-title, OpenLayers/Handler/Box.js)
       File: Drag  (no auto-title, OpenLayers/Handler/Drag.js)
       File: Feature  (no auto-title, OpenLayers/Handler/Feature.js)
       File: Keyboard  (no auto-title, OpenLayers/Handler/Keyboard.js)
       File: MouseWheel  (no auto-title, OpenLayers/Handler/MouseWheel.js)
       File: Path  (no auto-title, OpenLayers/Handler/Path.js)
       File: Point  (no auto-title, OpenLayers/Handler/Point.js)
-      File: Polygon  (OpenLayers/Handler/Polygon.js)
+      File: Polygon  (no auto-title, OpenLayers/Handler/Polygon.js)
+      File: RegularPolygon  (no auto-title, OpenLayers/Handler/RegularPolygon.js)
       }  # Group: Handler
 
    File: Icon  (no auto-title, OpenLayers/Icon.js)
 
    Group: Layer  {
 
-      File: Layer  (no auto-title, OpenLayers/Layer.js)
-      File: Boxes  (OpenLayers/Layer/Boxes.js)
-      File: EventPane  (OpenLayers/Layer/EventPane.js)
-      File: FixedZoomLevels  (OpenLayers/Layer/FixedZoomLevels.js)
+      File: Layer  (OpenLayers/Layer.js)
+      File: Boxes  (no auto-title, OpenLayers/Layer/Boxes.js)
+      File: EventPane  (no auto-title, OpenLayers/Layer/EventPane.js)
+      File: FixedZoomLevels  (no auto-title, OpenLayers/Layer/FixedZoomLevels.js)
       File: GeoRSS  (no auto-title, OpenLayers/Layer/GeoRSS.js)
       File: GML  (no auto-title, OpenLayers/Layer/GML.js)
-      File: Google  (OpenLayers/Layer/Google.js)
-      File: Grid  (OpenLayers/Layer/Grid.js)
-      File: HTTPRequest  (OpenLayers/Layer/HTTPRequest.js)
+      File: Google  (no auto-title, OpenLayers/Layer/Google.js)
+      File: Grid  (no auto-title, OpenLayers/Layer/Grid.js)
+      File: HTTPRequest  (no auto-title, OpenLayers/Layer/HTTPRequest.js)
       File: Image  (no auto-title, OpenLayers/Layer/Image.js)
-      File: KaMap  (OpenLayers/Layer/KaMap.js)
-      File: MapServer  (OpenLayers/Layer/MapServer.js)
-      File: MapServer.Untiled  (OpenLayers/Layer/MapServer/Untiled.js)
+      File: KaMap  (no auto-title, OpenLayers/Layer/KaMap.js)
+      File: MapServer  (no auto-title, OpenLayers/Layer/MapServer.js)
+      File: MapServer.Untiled  (no auto-title, OpenLayers/Layer/MapServer/Untiled.js)
       File: Markers  (no auto-title, OpenLayers/Layer/Markers.js)
-      File: MultiMap  (OpenLayers/Layer/MultiMap.js)
-      File: Text  (OpenLayers/Layer/Text.js)
-      File: TileCache  (OpenLayers/Layer/TileCache.js)
-      File: TMS  (OpenLayers/Layer/TMS.js)
+      File: MultiMap  (no auto-title, OpenLayers/Layer/MultiMap.js)
+      File: SphericalMercator  (no auto-title, OpenLayers/Layer/SphericalMercator.js)
+      File: Text  (no auto-title, OpenLayers/Layer/Text.js)
+      File: TileCache  (no auto-title, OpenLayers/Layer/TileCache.js)
+      File: TMS  (no auto-title, OpenLayers/Layer/TMS.js)
       File: Vector  (no auto-title, OpenLayers/Layer/Vector.js)
-      File: VirtualEarth  (OpenLayers/Layer/VirtualEarth.js)
-      File: WFS  (OpenLayers/Layer/WFS.js)
+      File: VirtualEarth  (no auto-title, OpenLayers/Layer/VirtualEarth.js)
+      File: WFS  (no auto-title, OpenLayers/Layer/WFS.js)
       File: WMS  (no auto-title, OpenLayers/Layer/WMS.js)
       File: WMS.Untiled  (no auto-title, OpenLayers/Layer/WMS/Untiled.js)
-      File: WorldWind  (OpenLayers/Layer/WorldWind.js)
-      File: Yahoo  (OpenLayers/Layer/Yahoo.js)
+      File: WorldWind  (no auto-title, OpenLayers/Layer/WorldWind.js)
+      File: Yahoo  (no auto-title, OpenLayers/Layer/Yahoo.js)
       }  # Group: Layer
 
    File: Map  (no auto-title, OpenLayers/Map.js)
@@ -166,9 +168,9 @@ Group: OpenLayers  {
 
    Group: Popup  {
 
-      File: Popup  (no auto-title, OpenLayers/Popup.js)
+      File: Popup  (OpenLayers/Popup.js)
       File: Anchored  (no auto-title, OpenLayers/Popup/Anchored.js)
-      File: AnchoredBubble  (OpenLayers/Popup/AnchoredBubble.js)
+      File: AnchoredBubble  (no auto-title, OpenLayers/Popup/AnchoredBubble.js)
       }  # Group: Popup
 
    Group: Renderer  {
@@ -181,7 +183,7 @@ Group: OpenLayers  {
 
    Group: Tile  {
 
-      File: Tile  (no auto-title, OpenLayers/Tile.js)
+      File: Tile  (OpenLayers/Tile.js)
       File: Image  (no auto-title, OpenLayers/Tile/Image.js)
       File: WFS  (no auto-title, OpenLayers/Tile/WFS.js)
       }  # Group: Tile
diff --git a/lib/OpenLayers/Layer/GML.js b/lib/OpenLayers/Layer/GML.js
index 9d3a99bd16..3c3c231a10 100644
--- a/lib/OpenLayers/Layer/GML.js
+++ b/lib/OpenLayers/Layer/GML.js
@@ -5,10 +5,10 @@
 /**
  * @requires OpenLayers/Layer/Vector.js
  * @requires OpenLayers/Ajax.js
- 
+ * 
  * Class: OpenLayers.Layer.GML
  * Create a vector layer by parsing a GML file. The GML file is
- * passed in as a parameter.
+ *     passed in as a parameter.
  *
  * Inherits from:
  *  - <OpenLayers.Layer.Vector>
diff --git a/lib/OpenLayers/Layer/Google.js b/lib/OpenLayers/Layer/Google.js
index 771bce825f..6359696f8f 100644
--- a/lib/OpenLayers/Layer/Google.js
+++ b/lib/OpenLayers/Layer/Google.js
@@ -10,7 +10,7 @@
  * 
  * Class: OpenLayers.Layer.Google
  * 
- * Inherits:
+ * Inherits from:
  *  - <OpenLayers.Layer.SphericalMercator>
  *  - <OpenLayers.Layer.EventPane>
  *  - <OpenLayers.Layer.FixedZoomLevels>
diff --git a/lib/OpenLayers/Layer/HTTPRequest.js b/lib/OpenLayers/Layer/HTTPRequest.js
index 70a9c84efb..d12e0df98d 100644
--- a/lib/OpenLayers/Layer/HTTPRequest.js
+++ b/lib/OpenLayers/Layer/HTTPRequest.js
@@ -8,8 +8,8 @@
  * 
  * Class: OpenLayers.Layer.HTTPRequest
  * 
- * Inherits: 
- *  - OpenLayers.Layer
+ * Inherits from: 
+ *  - <OpenLayers.Layer>
  */
 OpenLayers.Layer.HTTPRequest = OpenLayers.Class(OpenLayers.Layer, {
 
diff --git a/lib/OpenLayers/Layer/KaMap.js b/lib/OpenLayers/Layer/KaMap.js
index 243949e3c1..0e8a2147b1 100644
--- a/lib/OpenLayers/Layer/KaMap.js
+++ b/lib/OpenLayers/Layer/KaMap.js
@@ -8,7 +8,7 @@
  * 
  * Class: OpenLayers.Layer.KaMap
  * 
- * Inherits:
+ * Inherits from:
  *  - <OpenLayers.Layer.Grid>
  */
 OpenLayers.Layer.KaMap = OpenLayers.Class(OpenLayers.Layer.Grid, {
diff --git a/lib/OpenLayers/Layer/MapServer/Untiled.js b/lib/OpenLayers/Layer/MapServer/Untiled.js
index 7f430ddf07..886c9e4101 100644
--- a/lib/OpenLayers/Layer/MapServer/Untiled.js
+++ b/lib/OpenLayers/Layer/MapServer/Untiled.js
@@ -6,7 +6,7 @@
 /**
  * @requires OpenLayers/Layer/MapServer.js
  *
- * Class: OpenLayers.Layer.MapServer
+ * Class: OpenLayers.Layer.MapServer.Untiled
  * Deprecated, to be removed in 3.0 - instead use OpenLayers.Layer.MapServer and 
  *     pass the option 'singleTile' as true.
  * 
diff --git a/lib/OpenLayers/Layer/MultiMap.js b/lib/OpenLayers/Layer/MultiMap.js
index 06d4ab8b9c..87c42ea931 100644
--- a/lib/OpenLayers/Layer/MultiMap.js
+++ b/lib/OpenLayers/Layer/MultiMap.js
@@ -10,7 +10,7 @@
  * Note that MultiMap does not fully support the sphericalMercator
  * option. See Ticket #953 for more details.
  * 
- * Inherits:
+ * Inherits from:
  *  - <OpenLayers.Layers.EventPane>
  *  - <OpenLayers.Layers.FixedZoomLevels>
  */
diff --git a/lib/OpenLayers/Layer/TMS.js b/lib/OpenLayers/Layer/TMS.js
index 4d87528c20..437bfd79b5 100644
--- a/lib/OpenLayers/Layer/TMS.js
+++ b/lib/OpenLayers/Layer/TMS.js
@@ -8,7 +8,7 @@
  * 
  * Class: OpenLayers.Layer.TMS
  * 
- * Inherits:
+ * Inherits from:
  *  - <OpenLayers.Layer.Grid>
  */
 OpenLayers.Layer.TMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
diff --git a/lib/OpenLayers/Layer/VirtualEarth.js b/lib/OpenLayers/Layer/VirtualEarth.js
index 401259e364..2aad877dc4 100644
--- a/lib/OpenLayers/Layer/VirtualEarth.js
+++ b/lib/OpenLayers/Layer/VirtualEarth.js
@@ -9,7 +9,7 @@
  * 
  * Class: OpenLayers.Layer.VirtualEarth
  * 
- * Inherits:
+ * Inherits from:
  *  - <OpenLayers.Layer.EventPane>
  *  - <OpenLayers.Layer.FixedZoomLevels>
  */
diff --git a/lib/OpenLayers/Layer/Yahoo.js b/lib/OpenLayers/Layer/Yahoo.js
index c2953875c5..fd68a7192e 100644
--- a/lib/OpenLayers/Layer/Yahoo.js
+++ b/lib/OpenLayers/Layer/Yahoo.js
@@ -9,9 +9,9 @@
  * 
  * Class: OpenLayers.Layer.Yahoo
  * 
- * Inherits:
+ * Inherits from:
  *  - <OpenLayers.Layer.EventPane>
- *  - <OpenLayers.Layer.FixedZoomLevels>v
+ *  - <OpenLayers.Layer.FixedZoomLevels>
  */
 OpenLayers.Layer.Yahoo = OpenLayers.Class(
   OpenLayers.Layer.EventPane, OpenLayers.Layer.FixedZoomLevels, {