Merging in changesets from revisions 809, 811, 812, 825, 826, and 827. These all...

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@839 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/settings/faq.py b/forum/settings/faq.py
index 2be4a1334a0291f8ded66281fe8d55e597a52fe3..16377f68712419dcc57f7ec3b470e0cbb5e2c34a 100644 (file)
--- a/forum/settings/faq.py
+++ b/forum/settings/faq.py
@@ -9,27 +9,45 @@ u"""
 
 **Frequently Asked Questions (FAQ)**
 
 
 **Frequently Asked Questions (FAQ)**
 

+**How is a Question/Answer community different from a typical forum?**
+
+A Question/Answer community is different from a typical forum because it focuses on finding answers to the questions of its members.  A typical forum, by contrast, operates more like a discussion group, where people are free to give their opinions and topics tend to be more subjective.
+
+By keeping a laser focus on questions and answers, this community ensures that finding answers to existing questions - and getting answers to new questions - can be done without any distractions.
+

 **What kinds of questions can I ask here?**
 
 **What kinds of questions can I ask here?**
 

-Most importantly - questions should be relevant to this community. Before you ask - please make sure to search for a similar question. You can search questions by their title or tags.
+Most importantly - questions should be relevant to this community. Before you ask, please make sure to search for a similar question. You can search for questions by their title, content, or tags.

 
 **What kinds of questions should be avoided?**
 
 
 **What kinds of questions should be avoided?**
 

-Please avoid asking questions that are not relevant to this community, too subjective and argumentative.
+Please avoid asking questions that are not relevant to this community, are too subjective or argumentative.

 
 **What should I avoid in my answers?**
 
 
 **What should I avoid in my answers?**
 

-OSQA: Open Source Q&A Forum is a question and answer site - it is not a discussion group. Please avoid holding debates in your answers as they tend to dilute the essense of questions and answers. For the brief discussions please use commenting facility.
+OSQA: Open Source Q&A Forum is a question and answer site - it is not a discussion group. Please avoid holding debates in your answers as they tend to dilute the essense of questions and answers. For brief discussions please use commenting facility.
+
+** Why are email notifications so important? **
+
+Email notifications are the bedrock of a successful question and answer community. These notifications allow community members to be notified of important events, such as:
+
+* When their questions have been answered
+* When one of their posts is commented on by another member
+* When other members post new questions, answers, or comments in their area of interest
+
+The success of the community relies upon community member involvement, and members are much more likely to become involved, active participants on the site when they're notified of interesting developments.  That is why this community considers a valid email address as a requirement for participating in the community and using this site.
+
+If you're already a member of this community and haven't validated your email address, you can do so [here](/account/send-validation/ "Validate Email Address").  If you aren't yet a member of this community, join up by [creating a new account](/account/local/register/ "Create a new account").

 
 

-**Who moderates this community?**
+ **Who moderates this community?**

 
 

-The short answer is: you. This website is moderated by the users. Karma system allows users to earn rights to perform a variety of moderation tasks
+The short answer is: you. This website is moderated by the users. The community features a karma system that allows users to earn rights to perform a variety of moderation tasks.

 
 **How does the karma system work?**
 
 
 **How does the karma system work?**
 

-When a question or answer is upvoted, the user who posted them will gain some points, which are called "karma points". These points serve as a rough measure of the community trust to him/her. Various moderation tasks are gradually assigned to the users based on those points.
+When a question or answer is upvoted, the user who posted them will gain some points, which are called "karma points". These points serve as a rough measure of the community trust in him/her. Various moderation tasks are gradually assigned to the users based on those points.

 
 

-For example, if you ask an interesting question or give a helpful answer, your input will be upvoted. On the other hand if the answer is misleading - it will be downvoted. Each vote in favor will generate |REP_GAIN_BY_UPVOTED| points, each vote against will subtract |REP_LOST_BY_DOWNVOTED| points. There is a limit of 200 points that can be accumulated per question or answer. The table below explains karma requirements for each type of moderation task.
+For example, if you ask an interesting question or give a helpful answer, your input will be upvoted. On the other hand if the answer is misleading, it will be downvoted. Each vote in favor will generate |REP_GAIN_BY_UPVOTED| points, each vote against will subtract |REP_LOST_BY_DOWNVOTED| points. There is a limit of 200 points that can be accumulated per question or answer. The table below explains karma requirements for each type of moderation task.

 
 * add comments ->  |REP_TO_COMMENT|
 * delete comments -> |REP_TO_DELETE_COMMENTS|
 
 * add comments ->  |REP_TO_COMMENT|
 * delete comments -> |REP_TO_DELETE_COMMENTS|


@@ -40,17 +58,17 @@ For example, if you ask an interesting question or give a helpful answer, your i
 * open any closed question -> |REP_TO_CLOSE_OTHERS|
 * delete any comment -> |REP_TO_DELETE_COMMENTS|
 
 * open any closed question -> |REP_TO_CLOSE_OTHERS|
 * delete any comment -> |REP_TO_DELETE_COMMENTS|
 

-**What is gravatar?**
+**What is a gravatar?**

 
 

-Gravatar means globally recognized avatar - your unique avatar image associated with your email address. It's simply a picture that shows next to your posts on the websites that support gravatar protocol. By default gravar appears as a square filled with a snowflake-like figure. You can set your image at gravatar.com
+Gravatar means globally recognized avatar - your unique avatar image associated with your email address. It's simply a picture that shows next to your posts on the websites that support gravatar protocol. The default gravatar appears as a square filled with a snowflake-like figure. You can set your image at gravatar.com

 
 

-**To register, do I need to create new password?**
+**To participate in this community, do I need to create new account?**

 
 

-No, you don't have to. You can login through any service that supports OpenID, e.g. Google, Yahoo, AOL, etc. Login now!
+No, you don't have to. You can login through any service that supports OpenID, e.g. Google, Yahoo, AOL, etc. [Login now!](/account/signin/ "Login")

 
 **Why can other people can edit my questions/answers?**
 
 
 **Why can other people can edit my questions/answers?**
 

-Goal of this site is... So questions and answers can be edited like wiki pages by experienced users of this site and this improves the overall quality of the knowledge base content. If this approach is not for you, we respect your choice.
+Allowing experienced members of this community to curate the questions and answers improves the overall quality of the knowledge base content. If this approach is not for you, we respect your choice.

 
 **Still have questions?**
 
 
 **Still have questions?**
 

diff --git a/forum/skins/default/templates/auth/complete.html b/forum/skins/default/templates/auth/complete.html
index c5a3c9ee2266d84d2cc260e751cdf000b80bc209..20880ec497f6d3fb27fe663083a8094f447050b8 100644 (file)
--- a/forum/skins/default/templates/auth/complete.html
+++ b/forum/skins/default/templates/auth/complete.html
@@ -9,8 +9,15 @@
     </div>      
        <div id="completetxt" >
         <div class="message">
     </div>      
        <div id="completetxt" >
         <div class="message">

-            <b>{% trans "You are here for the first time with " %}{{ provider }}</b>
-            {% trans "Please create your screen name and save your email address. Saved email address will let you subscribe for the updates on the most interesting questions and will be used to create and retrieve your unique avatar image. " %}
+            {# Only display the OpenID greeting if a provider is detected. #}
+            {% if provider %}
+                <p>
+                    <b>{% trans "You are here for the first time with " %}{{ provider }}</b>
+                </p>
+            {% endif %}
+            <p>
+                {% trans "Please choose your screen name and confirm your email address. A valid email address is necessary to receive notifications about activity in the areas of this community you're most interested in, and will help you become an involved participant in this community." %}
+            </p>

         </div>
        <p style="display:none">{% trans "This account already exists, please use another." %}</p>
        </div>
         </div>
        <p style="display:none">{% trans "This account already exists, please use another." %}</p>
        </div>

diff --git a/forum/skins/default/templates/question_edit_tips.html b/forum/skins/default/templates/question_edit_tips.html
index d54deefaf459dfe3f21d0f32185fa587b0f6c686..649ce8ca9d7f8a294bc138615e852986662996e9 100644 (file)
--- a/forum/skins/default/templates/question_edit_tips.html
+++ b/forum/skins/default/templates/question_edit_tips.html
@@ -11,6 +11,9 @@
                 {% endblocktrans %}
             </b>
             </li>
                 {% endblocktrans %}
             </b>
             </li>

+            <li>
+                {% trans "the title must be in the form of a question" %}
+            </li>

             <li>
                 {% trans "please try provide enough details" %}
             </li>
             <li>
                 {% trans "please try provide enough details" %}
             </li>