Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1317
diff -u -p -r1.1317 node.module
--- modules/node/node.module	9 Nov 2010 08:36:38 -0000	1.1317
+++ modules/node/node.module	11 Nov 2010 02:24:31 -0000
@@ -172,6 +172,8 @@ function node_entity_info() {
       'base table' => 'node',
       'revision table' => 'node_revision',
       'uri callback' => 'node_uri',
+      'path' => 'node/%node',
+      'token path' => 'node/[node:nid]',
       'fieldable' => TRUE,
       'entity keys' => array(
         'id' => 'nid',
Index: modules/system/system.api.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.api.php,v
retrieving revision 1.211
diff -u -p -r1.211 system.api.php
--- modules/system/system.api.php	28 Oct 2010 02:27:09 -0000	1.211
+++ modules/system/system.api.php	11 Nov 2010 02:24:33 -0000
@@ -87,6 +87,10 @@ function hook_hook_info_alter(&$hooks) {
  *   - uri callback: A function taking an entity as argument and returning the
  *     uri elements of the entity, e.g. 'path' and 'options'. The actual entity
  *     uri can be constructed by passing these elements to url().
+ *   - path: (optional) A string containing the default path to an entity
+ *     using tokens. This is for informational purposes only.
+ *   - token path: (optional) A string containing the default path to an entity
+ *     using tokens. This is for informational purposes only.
  *   - label callback: (optional) A function taking an entity as argument and
  *     returning the label of the entity; e.g., $node->title or
  *     $comment->subject. A callback should be specified when the label is the
@@ -132,6 +136,10 @@ function hook_hook_info_alter(&$hooks) {
  *       entity type, but for the bundle only. When determining the URI of an
  *       entity, if a 'uri callback' is defined for both the entity type and
  *       the bundle, the one for the bundle is used.
+ *     - path: Same as the 'path' key documented above for the entity type, but
+ *       for the bundle only.
+ *     - token path: Same as the 'token path' key documented above for the
+ *       entity type, but for the bundle only.
  *     - admin: An array of information that allows Field UI pages to attach
  *       themselves to the existing administration pages for the bundle.
  *       Elements:
@@ -178,6 +186,8 @@ function hook_entity_info() {
       'base table' => 'node',
       'revision table' => 'node_revision',
       'uri callback' => 'node_uri',
+      'path' => 'node/%node',
+      'token path' => 'node/[node:nid]',
       'fieldable' => TRUE,
       'translation' => array(
         'locale' => TRUE,
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.616
diff -u -p -r1.616 taxonomy.module
--- modules/taxonomy/taxonomy.module	9 Nov 2010 17:52:57 -0000	1.616
+++ modules/taxonomy/taxonomy.module	11 Nov 2010 02:24:34 -0000
@@ -96,6 +96,8 @@ function taxonomy_entity_info() {
       'controller class' => 'TaxonomyTermController',
       'base table' => 'taxonomy_term_data',
       'uri callback' => 'taxonomy_term_uri',
+      'path' => 'taxonomy/term/%taxonomy_term',
+      'token path' => 'taxonomy/term/[term:tid]',
       'fieldable' => TRUE,
       'entity keys' => array(
         'id' => 'tid',
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1214
diff -u -p -r1.1214 user.module
--- modules/user/user.module	6 Nov 2010 23:24:33 -0000	1.1214
+++ modules/user/user.module	11 Nov 2010 02:24:34 -0000
@@ -142,6 +142,8 @@ function user_entity_info() {
       'controller class' => 'UserController',
       'base table' => 'users',
       'uri callback' => 'user_uri',
+      'path' => 'user/%user',
+      'token path' => 'user/[user:uid]',
       'label callback' => 'format_username',
       'fieldable' => TRUE,
       'entity keys' => array(