--- a/templates/about/mentor.html	Mon Mar 01 12:44:27 2010 +0530
+++ b/templates/about/mentor.html	Mon Mar 01 15:15:54 2010 +0530
@@ -1,12 +1,10 @@
 {% extends 'base.html' %}
 {% block title %}
-    {{task.title}}
+    {{PyTasks - Learn more - Mentor}}
 {% endblock %}
 {% block content %}
     The user who created a task will become a mentor for the task. Mentor is a person who mentors the task.
     Mentor has all the rights over the task. A Mentor can request other users also to mentor the task.
     Mentor can add/remove subtasks if applicable. Mentor can request assign of credits for task.
     Mentor can mark the task as Invalid/Complete.<br />
-    
-
 {% endblock %}

--- a/templates/task/addmentor.html	Mon Mar 01 12:44:27 2010 +0530
+++ b/templates/task/addmentor.html	Mon Mar 01 15:15:54 2010 +0530
@@ -1,9 +1,17 @@
 {% extends 'base.html' %}
 {% block content %}
-    <a href="/task/view/tid={{task.id}}">Click here</a> to return to the task.
+    <a href="/task/view/tid={{task.id}}">Click here</a> to return to the task.<br /><br />
+    Requesting a user to act as a mentor for the task sends him a request. If he accepts the request, he will also be the mentor for this task
+    {% ifequal task.status "UP" %}
+        and can view/edit<sup><a href="/about/edittask/" target="_blank">learn more</a></sup> the task. But only the creator of a task can publish the task.
+    {% else %}
+        and will have all the rights<sup><a href="/about/mentorrights/" target="_blank">learn more</a></sup> you posses over the task.
+    {% endifequal %}
+    <br />
+    <br />
     <form action="" method="post">
     {{form.as_table}}
-    <input type="submit" value="submit">
+    <input type="submit" value="Submit">
     </form>
     {% if pending_requests %}
         Pending requests:<br />

--- a/templates/task/claim.html	Mon Mar 01 12:44:27 2010 +0530
+++ b/templates/task/claim.html	Mon Mar 01 15:15:54 2010 +0530
@@ -1,5 +1,8 @@
 {% extends 'base.html' %}
 {% block content %}
+    {% if user_can_claim %}
+        Propose a claim to work on this task.<sup><a href="/about/claimtask/" target="_blank">learn more</a></sup><br /><br />
+    {% endif %}
     {% if claims %}
         List of all the claims for the task <a href="/task/view/tid={{task.id}}">{{task.title}}</a><br />
         {% for claim in claims %}
@@ -20,7 +23,7 @@
         <a href="/task/view/tid={{task.id}}">Click here</a> to view the task.<br />
     {% endif %}
     {% if task_claimed and is_mentor %}
-        <a href="/task/assign/tid={{task.id}}">Select a user to assign the work.</a>
+        <a href="/task/assign/tid={{task.id}}">Select a user to assign the work.</a><sup><a href="/about/assigntask/" target="_blank">learn more</a></sup>
     {% endif %}
     {% if user_can_claim %}
         {% if errors %}
@@ -30,11 +33,11 @@
         {% endif %}
         
         <hr />
-        Please note that you can claim only once and so write your proposal carefully.<br />
         Claim proposal:<br />
             <form action="" method="post">
             <textarea name="message"></textarea><br />
-            <input type="submit" value="Submit Claim">
+            <input type="submit" value="Submit Claim"><br />
+            Please note that you can claim only once and so write your proposal carefully.<br />
             </form>
     {% endif %}
 {% endblock %}