Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.1223
diff -u -p -r1.1223 common.inc
--- includes/common.inc	22 Sep 2010 03:24:09 -0000	1.1223
+++ includes/common.inc	23 Sep 2010 14:28:52 -0000
@@ -6820,13 +6820,17 @@ function entity_create_stub_entity($enti
  * @see hook_entity_info()
  * @see DrupalEntityController
  * @see DrupalDefaultEntityController
+ * @see EntityFieldQuery
  *
  * @param $entity_type
  *   The entity type to load, e.g. node or user.
  * @param $ids
  *   An array of entity IDs, or FALSE to load all entities.
  * @param $conditions
- *   An array of conditions in the form 'field' => $value.
+ *   (deprecated) An array of conditions in the form 'field' => $value.
+ *   If conditions are needed, then use EntityFieldQuery to retrieve the list of
+ *   entity IDs matching a given set of conditions. Then call this function with
+ *   $ids set to the array returned by EntityFieldQuery::execute().
  * @param $reset
  *   Whether to reset the internal cache for the requested entity type.
  *
Index: includes/file.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/file.inc,v
retrieving revision 1.229
diff -u -p -r1.229 file.inc
--- includes/file.inc	11 Sep 2010 21:14:31 -0000	1.229
+++ includes/file.inc	23 Sep 2010 14:28:53 -0000
@@ -489,15 +489,20 @@ function file_create_htaccess($directory
  * @param $fids
  *   An array of file IDs.
  * @param $conditions
- *   An array of conditions to match against the {file_managed} table.
- *   These should be supplied in the form array('field_name' =>
+ *   (deprecated) An array of conditions to match against the {file_managed}
+ *   table. These should be supplied in the form array('field_name' =>
  *   'field_value').
+ *   If conditions are needed, then use EntityFieldQuery to retrieve the list of
+ *   entity IDs matching a given set of conditions. Then call this function with
+ *   $fids set to the array returned by EntityFieldQuery::execute().
  *
  * @return
  *   An array of file objects, indexed by fid.
  *
  * @see hook_file_load()
  * @see file_load()
+ * @see entity_load()
+ * @see EntityFieldQuery
  */
 function file_load_multiple($fids = array(), $conditions = array()) {
   return entity_load('file', $fids, $conditions);
Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.898
diff -u -p -r1.898 comment.module
--- modules/comment/comment.module	13 Sep 2010 05:52:18 -0000	1.898
+++ modules/comment/comment.module	23 Sep 2010 14:28:53 -0000
@@ -1591,10 +1591,17 @@ function comment_delete_multiple($cids) 
  * @param $cids
  *   An array of comment IDs.
  * @param $conditions
- *   An array of conditions to match against the {comments} table. These
- *   should be supplied in the form array('field_name' => 'field_value').
+ *   (deprecated) An array of conditions to match against the {comments} table.
+ *   These should be supplied in the form array('field_name' => 'field_value').
+ *   If conditions are needed, then use EntityFieldQuery to retrieve the list of
+ *   entity IDs matching a given set of conditions. Then call this function with
+ *   $cids set to the array returned by EntityFieldQuery::execute().
+ *
  * @return
- *  An array of comment objects, indexed by comment ID.
+ *   An array of comment objects, indexed by comment ID.
+ *
+ * @see entity_load()
+ * @see EntityFieldQuery
  */
 function comment_load_multiple($cids = array(), $conditions = array()) {
   return entity_load('comment', $cids, $conditions);
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1301
diff -u -p -r1.1301 node.module
--- modules/node/node.module	18 Sep 2010 01:39:33 -0000	1.1301
+++ modules/node/node.module	23 Sep 2010 14:28:54 -0000
@@ -852,11 +855,16 @@ function node_invoke($node, $hook, $a2 =
  * database access if loaded again during the same page request.
  *
  * @see entity_load()
+ * @see EntityFieldQuery
  *
  * @param $nids
  *   An array of node IDs.
  * @param $conditions
- *   An array of conditions on the {node} table in the form 'field' => $value.
+ *   (deprecated) An array of conditions on the {node} table in the form
+ *   'field' => $value.
+ *   If conditions are needed, then use EntityFieldQuery to retrieve the list of
+ *   entity IDs matching a given set of conditions. Then call this function with
+ *   $nids set to the array returned by EntityFieldQuery::execute().
  * @param $reset
  *   Whether to reset the internal node_load cache.
  *
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.605
diff -u -p -r1.605 taxonomy.module
--- modules/taxonomy/taxonomy.module	11 Sep 2010 06:03:12 -0000	1.605
+++ modules/taxonomy/taxonomy.module	23 Sep 2010 14:28:54 -0000
@@ -942,14 +942,18 @@ class TaxonomyVocabularyController exten
  * database access if loaded again during the same page request.
  *
  * @see entity_load()
+ * @see EntityFieldQuery
  *
  * @param $tids
- *  An array of taxonomy term IDs.
+ *   An array of taxonomy term IDs.
  * @param $conditions
- *  An array of conditions to add to the query.
+ *   (deprecated) An array of conditions in the form 'field' => $value.
+ *   If conditions are needed, then use EntityFieldQuery to retrieve the list of
+ *   entity IDs matching a given set of conditions. Then call this function with
+ *   $tids set to the array returned by EntityFieldQuery::execute().
  *
  * @return
- *  An array of term objects, indexed by tid.
+ *   An array of term objects, indexed by tid.
  */
 function taxonomy_term_load_multiple($tids = array(), $conditions = array()) {
   return entity_load('taxonomy_term', $tids, $conditions);
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1203
diff -u -p -r1.1203 user.module
--- modules/user/user.module	22 Sep 2010 03:24:09 -0000	1.1203
+++ modules/user/user.module	23 Sep 2010 14:28:54 -0000
@@ -235,8 +235,11 @@ function user_external_load($authname) {
  * @param $uids
  *   An array of user IDs.
  * @param $conditions
- *   An array of conditions to match against the {users} table. These
- *   should be supplied in the form array('field_name' => 'field_value').
+ *   (deprecated) An array of conditions to match against the {users} table.
+ *   These should be supplied in the form array('field_name' => 'field_value').
+ *   If conditions are needed, then use EntityFieldQuery to retrieve the list of
+ *   entity IDs matching a given set of conditions. Then call this function with
+ *   $uids set to the array returned by EntityFieldQuery::execute().
  * @param $reset
  *   A boolean indicating that the internal cache should be reset. Use this if
  *   loading a user object which has been altered during the page request.
@@ -247,6 +250,7 @@ function user_external_load($authname) {
  * @see user_load()
  * @see user_load_by_mail()
  * @see user_load_by_name()
+ * @see EntityFieldQuery
  */
 function user_load_multiple($uids = array(), $conditions = array(), $reset = FALSE) {
   return entity_load('user', $uids, $conditions, $reset);