diff --git a/README.rst b/README.rst index 6317812..46cddb8 100644 --- a/README.rst +++ b/README.rst @@ -22,7 +22,7 @@ WELCOME TO DJANGO-QA A Simple Q&A App using Python Django ==================================== django-qa_ is a fork from Simple-Q-A-App-using-Python-Django_ aimed to create a pluggable package than allows to implement a StackOverflow-like forum site for your Django web project. -The development of this package is kindly supported by SWAPPS_ and constantly developed by it's colaborators. Feel free to use it, add some issues if you find bugs or think of a really cool feature, even clone it and generate a pull requests to incorporate those cool features made by yourself; If you have special requirements, `drop us a few lines `_ and perhaps we can help you out too. +The development of this package is kindly supported by SWAPPS_ and constantly developed by it's collaborators. Feel free to use it, add some issues if you find bugs or think of a really cool feature, even clone it and generate a pull requests to incorporate those cool features made by yourself; If you have special requirements, `drop us a few lines `_ and perhaps we can help you out too. .. _django-qa: http://swappsco.github.io/django-qa/ .. _Simple-Q-A-App-using-Python-Django: http://arjunkomath.github.io/Simple-Q-A-App-using-Python-Django diff --git a/docs/base.rst b/docs/base.rst index 13a881f..5988617 100644 --- a/docs/base.rst +++ b/docs/base.rst @@ -18,7 +18,7 @@ :target: https://requires.io/github/swappsco/django-qa/requirements/?branch=master `django-qa `_ is a pluggable package than allows to implement a StackOverflow-like forum site for your Django web project. -The development of this package is kindly supported by `SWAPPS `_ and constantly developed by it's colaborators. Feel free to use it, add some issues if you find bugs or think of a really cool feature, even clone it and generate a pull requests to incorporate those cool features made by yourself. +The development of this package is kindly supported by `SWAPPS `_ and constantly developed by it's collaborators. Feel free to use it, add some issues if you find bugs or think of a really cool feature, even clone it and generate a pull requests to incorporate those cool features made by yourself. Features -------- diff --git a/docs/settings.rst b/docs/settings.rst index 9fb3ac6..3c40229 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -25,7 +25,7 @@ Available settings: The dictionary must be declared inside the project's settings file, and comes with the following keys to configure: -* ``qa_messages``: Boolean type value. This flag enables the ``django.contrib.messages`` functionality. The default behaviour is set to ``False`` if not implemented accross the whole project and if not declared inside the settings dictionary. +* ``qa_messages``: Boolean type value. This flag enables the ``django.contrib.messages`` functionality. The default behaviour is set to ``False`` if not implemented across the whole project and if not declared inside the settings dictionary. * ``qa_description_optional``: Boolean type value. This flag disables the validation applied to the 'description' field, allowing title only questions. The default behaviour is set to ``False``, enforcing the need for a description. If set to ``True``, you will be able to create questions without descriptions. * ``count_hits``: Boolean type value. This flag disables the Hit Counting behaviour on the ``QuestionDetailView``. The default behaviour is set to ``True``. * ``reputation``: is a dictionary structure to define the different values for the concepts with access to the user reputation. @@ -33,7 +33,7 @@ The dictionary must be declared inside the project's settings file, and comes wi * ``'CREATE_ANSWER'``: ``Int`` type positive value. Points given to the user for answering a registered question. * ``'CREATE_ANSWER_COMMENT'``: ``Int`` type positive value. Points given to the user for commenting on an answer. * ``'CREATE_QUESTION_COMMENT'``: ``Int`` type positive value. Points given to the user for commenting on a question. -* ``'ACCEPT_ANSWER'``: ``Int`` type positive value. Points given to the user when his answer is accepted as the prefered answer. +* ``'ACCEPT_ANSWER'``: ``Int`` type positive value. Points given to the user when his answer is accepted as the preferred answer. * ``'UPVOTE_QUESTION'``: ``Int`` type positive value. Points given to the voter and to the user qho created the question for upvoting on that question. * ``'UPVOTE_ANSWER'``: ``Int`` type positive value. Points given to the voter and to the user who created the answer for upvoting on that answer. * ``'DOWNVOTE_QUESTION'``: ``Int`` type positive value. Points taken from the voter and from the user qho created the question for downvoting on that question (to be implemented soon).