diff --git a/README.txt b/README.txt
index 7adb34a..cd31e87 100644
--- a/README.txt
+++ b/README.txt
@@ -39,3 +39,7 @@ Support
 Please use the issue queue for filing bugs with this module at
 http://drupal.org/project/issues/webform
 
+Documentation
+-------------
+Please see the documentation pages for tips and tricks. These can be found at:
+http://drupal.org/documentation/modules/webform
diff --git a/webform.tokens.inc b/webform.tokens.inc
index ad58c96..cd7bf23 100644
--- a/webform.tokens.inc
+++ b/webform.tokens.inc
@@ -41,7 +41,7 @@ function webform_token_info() {
   );
   $info['tokens']['submission']['values'] = array(
     'name' => t('Webform submission values'),
-    'description' => t('Webform tokens from submitted data. Includes the value and field label. Replace the "?" with the "Field Key". Append ":nolabel" for just the value.'),
+    'description' => t('Webform tokens from submitted data. By default the token holds the label and the value. Replace the "?" with the field key of the component, prefixed with the keys of parent fieldsets, separated by colons e.g. "your_details:first_name". Append ":nolabel" to display the value without the label.'),
     'dynamic' => TRUE,
   );