Resolves Jira OSQA-734, adding some missing imports and a bit of reorganization of...

[osqa.git] / forum / settings / about.py

diff --git a/forum/settings/about.py b/forum/settings/about.py
index 45c88579a637a83338c2e96d104e5edf68c39ba9..b4f1a64dda44c652ef7a1d20767b69a567b4ca86 100644 (file)
--- a/forum/settings/about.py
+++ b/forum/settings/about.py
@@ -4,16 +4,16 @@ from django.forms.widgets import Textarea
 PAGES_SET = SettingSet('about', 'About page', "Define the text in the about page. You can use markdown and some basic html tags.", 2000, True)
 
 ABOUT_PAGE_TEXT = Setting('ABOUT_PAGE_TEXT',
 PAGES_SET = SettingSet('about', 'About page', "Define the text in the about page. You can use markdown and some basic html tags.", 2000, True)
 
 ABOUT_PAGE_TEXT = Setting('ABOUT_PAGE_TEXT',

-"""
+u"""

 **Please customize this text in the administration area**
 
 Here you can **ask** and **answer** questions, **comment**
 **Please customize this text in the administration area**
 
 Here you can **ask** and **answer** questions, **comment**

-and **vote<** for the questions of others and their answers. Both questions and answers
+and **vote** for the questions of others and their answers. Both questions and answers

 **can be revised** and improved. Questions can be **tagged** with
 the relevant keywords to simplify future access and organize the accumulated material.
 
 This <span class="orange">Q&amp;A</span> site is moderated by its members, hopefully - including yourself!
 **can be revised** and improved. Questions can be **tagged** with
 the relevant keywords to simplify future access and organize the accumulated material.
 
 This <span class="orange">Q&amp;A</span> site is moderated by its members, hopefully - including yourself!

-Moderation rights are gradually assigned to the site users based on the accumulated **"reputation"**
+Moderation rights are gradually assigned to the site users based on the accumulated "**karma**"

 points. These points are added to the users account when others vote for his/her questions or answers.
 These points (very) roughly reflect the level of trust of the community.
 
 points. These points are added to the users account when others vote for his/her questions or answers.
 These points (very) roughly reflect the level of trust of the community.