diff --git a/app/code/core/Mage/Admin/Model/Resource/Acl/Role/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Acl/Role/Collection.php
index 624627d9a41..a29e312e47b 100644
--- a/app/code/core/Mage/Admin/Model/Resource/Acl/Role/Collection.php
+++ b/app/code/core/Mage/Admin/Model/Resource/Acl/Role/Collection.php
@@ -13,6 +13,7 @@
  * Roles collection
  *
  * @package    Mage_Admin
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Admin_Model_Acl_Role>
  */
 class Mage_Admin_Model_Resource_Acl_Role_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Admin/Model/Resource/Block/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Block/Collection.php
index b33272f2b71..633755191a7 100644
--- a/app/code/core/Mage/Admin/Model/Resource/Block/Collection.php
+++ b/app/code/core/Mage/Admin/Model/Resource/Block/Collection.php
@@ -13,6 +13,7 @@
  * Admin permissions block collection
  *
  * @package    Mage_Adminhtml
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Admin_Model_Block>
  */
 class Mage_Admin_Model_Resource_Block_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Admin/Model/Resource/Permissions/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Permissions/Collection.php
index 83cd45f4cab..cdc453ef766 100644
--- a/app/code/core/Mage/Admin/Model/Resource/Permissions/Collection.php
+++ b/app/code/core/Mage/Admin/Model/Resource/Permissions/Collection.php
@@ -13,6 +13,7 @@
  * Admin permissions collection
  *
  * @package    Mage_Admin
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Admin_Model_Rules>
  */
 class Mage_Admin_Model_Resource_Permissions_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php
index 27475d50518..56f17ca0b07 100644
--- a/app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php
+++ b/app/code/core/Mage/Admin/Model/Resource/Roles/Collection.php
@@ -13,6 +13,7 @@
  * Admin roles collection
  *
  * @package    Mage_Admin
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Admin_Model_Role>
  */
 class Mage_Admin_Model_Resource_Roles_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php b/app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php
index 5d41b93b0ad..fdd28987c1a 100644
--- a/app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php
+++ b/app/code/core/Mage/Admin/Model/Resource/Roles/User/Collection.php
@@ -13,6 +13,7 @@
  * Admin role users collection
  *
  * @package    Mage_Admin
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Admin_Model_User>
  */
 class Mage_Admin_Model_Resource_Roles_User_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/AdminNotification/Model/Resource/Inbox/Collection.php b/app/code/core/Mage/AdminNotification/Model/Resource/Inbox/Collection.php
index 8e58e7b9bea..efe63f1f816 100644
--- a/app/code/core/Mage/AdminNotification/Model/Resource/Inbox/Collection.php
+++ b/app/code/core/Mage/AdminNotification/Model/Resource/Inbox/Collection.php
@@ -13,6 +13,7 @@
  * AdminNotification Inbox model
  *
  * @package    Mage_AdminNotification
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_AdminNotification_Model_Inbox>
  */
 class Mage_AdminNotification_Model_Resource_Inbox_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Api/Model/Resource/Acl/Role/Collection.php b/app/code/core/Mage/Api/Model/Resource/Acl/Role/Collection.php
index e124f3b7b35..7c7a2e999e1 100644
--- a/app/code/core/Mage/Api/Model/Resource/Acl/Role/Collection.php
+++ b/app/code/core/Mage/Api/Model/Resource/Acl/Role/Collection.php
@@ -13,6 +13,7 @@
  * Acl Role Resource Collection
  *
  * @package    Mage_Api
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Api_Model_Role>
  */
 class Mage_Api_Model_Resource_Acl_Role_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Api/Model/Resource/Permissions/Collection.php b/app/code/core/Mage/Api/Model/Resource/Permissions/Collection.php
index 97990c382a2..509324efd1b 100644
--- a/app/code/core/Mage/Api/Model/Resource/Permissions/Collection.php
+++ b/app/code/core/Mage/Api/Model/Resource/Permissions/Collection.php
@@ -13,6 +13,7 @@
  * Permissions Resource Collection
  *
  * @package    Mage_Api
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Api_Model_Rules>
  */
 class Mage_Api_Model_Resource_Permissions_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Api/Model/Resource/Role/Collection.php b/app/code/core/Mage/Api/Model/Resource/Role/Collection.php
index fe908a9361b..4e4d9cb262f 100644
--- a/app/code/core/Mage/Api/Model/Resource/Role/Collection.php
+++ b/app/code/core/Mage/Api/Model/Resource/Role/Collection.php
@@ -11,6 +11,7 @@
  * Api Role Resource Collection
  *
  * @package    Mage_Api
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Api_Model_Role>
  */
 class Mage_Api_Model_Resource_Role_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Api/Model/Resource/Roles/Collection.php b/app/code/core/Mage/Api/Model/Resource/Roles/Collection.php
index 2ffa518c67b..195234cc623 100644
--- a/app/code/core/Mage/Api/Model/Resource/Roles/Collection.php
+++ b/app/code/core/Mage/Api/Model/Resource/Roles/Collection.php
@@ -13,6 +13,7 @@
  * Api Roles Resource Collection
  *
  * @package    Mage_Api
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Api_Model_Role>
  */
 class Mage_Api_Model_Resource_Roles_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Api/Model/Resource/Roles/User/Collection.php b/app/code/core/Mage/Api/Model/Resource/Roles/User/Collection.php
index caaa520e3d6..3ea559498ec 100644
--- a/app/code/core/Mage/Api/Model/Resource/Roles/User/Collection.php
+++ b/app/code/core/Mage/Api/Model/Resource/Roles/User/Collection.php
@@ -13,6 +13,7 @@
  * Roles User Resource Collection
  *
  * @package    Mage_Api
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Api_Model_User>
  */
 class Mage_Api_Model_Resource_Roles_User_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Api/Model/Resource/Rules/Collection.php b/app/code/core/Mage/Api/Model/Resource/Rules/Collection.php
index 2097f756afa..6d3169e4bbc 100644
--- a/app/code/core/Mage/Api/Model/Resource/Rules/Collection.php
+++ b/app/code/core/Mage/Api/Model/Resource/Rules/Collection.php
@@ -13,6 +13,7 @@
  * Api Rules Resource Collection
  *
  * @package    Mage_Api
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Api_Model_Rules>
  */
 class Mage_Api_Model_Resource_Rules_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php
