Index: includes/context-task-handler.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ctools/includes/context-task-handler.inc,v
retrieving revision 1.23.2.8
diff -u -p -r1.23.2.8 context-task-handler.inc
--- includes/context-task-handler.inc	6 Aug 2010 18:23:11 -0000	1.23.2.8
+++ includes/context-task-handler.inc	2 Sep 2010 20:40:13 -0000
@@ -406,7 +406,7 @@ function ctools_context_handler_edit_con
   $form['left']['summary'] = array(
     '#prefix' => '<div class="page-manager-contexts">',
     '#suffix' => '</div>',
-    '#value' => theme('ctools_context_list', $cache, t('Summary of contexts')),
+    '#value' => theme('ctools_context_list', $cache, t('Summary of contexts'), t('Note that CCK fields may be used as keywords using patterns like <em>%node:field_name-formatted</em>.')),
   );
 
   $form_state['context_object'] = &$cache;
Index: includes/context.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ctools/includes/context.theme.inc,v
retrieving revision 1.7.2.3
diff -u -p -r1.7.2.3 context.theme.inc
--- includes/context.theme.inc	3 Aug 2010 18:45:21 -0000	1.7.2.3
+++ includes/context.theme.inc	2 Sep 2010 20:40:14 -0000
@@ -117,7 +117,7 @@ function theme_ctools_context_item_form(
  *
  * Contexts must be preloaded.
  */
-function theme_ctools_context_list($object, $header = '') {
+function theme_ctools_context_list($object, $header = '', $description = '') {
   $titles = array();
   $output = '';
   $count  = 1;
@@ -222,6 +222,9 @@ function theme_ctools_context_list($obje
 
   $head = '';
   if ($header) {
+    if ($description) {
+      $header .= '<div class="description">' . $description . '</div>';
+    }
     $head .= '<thead><tr>';
     $head .= '<th colspan="2">' . $header . '</th>';
     $head .= '</tr></thead>';
Index: includes/wizard.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ctools/includes/wizard.inc,v
retrieving revision 1.12.2.8
diff -u -p -r1.12.2.8 wizard.inc
--- includes/wizard.inc	13 Jul 2010 23:55:22 -0000	1.12.2.8
+++ includes/wizard.inc	2 Sep 2010 20:40:14 -0000
@@ -296,7 +296,7 @@ function ctools_wizard_wrapper(&$form, &
     }
 
     // If we are allowed to cancel, place a cancel button.
-    if (isset($form_info['cancel path']) || !empty($form_info['show cancel'])) {
+    if ((isset($form_info['cancel path']) && !isset($form_info['show cancel'])) || !empty($form_info['show cancel'])) {
       $form['buttons']['cancel'] = array(
         '#type' => 'submit',
         '#value' => $form_info['cancel text'],
Index: plugins/content_types/custom/custom.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/ctools/plugins/content_types/custom/custom.inc,v
retrieving revision 1.9.2.13
diff -u -p -r1.9.2.13 custom.inc
--- plugins/content_types/custom/custom.inc	10 Aug 2010 23:24:51 -0000	1.9.2.13
+++ plugins/content_types/custom/custom.inc	2 Sep 2010 20:40:14 -0000
@@ -269,7 +269,7 @@ function ctools_custom_content_type_edit
     $form['substitute'] = array(
       '#type' => 'checkbox',
       '#title' => t('Use context keywords'),
-      '#description' => t('If checked, context keywords will be substituted in this content.'),
+      '#description' => t('If checked, context keywords will be substituted in this content. Note that CCK fields may be used as keywords using patterns like <em>%node:field_name-formatted</em>.'),
       '#default_value' => !empty($settings['substitute']),
     );
     $form['contexts'] = array(