Index: rules/modules/taxonomy.rules.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/rules/rules/modules/Attic/taxonomy.rules.inc,v
retrieving revision 1.1.2.11
diff -u -r1.1.2.11 taxonomy.rules.inc
--- rules/modules/taxonomy.rules.inc	10 Jul 2009 13:05:33 -0000	1.1.2.11
+++ rules/modules/taxonomy.rules.inc	5 Aug 2009 16:59:03 -0000
@@ -235,6 +235,7 @@
       'savable' => FALSE,
       'identifiable' => TRUE,
       'module' => 'Taxonomy',
+      'token type' => 'taxonomy',
     ),
     'taxonomy_vocab' => array(
       'label' => t('taxonomy vocabulary'),
@@ -242,6 +243,7 @@
       'savable' => FALSE,
       'identifiable' => TRUE,
       'module' => 'Taxonomy',
+      'token type' => FALSE,
     ),
   );
 }
Index: rules/modules/rules.rules.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/rules/rules/modules/Attic/rules.rules.inc,v
retrieving revision 1.1.2.39
diff -u -r1.1.2.39 rules.rules.inc
--- rules/modules/rules.rules.inc	13 Jul 2009 13:34:27 -0000	1.1.2.39
+++ rules/modules/rules.rules.inc	5 Aug 2009 16:59:03 -0000
@@ -19,24 +19,28 @@
       'class' => 'rules_data_type_string',
       'identifiable' => FALSE,
       'eval input' => TRUE,
+      'token type' => FALSE,
     ),
     'number' => array(
       'label' => t('number'),
       'class' => 'rules_data_type_number',
       'identifiable' => FALSE,
       'eval input' => TRUE,
+      'token type' => FALSE,
     ),
     'date' => array(
       'label' => t('date'),
       'class' => 'rules_data_type_date',
       'identifiable' => FALSE,
       'eval input' => TRUE,
+      'token type' => FALSE,
     ),
     'boolean' => array(
       'label' => t('truth value'),
       'class' => 'rules_data_type_boolean',
       'identifiable' => FALSE,
       'eval input' => TRUE,
+      'token type' => FALSE,
     ),
     'value' => array(
       'label' => t('a fixed value'),
Index: rules/rules.api.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/rules/rules/Attic/rules.api.php,v
retrieving revision 1.1.2.5
diff -u -r1.1.2.5 rules.api.php
--- rules/rules.api.php	24 Jun 2009 15:47:47 -0000	1.1.2.5
+++ rules/rules.api.php	5 Aug 2009 16:59:03 -0000
@@ -55,8 +55,8 @@
  *   - 'eval input'
  *         Optional; An array containing form element names of elements contained in the
  *         actions settings form ($form['settings']) to which input evaluators
- *         should be attached. 
- *         For settings in a nested array the array keys may be separated by '|' 
+ *         should be attached.
+ *         For settings in a nested array the array keys may be separated by '|'
  *         in the name.
  *   - 'label callback'
  *         A callback to improve the action's label once it has been configured.
@@ -413,6 +413,9 @@
  *    - 'eval input'
  *         If the data type uses an input form, this can be used to enable input
  *         evaluation for it. Optional (defaults to FALSE).
+ *    - 'token type'
+ *         The type name as used by the token module. Defaults to the type name
+ *         as used by rules. Use FALSE to let token ignore this type. Optional.
  *    - 'hidden'
  *         Whether the data type should be hidden from the UI. Optional
  *         (defaults to FALSE).