index d4dcf74a9da..d133d5b1e1c 100644
--- a/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php
+++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Filter/Attribute/Collection.php
@@ -11,6 +11,7 @@
  * API2 filter ACL attribute resource collection model
  *
  * @package    Mage_Api2
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Api2_Model_Acl_Filter_Attribute>
  */
 class Mage_Api2_Model_Resource_Acl_Filter_Attribute_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php
index b67992f1e5f..13eccfc23eb 100644
--- a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php
+++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Role/Collection.php
@@ -11,6 +11,7 @@
  * API2 global ACL role resource collection model
  *
  * @package    Mage_Api2
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Api2_Model_Acl_Global_Role>
  */
 class Mage_Api2_Model_Resource_Acl_Global_Role_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php
index 3c8e5e55835..f6ce7b3f893 100644
--- a/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php
+++ b/app/code/core/Mage/Api2/Model/Resource/Acl/Global/Rule/Collection.php
@@ -11,6 +11,7 @@
  * Api2 global ACL rule resource collection model
  *
  * @package    Mage_Api2
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Api2_Model_Acl_Global_Rule>
  */
 class Mage_Api2_Model_Resource_Acl_Global_Rule_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Collection.php
index a372861a38a..b951b305a5c 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Attribute/Collection.php
@@ -11,6 +11,7 @@
  * Catalog category EAV additional attribute resource collection
  *
  * @package    Mage_Catalog
