merged with HEAD and other interesting changes

lib/WebGUI/Help/Asset_Collaboration.pm

@@ -20,7 +20,6 @@ our $HELP = {
             { 'name' => 'open.label' },
             { 'name' => 'close.label' },
             { 'name' => 'closed.label' },
-            { 'name' => 'collaborationAssetId' },
             { 'name' => 'critical.label' },
             { 'name' => 'minor.label' },
             { 'name' => 'cosmetic.label' },
@@ -155,6 +154,7 @@ our $HELP = {
             { 'name' => 'sortby.views.url' },
             { 'name' => 'sortby.replies.url' },
             { 'name' => 'sortby.rating.url' }
+            { 'name' => 'collaborationAssetId' },
         ],
         related => [
             {   tag       => 'collaboration template labels',

lib/WebGUI/Help/Asset_MatrixListing.pm

@@ -14,6 +14,10 @@ our $HELP = {
             },
         ],
         variables => [
+            { 'name' => 'canEdit' },
+            { 'name' => 'editUrl' },
+            { 'name' => 'canApprove' },
+            { 'name' => 'approveOrDenyUrl' },
             { 'name' => 'screenshots' },
             { 'name' => 'emailForm' },
             { 'name' => 'emailSent' },

lib/WebGUI/Help/AuthWebGUI.pm

@@ -163,6 +163,16 @@ our $HELP = {
         related   => [],
     },
 
+    'account activation template' => {
+        title => 'account activation template title',
+        body  => '',
+        variables => [
+            { 'name' => 'newUser_username' },
+            { 'name' => 'activationUrl' },
+        ],
+        fields  => [],
+        related => []
+    },
 };
 
 1;