+ * @extends Mage_Eav_Model_Resource_Entity_Attribute_Collection<Mage_Catalog_Model_Entity_Attribute>
  */
 class Mage_Catalog_Model_Resource_Category_Attribute_Collection extends Mage_Eav_Model_Resource_Entity_Attribute_Collection
 {
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php
index 56b2529b77c..2d3a260a6c6 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Category/Flat/Collection.php
@@ -11,6 +11,7 @@
  * Catalog category flat collection
  *
  * @package    Mage_Catalog
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Catalog_Model_Category>
  */
 class Mage_Catalog_Model_Resource_Category_Flat_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Collection.php
index 28ebe5bd5b1..522878f9748 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Attribute/Collection.php
@@ -11,6 +11,7 @@
  * Catalog product EAV additional attribute resource collection
  *
  * @package    Mage_Catalog
+ * @extends Mage_Eav_Model_Resource_Entity_Attribute_Collection<Mage_Catalog_Model_Entity_Attribute>
  */
 class Mage_Catalog_Model_Resource_Product_Attribute_Collection extends Mage_Eav_Model_Resource_Entity_Attribute_Collection
 {
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Collection.php
index d837224dd3c..010850d5767 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Link/Collection.php
@@ -11,6 +11,7 @@
  * Catalog product links collection
  *
  * @package    Mage_Catalog
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Catalog_Model_Product_Link>
  */
 class Mage_Catalog_Model_Resource_Product_Link_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value/Collection.php b/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value/Collection.php
index 1cfd590a417..931e9834920 100644
--- a/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value/Collection.php
+++ b/app/code/core/Mage/Catalog/Model/Resource/Product/Option/Value/Collection.php
@@ -11,6 +11,7 @@
  * Catalog product option values collection
  *
  * @package    Mage_Catalog
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Catalog_Model_Product_Option_Value>
  */
 class Mage_Catalog_Model_Resource_Product_Option_Value_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item/Collection.php b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item/Collection.php
index 8eeaa5b676a..18c18ada8c5 100644
--- a/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item/Collection.php
+++ b/app/code/core/Mage/CatalogInventory/Model/Resource/Stock/Item/Collection.php
@@ -11,6 +11,7 @@
  * Stock item collection resource model
  *
  * @package    Mage_CatalogInventory
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_CatalogInventory_Model_Stock_Item>
  */
 class Mage_CatalogInventory_Model_Resource_Stock_Item_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price/Collection.php b/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price/Collection.php
index db2078867cb..beb43d50fb9 100644
--- a/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price/Collection.php
+++ b/app/code/core/Mage/CatalogRule/Model/Resource/Rule/Product/Price/Collection.php
@@ -9,6 +9,7 @@
 
 /**
  * @package    Mage_CatalogRule
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_CatalogRule_Model_Rule_Product_Price>
  */
 class Mage_CatalogRule_Model_Resource_Rule_Product_Price_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/CatalogSearch/Model/Resource/Query/Collection.php b/app/code/core/Mage/CatalogSearch/Model/Resource/Query/Collection.php
index 60403a36f45..a11a7cfd769 100644
--- a/app/code/core/Mage/CatalogSearch/Model/Resource/Query/Collection.php
+++ b/app/code/core/Mage/CatalogSearch/Model/Resource/Query/Collection.php
@@ -11,6 +11,7 @@
  * Catalog search query collection
  *
  * @package    Mage_CatalogSearch
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_CatalogSearch_Model_Query>
  */
 class Mage_CatalogSearch_Model_Resource_Query_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Checkout/Model/Resource/Agreement/Collection.php b/app/code/core/Mage/Checkout/Model/Resource/Agreement/Collection.php
index 4653e655950..6aad89c4a30 100644
--- a/app/code/core/Mage/Checkout/Model/Resource/Agreement/Collection.php
+++ b/app/code/core/Mage/Checkout/Model/Resource/Agreement/Collection.php
@@ -13,6 +13,7 @@
  * Resource Model for Agreement Collection
  *
  * @package    Mage_Checkout
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Checkout_Model_Agreement>
  */
 class Mage_Checkout_Model_Resource_Agreement_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Cms/Model/Resource/Block/Collection.php b/app/code/core/Mage/Cms/Model/Resource/Block/Collection.php
index 68d1285f989..65efdf5d336 100644
--- a/app/code/core/Mage/Cms/Model/Resource/Block/Collection.php
+++ b/app/code/core/Mage/Cms/Model/Resource/Block/Collection.php
@@ -13,6 +13,7 @@
  * CMS block model
  *
  * @package    Mage_Cms
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Cms_Model_Block>
  */
 class Mage_Cms_Model_Resource_Block_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Cms/Model/Resource/Page/Collection.php b/app/code/core/Mage/Cms/Model/Resource/Page/Collection.php
index 834b5a1424c..057770abe04 100644
--- a/app/code/core/Mage/Cms/Model/Resource/Page/Collection.php
+++ b/app/code/core/Mage/Cms/Model/Resource/Page/Collection.php
@@ -11,6 +11,7 @@
  * CMS page collection
  *
  * @package    Mage_Cms
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Cms_Model_Page>
  */
 class Mage_Cms_Model_Resource_Page_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Core/Model/Resource/Config/Data/Collection.php b/app/code/core/Mage/Core/Model/Resource/Config/Data/Collection.php
index ab077303933..54ac3f93ba8 100644
--- a/app/code/core/Mage/Core/Model/Resource/Config/Data/Collection.php
+++ b/app/code/core/Mage/Core/Model/Resource/Config/Data/Collection.php
@@ -11,6 +11,7 @@
  * Config data collection
  *
  * @package    Mage_Core
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Core_Model_Config_Data>
  */
 class Mage_Core_Model_Resource_Config_Data_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Core/Model/Resource/Design/Collection.php b/app/code/core/Mage/Core/Model/Resource/Design/Collection.php
index 070a059f46f..9c5389ef001 100644
--- a/app/code/core/Mage/Core/Model/Resource/Design/Collection.php
+++ b/app/code/core/Mage/Core/Model/Resource/Design/Collection.php
@@ -11,6 +11,7 @@
  * Core Design resource collection
  *
  * @package    Mage_Core
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Core_Model_Design>
  */
 class Mage_Core_Model_Resource_Design_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Core/Model/Resource/Email/Queue/Collection.php b/app/code/core/Mage/Core/Model/Resource/Email/Queue/Collection.php
index 6d85c2ffa2c..ebf4259e441 100644
--- a/app/code/core/Mage/Core/Model/Resource/Email/Queue/Collection.php
+++ b/app/code/core/Mage/Core/Model/Resource/Email/Queue/Collection.php
@@ -13,6 +13,7 @@
  * Queue resource collection
  *
  * @package    Mage_Core
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Core_Model_Email_Queue>
  */
 class Mage_Core_Model_Resource_Email_Queue_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Core/Model/Resource/Email/Template/Collection.php b/app/code/core/Mage/Core/Model/Resource/Email/Template/Collection.php
index 8ecbaaf1f28..4e6acd7463d 100644
--- a/app/code/core/Mage/Core/Model/Resource/Email/Template/Collection.php
+++ b/app/code/core/Mage/Core/Model/Resource/Email/Template/Collection.php
@@ -13,6 +13,7 @@
  * Templates collection
  *
  * @package    Mage_Core
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Core_Model_Email_Template>
  */
 class Mage_Core_Model_Resource_Email_Template_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Core/Model/Resource/Language/Collection.php b/app/code/core/Mage/Core/Model/Resource/Language/Collection.php
index 65cb89d0291..5f1289e616f 100644
--- a/app/code/core/Mage/Core/Model/Resource/Language/Collection.php
+++ b/app/code/core/Mage/Core/Model/Resource/Language/Collection.php
@@ -13,6 +13,7 @@
  * Core Language Resource collection
  *
  * @package    Mage_Core
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Core_Model_Language>
  */
 class Mage_Core_Model_Resource_Language_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Core/Model/Resource/Url/Rewrite/Collection.php b/app/code/core/Mage/Core/Model/Resource/Url/Rewrite/Collection.php
index eac064a8507..474dbc8124f 100644
--- a/app/code/core/Mage/Core/Model/Resource/Url/Rewrite/Collection.php
+++ b/app/code/core/Mage/Core/Model/Resource/Url/Rewrite/Collection.php
@@ -11,6 +11,7 @@
  * Url rewrite resource collection model class
  *
  * @package    Mage_Core
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Core_Model_Url_Rewrite>
  */
 class Mage_Core_Model_Resource_Url_Rewrite_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Core/Model/Resource/Variable/Collection.php b/app/code/core/Mage/Core/Model/Resource/Variable/Collection.php
index 0142e614be7..3cdc9e03d4e 100644
--- a/app/code/core/Mage/Core/Model/Resource/Variable/Collection.php
+++ b/app/code/core/Mage/Core/Model/Resource/Variable/Collection.php
@@ -13,6 +13,7 @@
  * Custom variable collection
  *
  * @package    Mage_Core
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Core_Model_Variable>
  */
 class Mage_Core_Model_Resource_Variable_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Cron/Model/Resource/Schedule/Collection.php b/app/code/core/Mage/Cron/Model/Resource/Schedule/Collection.php
index c2016f715c0..df056c808b2 100644
--- a/app/code/core/Mage/Cron/Model/Resource/Schedule/Collection.php
+++ b/app/code/core/Mage/Cron/Model/Resource/Schedule/Collection.php
@@ -13,6 +13,7 @@
  * Schedules Collection
  *
  * @package    Mage_Cron
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Cron_Model_Schedule>
  */
 class Mage_Cron_Model_Resource_Schedule_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Customer/Model/Entity/Attribute/Collection.php b/app/code/core/Mage/Customer/Model/Entity/Attribute/Collection.php
index 0a5d8809867..49acd16f745 100644
--- a/app/code/core/Mage/Customer/Model/Entity/Attribute/Collection.php
+++ b/app/code/core/Mage/Customer/Model/Entity/Attribute/Collection.php
@@ -13,5 +13,6 @@
  * Customer EAV additional attribute resource collection
  *
  * @package    Mage_Customer
+ * @extends Mage_Customer_Model_Resource_Attribute_Collection<Mage_Customer_Model_Entity_Attribute>
  */
 class Mage_Customer_Model_Entity_Attribute_Collection extends Mage_Customer_Model_Resource_Attribute_Collection {}
diff --git a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Collection.php b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Collection.php
index 218bfecbbe8..b2ad309e1e0 100644
--- a/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Collection.php
+++ b/app/code/core/Mage/Customer/Model/Resource/Address/Attribute/Collection.php
@@ -13,6 +13,7 @@
  * Customer Address EAV additional attribute resource collection
  *
  * @package    Mage_Customer
+ * @extends Mage_Customer_Model_Resource_Attribute_Collection<Mage_Customer_Model_Entity_Attribute>
  */
 class Mage_Customer_Model_Resource_Address_Attribute_Collection extends Mage_Customer_Model_Resource_Attribute_Collection
 {
diff --git a/app/code/core/Mage/Customer/Model/Resource/Attribute/Collection.php b/app/code/core/Mage/Customer/Model/Resource/Attribute/Collection.php
index be64b261768..0efbff0a569 100644
--- a/app/code/core/Mage/Customer/Model/Resource/Attribute/Collection.php
+++ b/app/code/core/Mage/Customer/Model/Resource/Attribute/Collection.php
@@ -13,6 +13,8 @@
  * Customer EAV additional attribute resource collection
  *
  * @package    Mage_Customer
+ * @template T of Mage_Customer_Model_Entity_Attribute
+ * @extends Mage_Eav_Model_Resource_Attribute_Collection<T>
  */
 class Mage_Customer_Model_Resource_Attribute_Collection extends Mage_Eav_Model_Resource_Attribute_Collection
 {
diff --git a/app/code/core/Mage/Customer/Model/Resource/Flowpassword/Collection.php b/app/code/core/Mage/Customer/Model/Resource/Flowpassword/Collection.php
index aefdc4264c5..030211d43e8 100644
--- a/app/code/core/Mage/Customer/Model/Resource/Flowpassword/Collection.php
+++ b/app/code/core/Mage/Customer/Model/Resource/Flowpassword/Collection.php
@@ -13,6 +13,7 @@
  * Customer flow password info collection
  *
  * @package    Mage_Customer
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Customer_Model_Flowpassword>
  */
 class Mage_Customer_Model_Resource_Flowpassword_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Collection.php b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Collection.php
index 782486135a2..80e96c9328f 100644
--- a/app/code/core/Mage/Dataflow/Model/Resource/Batch/Collection.php
+++ b/app/code/core/Mage/Dataflow/Model/Resource/Batch/Collection.php
@@ -11,6 +11,7 @@
  * Dataflow batch collection
  *
  * @package    Mage_Dataflow
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Dataflow_Model_Batch>
  */
 class Mage_Dataflow_Model_Resource_Batch_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Import/Collection.php b/app/code/core/Mage/Dataflow/Model/Resource/Import/Collection.php
index 8f8de0217df..cdba950ca23 100644
--- a/app/code/core/Mage/Dataflow/Model/Resource/Import/Collection.php
+++ b/app/code/core/Mage/Dataflow/Model/Resource/Import/Collection.php
@@ -13,6 +13,7 @@
  * Import collection
  *
  * @package    Mage_Dataflow
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Dataflow_Model_Import>
  */
 class Mage_Dataflow_Model_Resource_Import_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Profile/Collection.php b/app/code/core/Mage/Dataflow/Model/Resource/Profile/Collection.php
index e0fc4e25ea5..635450c6a5b 100644
--- a/app/code/core/Mage/Dataflow/Model/Resource/Profile/Collection.php
+++ b/app/code/core/Mage/Dataflow/Model/Resource/Profile/Collection.php
@@ -13,6 +13,7 @@
  * Convert profile collection
  *
  * @package    Mage_Dataflow
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Dataflow_Model_Profile>
  */
 class Mage_Dataflow_Model_Resource_Profile_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Dataflow/Model/Resource/Profile/History/Collection.php b/app/code/core/Mage/Dataflow/Model/Resource/Profile/History/Collection.php
index fd0687f3f43..da085fcb9ad 100644
--- a/app/code/core/Mage/Dataflow/Model/Resource/Profile/History/Collection.php
+++ b/app/code/core/Mage/Dataflow/Model/Resource/Profile/History/Collection.php
@@ -13,6 +13,7 @@
  * Convert history collection
  *
  * @package    Mage_Dataflow
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Dataflow_Model_Profile_History>
  */
 class Mage_Dataflow_Model_Resource_Profile_History_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Directory/Model/Resource/Currency/Collection.php b/app/code/core/Mage/Directory/Model/Resource/Currency/Collection.php
index 9c6b8f70c43..6777adee037 100644
--- a/app/code/core/Mage/Directory/Model/Resource/Currency/Collection.php
+++ b/app/code/core/Mage/Directory/Model/Resource/Currency/Collection.php
@@ -12,6 +12,7 @@
  *
  * @package    Mage_Directory
  * @deprecated  since 1.5.0.0
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Directory_Model_Currency>
  */
 class Mage_Directory_Model_Resource_Currency_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Eav/Model/Resource/Attribute/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Attribute/Collection.php
index 83e9d03cf51..2eb0dd76982 100644
--- a/app/code/core/Mage/Eav/Model/Resource/Attribute/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Resource/Attribute/Collection.php
@@ -11,6 +11,8 @@
  * EAV additional attribute resource collection (Using Forms)
  *
  * @package    Mage_Eav
+ * @template T of Mage_Eav_Model_Entity_Attribute
+ * @extends Mage_Eav_Model_Resource_Entity_Attribute_Collection<Mage_Eav_Model_Entity_Attribute>
  */
 abstract class Mage_Eav_Model_Resource_Attribute_Collection extends Mage_Eav_Model_Resource_Entity_Attribute_Collection
 {
diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Collection.php
index 5a2640c4da2..69a46b0cf2b 100644
--- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Collection.php
@@ -14,7 +14,8 @@
  *
  * @method Mage_Eav_Model_Resource_Entity_Attribute getResource()
  *
- * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Eav_Model_Entity_Attribute>
+ * @template T of Mage_Eav_Model_Entity_Attribute
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<T>
  */
 class Mage_Eav_Model_Resource_Entity_Attribute_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group/Collection.php
index 1beba86b3f1..85941a1fab8 100644
--- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Group/Collection.php
@@ -11,6 +11,7 @@
  * Eav attribute group resource collection
  *
  * @package    Mage_Eav
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Eav_Model_Entity_Attribute_Group>
  */
 class Mage_Eav_Model_Resource_Entity_Attribute_Group_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option/Collection.php
index 6fadbe52493..f846672adb5 100644
--- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Option/Collection.php
@@ -11,6 +11,7 @@
  * Entity attribute option collection
  *
  * @package    Mage_Eav
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Eav_Model_Entity_Attribute_Option>
  */
 class Mage_Eav_Model_Resource_Entity_Attribute_Option_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set/Collection.php
index fc77866fc33..fc86f79a985 100644
--- a/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Attribute/Set/Collection.php
@@ -11,6 +11,7 @@
  * Eav Resource Attribute Set Collection
  *
  * @package    Mage_Eav
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Eav_Model_Entity_Attribute_Set>
  */
 class Mage_Eav_Model_Resource_Entity_Attribute_Set_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Eav/Model/Resource/Entity/Type/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Entity/Type/Collection.php
index b99e9159eea..1b39dbd551f 100644
--- a/app/code/core/Mage/Eav/Model/Resource/Entity/Type/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Resource/Entity/Type/Collection.php
@@ -13,6 +13,7 @@
  * Eav Resource Entity Type Collection Model
  *
  * @package    Mage_Eav
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Eav_Model_Entity_Type>
  */
 class Mage_Eav_Model_Resource_Entity_Type_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Attribute/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Form/Attribute/Collection.php
index 5ed35114ae6..e12d43bac64 100644
--- a/app/code/core/Mage/Eav/Model/Resource/Form/Attribute/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Resource/Form/Attribute/Collection.php
@@ -11,6 +11,7 @@
  * EAV Form Attribute Resource Collection
  *
  * @package    Mage_Eav
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Eav_Model_Attribute>
  */
 class Mage_Eav_Model_Resource_Form_Attribute_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Element/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Form/Element/Collection.php
index 2d1f79c9113..1409c6d201f 100644
--- a/app/code/core/Mage/Eav/Model/Resource/Form/Element/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Resource/Form/Element/Collection.php
@@ -11,6 +11,7 @@
  * Eav Form Element Resource Collection
  *
  * @package    Mage_Eav
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Eav_Model_Form_Element>
  */
 class Mage_Eav_Model_Resource_Form_Element_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset/Collection.php
index 4df8f213c6e..9564aa9db84 100644
--- a/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Resource/Form/Fieldset/Collection.php
@@ -11,6 +11,7 @@
  * Eav Form Fieldset Resource Collection
  *
  * @package    Mage_Eav
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Eav_Model_Form_Fieldset>
  */
 class Mage_Eav_Model_Resource_Form_Fieldset_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Eav/Model/Resource/Form/Type/Collection.php b/app/code/core/Mage/Eav/Model/Resource/Form/Type/Collection.php
index 06e70d39729..fe0a33a37b6 100644
--- a/app/code/core/Mage/Eav/Model/Resource/Form/Type/Collection.php
+++ b/app/code/core/Mage/Eav/Model/Resource/Form/Type/Collection.php
@@ -11,6 +11,7 @@
  * Eav Form Type Resource Collection
  *
  * @package    Mage_Eav
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Eav_Model_Form_Type>
  */
 class Mage_Eav_Model_Resource_Form_Type_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/GiftMessage/Model/Resource/Message/Collection.php b/app/code/core/Mage/GiftMessage/Model/Resource/Message/Collection.php
index 9e9f6911219..53f2876f95e 100644
--- a/app/code/core/Mage/GiftMessage/Model/Resource/Message/Collection.php
+++ b/app/code/core/Mage/GiftMessage/Model/Resource/Message/Collection.php
@@ -13,6 +13,7 @@
  * Gift Message collection
  *
  * @package    Mage_GiftMessage
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_GiftMessage_Model_Message>
  */
 class Mage_GiftMessage_Model_Resource_Message_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Index/Model/Resource/Event/Collection.php b/app/code/core/Mage/Index/Model/Resource/Event/Collection.php
index 5d0dd401b09..08a7883f452 100644
--- a/app/code/core/Mage/Index/Model/Resource/Event/Collection.php
+++ b/app/code/core/Mage/Index/Model/Resource/Event/Collection.php
@@ -11,6 +11,7 @@
  * Index Event Collection
  *
  * @package    Mage_Index
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Index_Model_Event>
  */
 class Mage_Index_Model_Resource_Event_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Log/Model/Resource/Visitor/Collection.php b/app/code/core/Mage/Log/Model/Resource/Visitor/Collection.php
index eb3897f9b2c..ac9397bcc5a 100644
--- a/app/code/core/Mage/Log/Model/Resource/Visitor/Collection.php
+++ b/app/code/core/Mage/Log/Model/Resource/Visitor/Collection.php
@@ -11,6 +11,7 @@
  * Visitor log collection
  *
  * @package    Mage_Log
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Log_Model_Visitor>
  */
 class Mage_Log_Model_Resource_Visitor_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Log/Model/Resource/Visitor/Online/Collection.php b/app/code/core/Mage/Log/Model/Resource/Visitor/Online/Collection.php
index 88530a6e2e7..1cebd0bfce6 100644
--- a/app/code/core/Mage/Log/Model/Resource/Visitor/Online/Collection.php
+++ b/app/code/core/Mage/Log/Model/Resource/Visitor/Online/Collection.php
@@ -11,6 +11,7 @@
  * Log Online visitors collection
  *
  * @package    Mage_Log
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Log_Model_Visitor_Online>
  */
 class Mage_Log_Model_Resource_Visitor_Online_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Queue/Collection.php b/app/code/core/Mage/Newsletter/Model/Resource/Queue/Collection.php
index 9a4b7b5df31..068df2a1264 100644
--- a/app/code/core/Mage/Newsletter/Model/Resource/Queue/Collection.php
+++ b/app/code/core/Mage/Newsletter/Model/Resource/Queue/Collection.php
@@ -11,6 +11,7 @@
  * Newsletter queue collection.
  *
  * @package    Mage_Newsletter
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Newsletter_Model_Queue>
  */
 class Mage_Newsletter_Model_Resource_Queue_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php
index ad001d8445c..5eadd33835f 100644
--- a/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php
+++ b/app/code/core/Mage/Newsletter/Model/Resource/Subscriber/Collection.php
@@ -11,6 +11,7 @@
  * Newsletter subscribers collection
  *
  * @package    Mage_Newsletter
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Newsletter_Model_Subscriber>
  */
 class Mage_Newsletter_Model_Resource_Subscriber_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Newsletter/Model/Resource/Template/Collection.php b/app/code/core/Mage/Newsletter/Model/Resource/Template/Collection.php
index 6a95682ad2e..61af3260f8a 100644
--- a/app/code/core/Mage/Newsletter/Model/Resource/Template/Collection.php
+++ b/app/code/core/Mage/Newsletter/Model/Resource/Template/Collection.php
@@ -13,6 +13,7 @@
  * Newsletter templates collection
  *
  * @package    Mage_Newsletter
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Newsletter_Model_Template>
  */
 class Mage_Newsletter_Model_Resource_Template_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug/Collection.php b/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug/Collection.php
index fe618fdbd87..4cf99253c99 100644
--- a/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug/Collection.php
+++ b/app/code/core/Mage/Paygate/Model/Resource/Authorizenet/Debug/Collection.php
@@ -13,6 +13,7 @@
  * Resource authorizenet debug collection model
  *
  * @package    Mage_Paygate
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Paygate_Model_Authorizenet_Debug>
  */
 class Mage_Paygate_Model_Resource_Authorizenet_Debug_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction/Collection.php b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction/Collection.php
index 3904c1e93d1..939330399e5 100644
--- a/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction/Collection.php
+++ b/app/code/core/Mage/Paypal/Model/Resource/Payment/Transaction/Collection.php
@@ -12,6 +12,7 @@
  *
  * @package    Mage_Paypal
  * @deprecated since 1.6.2.0
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Paypal_Model_Payment_Transaction>
  */
 class Mage_Paypal_Model_Resource_Payment_Transaction_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row/Collection.php b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row/Collection.php
index 15a452f657d..42c8396d03c 100644
--- a/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row/Collection.php
+++ b/app/code/core/Mage/Paypal/Model/Resource/Report/Settlement/Row/Collection.php
@@ -11,6 +11,7 @@
  * Resource collection for report rows
  *
  * @package    Mage_Paypal
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Paypal_Model_Report_Settlement_Row>
  */
 class Mage_Paypal_Model_Resource_Report_Settlement_Row_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Price/Collection.php b/app/code/core/Mage/ProductAlert/Model/Resource/Price/Collection.php
index ae3a511a6a1..0c29a6991b9 100644
--- a/app/code/core/Mage/ProductAlert/Model/Resource/Price/Collection.php
+++ b/app/code/core/Mage/ProductAlert/Model/Resource/Price/Collection.php
@@ -11,6 +11,7 @@
  * Product alert for changed price collection
  *
  * @package    Mage_ProductAlert
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_ProductAlert_Model_Price>
  */
 class Mage_ProductAlert_Model_Resource_Price_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Collection.php b/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Collection.php
index 035395af512..18684090698 100644
--- a/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Collection.php
+++ b/app/code/core/Mage/ProductAlert/Model/Resource/Stock/Collection.php
@@ -11,6 +11,7 @@
  * Product alert for back in stock collection
  *
  * @package    Mage_ProductAlert
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_ProductAlert_Model_Stock>
  */
 class Mage_ProductAlert_Model_Resource_Stock_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Collection.php b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Collection.php
index c34ac7bd130..8e2e5aa640e 100644
--- a/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Collection.php
+++ b/app/code/core/Mage/Rating/Model/Resource/Rating/Option/Collection.php
@@ -11,6 +11,7 @@
  * Rating option collection
  *
  * @package    Mage_Rating
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Rating_Model_Rating_Option>
  */
 class Mage_Rating_Model_Resource_Rating_Option_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Reports/Model/Resource/Event/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Event/Collection.php
index 78ae67f877e..79637583c73 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Event/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Event/Collection.php
@@ -14,6 +14,7 @@
  *
  * @method Mage_Reports_Model_Resource_Event _getResource()
  * @method Mage_Reports_Model_Resource_Event getResource()
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Reports_Model_Event>
  */
 class Mage_Reports_Model_Resource_Event_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Reports/Model/Resource/Event/Type/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Event/Type/Collection.php
index d663c529f4b..fd91a98acf8 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Event/Type/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Event/Type/Collection.php
@@ -13,6 +13,7 @@
  * Report event types collection
  *
  * @package    Mage_Reports
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Reports_Model_Event_Type>
  */
 class Mage_Reports_Model_Resource_Event_Type_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php
index 86b1223d404..70907050c45 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Report/Collection.php
@@ -13,6 +13,7 @@
  * Report Reviews collection
  *
  * @package    Mage_Reports
+ * @extends Varien_Data_Collection<Mage_Reports_model_Report>
  */
 class Mage_Reports_Model_Resource_Report_Collection extends Varien_Data_Collection
 {
diff --git a/app/code/core/Mage/Reports/Model/Resource/Wishlist/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Wishlist/Collection.php
index 5b923aa82b6..89b4ce53ab3 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Wishlist/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Wishlist/Collection.php
@@ -11,6 +11,7 @@
  * Wishlist Report collection
  *
  * @package    Mage_Reports
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Wishlist_Model_Wishlist>
  */
 class Mage_Reports_Model_Resource_Wishlist_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php b/app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php
index ebec39c1f21..a9deecea844 100644
--- a/app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php
+++ b/app/code/core/Mage/Reports/Model/Resource/Wishlist/Product/Collection.php
@@ -11,8 +11,9 @@
  * Wishlist Report collection
  *
  * @package    Mage_Reports
+ * @extends Mage_Catalog_Model_Resource_Collection_Abstract<Mage_Wishlist_Model_Wishlist>
  */
-class Mage_Reports_Model_Resource_Wishlist_Product_Collection extends Mage_Wishlist_Model_Resource_Product_Collection
+class Mage_Reports_Model_Resource_Wishlist_Product_Collection extends Mage_Catalog_Model_Resource_Collection_Abstract
 {
     /**
      * @inheritDoc
diff --git a/app/code/core/Mage/Review/Model/Resource/Review/Status/Collection.php b/app/code/core/Mage/Review/Model/Resource/Review/Status/Collection.php
index 06bf3cea0bd..f37bde2c4de 100644
--- a/app/code/core/Mage/Review/Model/Resource/Review/Status/Collection.php
+++ b/app/code/core/Mage/Review/Model/Resource/Review/Status/Collection.php
@@ -13,6 +13,7 @@
  * Review statuses collection
  *
  * @package    Mage_Review
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Review_Model_Review_Status>
  */
 class Mage_Review_Model_Resource_Review_Status_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php
index c4a5aa6fd10..f0df663a7f4 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Address/Collection.php
@@ -11,6 +11,7 @@
  * Order address collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Eav_Model_Entity_Collection_Abstract<Mage_Sales_Model_Order_Address>
  */
 class Mage_Sales_Model_Entity_Order_Address_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php
index fdbbe255b78..ad1883c3e6f 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Collection.php
@@ -11,6 +11,7 @@
  * Orders collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Eav_Model_Entity_Collection_Abstract<Mage_Sales_Model_Order>
  */
 class Mage_Sales_Model_Entity_Order_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Collection.php
index 28fdb405378..54dd894cf7f 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Collection.php
@@ -11,6 +11,7 @@
  * Creditmemos collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Eav_Model_Entity_Collection_Abstract<Mage_Sales_Model_Order_Creditmemo>
  */
 class Mage_Sales_Model_Entity_Order_Creditmemo_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment/Collection.php
index 99ba2f4a2cc..8e755c61cfb 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Comment/Collection.php
@@ -11,6 +11,7 @@
  * Creditmemo comments collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Eav_Model_Entity_Collection_Abstract<Mage_Sales_Model_Order_Creditmemo_Comment>
  */
 class Mage_Sales_Model_Entity_Order_Creditmemo_Comment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item/Collection.php
index 090d405d3b5..76b5686e016 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Creditmemo/Item/Collection.php
@@ -11,6 +11,7 @@
  * Quote creditmemo items collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Eav_Model_Entity_Collection_Abstract<Mage_Sales_Model_Order_Creditmemo_Item>
  */
 class Mage_Sales_Model_Entity_Order_Creditmemo_Item_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Collection.php
index 106fbd7535b..7e52f557956 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Collection.php
@@ -11,6 +11,7 @@
  * Invoices collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Eav_Model_Entity_Collection_Abstract<Mage_Sales_Model_Order_Invoice>
  */
 class Mage_Sales_Model_Entity_Order_Invoice_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment/Collection.php
index 4c6d6592c22..8db825136c9 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Comment/Collection.php
@@ -11,6 +11,7 @@
  * Invoice comments collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Eav_Model_Entity_Collection_Abstract<Mage_Sales_Model_Order_Invoice_Comment>
  */
 class Mage_Sales_Model_Entity_Order_Invoice_Comment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item/Collection.php
index 8c705ac9919..587e716238b 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Invoice/Item/Collection.php
@@ -11,6 +11,7 @@
  * Invoice items collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Eav_Model_Entity_Collection_Abstract<Mage_Sales_Model_Order_Invoice_Item>
  */
 class Mage_Sales_Model_Entity_Order_Invoice_Item_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Item/Collection.php
index 285b67df579..3a40a3393a5 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Item/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Item/Collection.php
@@ -11,6 +11,7 @@
  * Order status collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Eav_Model_Entity_Collection_Abstract<Mage_Sales_Model_Order_Item>
  */
 class Mage_Sales_Model_Entity_Order_Item_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Payment/Collection.php
index 020f4f9a843..cf6ea807d59 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Payment/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Payment/Collection.php
@@ -11,6 +11,7 @@
  * Order status collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Eav_Model_Entity_Collection_Abstract<Mage_Sales_Model_Order_Payment>
  */
 class Mage_Sales_Model_Entity_Order_Payment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Collection.php
index 7c82082343a..cb4928ef4af 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Collection.php
@@ -11,6 +11,7 @@
  * Shipment collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Eav_Model_Entity_Collection_Abstract<Mage_Sales_Model_Order_Shipment>
  */
 class Mage_Sales_Model_Entity_Order_Shipment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment/Collection.php
index 27378148c38..86efa9ff6a6 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Comment/Collection.php
@@ -11,6 +11,7 @@
  * Shipment comments collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Eav_Model_Entity_Collection_Abstract<Mage_Sales_Model_Order_Shipment_Comment>
  */
 class Mage_Sales_Model_Entity_Order_Shipment_Comment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item/Collection.php
index 1c33173a9c9..e7c85c7a40e 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Item/Collection.php
@@ -11,6 +11,7 @@
  * Order shipment items collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Eav_Model_Entity_Collection_Abstract<Mage_Sales_Model_Order_Shipment_Item>
  */
 class Mage_Sales_Model_Entity_Order_Shipment_Item_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track/Collection.php
index 207170b598d..32957005d4f 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Shipment/Track/Collection.php
@@ -11,6 +11,7 @@
  * Order shipment track collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Eav_Model_Entity_Collection_Abstract<Mage_Sales_Model_Order_Shipment_Track>
  */
 class Mage_Sales_Model_Entity_Order_Shipment_Track_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php
index 55f6fe64dad..8e788635eb1 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Order/Status/History/Collection.php
@@ -11,6 +11,7 @@
  * Order status history collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Eav_Model_Entity_Collection_Abstract<Mage_Sales_Model_Order_Status_History>
  */
 class Mage_Sales_Model_Entity_Order_Status_History_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Collection.php
index 982fed1f7e2..df75b6f3f3a 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Collection.php
@@ -11,6 +11,7 @@
  * Quote addresses collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Eav_Model_Entity_Collection_Abstract<Mage_Sales_Model_Quote_Address>
  */
 class Mage_Sales_Model_Entity_Quote_Address_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item/Collection.php
index 524211bc366..2fefcab7689 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Item/Collection.php
@@ -11,6 +11,7 @@
  * Quote addresses collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Eav_Model_Entity_Collection_Abstract<Mage_Sales_Model_Quote_Address_Item>
  */
 class Mage_Sales_Model_Entity_Quote_Address_Item_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate/Collection.php
index 22df71a42bb..7fa712c2242 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Address/Rate/Collection.php
@@ -11,6 +11,7 @@
  * Quote addresses collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Eav_Model_Entity_Collection_Abstract<Mage_Sales_Model_Quote_Address_Rate>
  */
 class Mage_Sales_Model_Entity_Quote_Address_Rate_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Collection.php
index f0fa38f380b..afde443d7f8 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Quote/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Collection.php
@@ -13,6 +13,7 @@
  * Quotes collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Eav_Model_Entity_Collection_Abstract<Mage_Sales_Model_Quote>
  */
 class Mage_Sales_Model_Entity_Quote_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Entity/Quote/Payment/Collection.php b/app/code/core/Mage/Sales/Model/Entity/Quote/Payment/Collection.php
index d89614ceacd..f3601a77024 100644
--- a/app/code/core/Mage/Sales/Model/Entity/Quote/Payment/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Entity/Quote/Payment/Collection.php
@@ -11,6 +11,7 @@
  * Quote addresses collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Eav_Model_Entity_Collection_Abstract<Mage_Sales_Model_Quote_Payment>
  */
 class Mage_Sales_Model_Entity_Quote_Payment_Collection extends Mage_Eav_Model_Entity_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Resource/Order/Tax/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Order/Tax/Collection.php
index 06547e13335..235a26b1d9d 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Order/Tax/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Order/Tax/Collection.php
@@ -11,6 +11,7 @@
  * Order Tax Collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Sales_Model_Order_Tax>
  */
 class Mage_Sales_Model_Resource_Order_Tax_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option/Collection.php b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option/Collection.php
index ef871ca9df6..9a191edffdd 100644
--- a/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option/Collection.php
+++ b/app/code/core/Mage/Sales/Model/Resource/Quote/Item/Option/Collection.php
@@ -11,6 +11,7 @@
  * Item option collection
  *
  * @package    Mage_Sales
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Sales_Model_Quote_Item_Option>
  */
 class Mage_Sales_Model_Resource_Quote_Item_Option_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php
index d7ed323dea7..4267134c2b5 100644
--- a/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php
+++ b/app/code/core/Mage/SalesRule/Model/Resource/Coupon/Collection.php
@@ -11,6 +11,7 @@
  * SalesRule Model Resource Coupon_Collection
  *
  * @package    Mage_SalesRule
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_SalesRule_Model_Coupon>
  */
 class Mage_SalesRule_Model_Resource_Coupon_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate/Collection.php b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate/Collection.php
index 3b12169049e..a7a86985c8f 100644
--- a/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate/Collection.php
+++ b/app/code/core/Mage/Shipping/Model/Resource/Carrier/Tablerate/Collection.php
@@ -11,6 +11,7 @@
  * Shipping table rates collection
  *
  * @package    Mage_Shipping
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Shipping_Model_Carrier_Tablerate>
  */
 class Mage_Shipping_Model_Resource_Carrier_Tablerate_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Sitemap/Collection.php b/app/code/core/Mage/Sitemap/Model/Resource/Sitemap/Collection.php
index 84bce2d2357..d251de0059e 100644
--- a/app/code/core/Mage/Sitemap/Model/Resource/Sitemap/Collection.php
+++ b/app/code/core/Mage/Sitemap/Model/Resource/Sitemap/Collection.php
@@ -11,6 +11,7 @@
  * Sitemap resource model collection
  *
  * @package    Mage_Sitemap
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Sitemap_Model_Sitemap>
  */
 class Mage_Sitemap_Model_Resource_Sitemap_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Tag/Model/Resource/Popular/Collection.php b/app/code/core/Mage/Tag/Model/Resource/Popular/Collection.php
index be26dc61d38..8f12638a7f0 100644
--- a/app/code/core/Mage/Tag/Model/Resource/Popular/Collection.php
+++ b/app/code/core/Mage/Tag/Model/Resource/Popular/Collection.php
@@ -11,6 +11,7 @@
  * Popular tags collection model
  *
  * @package    Mage_Tag
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Tag_Model_Tag>
  */
 class Mage_Tag_Model_Resource_Popular_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Tag/Model/Resource/Tag/Collection.php b/app/code/core/Mage/Tag/Model/Resource/Tag/Collection.php
index 86661cd5530..0bb0d49a20e 100644
--- a/app/code/core/Mage/Tag/Model/Resource/Tag/Collection.php
+++ b/app/code/core/Mage/Tag/Model/Resource/Tag/Collection.php
@@ -11,6 +11,7 @@
  * Tag collection model
  *
  * @package    Mage_Tag
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Tag_Model_Tag>
  */
 class Mage_Tag_Model_Resource_Tag_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item/Collection.php b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item/Collection.php
index eafed582ff6..528d60bc64c 100644
--- a/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item/Collection.php
+++ b/app/code/core/Mage/Tax/Model/Resource/Sales/Order/Tax/Item/Collection.php
@@ -13,6 +13,7 @@
  * Order Tax Item Collection
  *
  * @package    Mage_Tax
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Tax_Model_Sales_Order_Tax_Item>
  */
 class Mage_Tax_Model_Resource_Sales_Order_Tax_Item_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php
index b8a423200b2..010d7cbfef5 100644
--- a/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php
+++ b/app/code/core/Mage/Widget/Model/Resource/Widget/Instance/Collection.php
@@ -13,6 +13,7 @@
  * Widget Instance Collection
  *
  * @package    Mage_Widget
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Widget_Model_Widget_Instance>
  */
 class Mage_Widget_Model_Resource_Widget_Instance_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {
diff --git a/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php b/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php
index e1d30a08a64..f7931c8385b 100644
--- a/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php
+++ b/app/code/core/Mage/Wishlist/Model/Resource/Item/Option/Collection.php
@@ -11,6 +11,7 @@
  * Wishlist item option collection
  *
  * @package    Mage_Wishlist
+ * @extends Mage_Core_Model_Resource_Db_Collection_Abstract<Mage_Wishlist_Model_Item_Option>
  */
 class Mage_Wishlist_Model_Resource_Item_Option_Collection extends Mage_Core_Model_Resource_Db_Collection_Abstract
 {