From e4e886e9490b72a94cfca698492e7bcfa84bdc56 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Wed, 18 Sep 2013 21:24:24 -0300 Subject: [PATCH] edited the readme file --- README.rst | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 43befd37..07cfe6b0 100644 --- a/README.rst +++ b/README.rst @@ -2,14 +2,39 @@ Askbot - Q&A forum =================== -This is Askbot project - open source Q&A system, like StackOverflow, Yahoo Answers and some others +This is Askbot project - open source Q&A system, like StackOverflow, Yahoo Answers and some others. +Askbot is based on code of CNPROG, originally created by Mike Chen +and Sailing Cai and some code written for OSQA. Demos and hosting are available at http://askbot.com. -**Translators:** please translate at https://www.transifex.com/projects/p/askbot/. +How to contribute +================= + +**Translators: DO NOT use git to contribute translations!!!** instead - translate at https://www.transifex.com/projects/p/askbot/. All documentation is in the directory askbot/doc -Askbot is based on code of CNPROG, originally created by Mike Chen -and Sailing Cai and some code written for OSQA. Askbot had officially launched -in April 2010. +To contribute code, please fork and make pull requests. + +If you are planning to add a new feature, please bring it up for discussion at our forum +(http://askbot.org/en/questions/) and mention that are willing to develop this feature. + +We will merge obvious bug fixes without questions, for more complex fixes +please add a test case that fails before and passes after applying your fix. + +**Notes on using git for Askbot.** Please use topic branches only - one per feature or bugfix. +Do not add multiple features and fixes into the same branch - +those are much harder to understand and merge. + +Follow https://help.github.com/articles/fork-a-repo to to learn how to use +`fetch` and `push` as well as other help on using git. + +License, copyright and trademarks +================================= +Askbot software is licensed under GPL, version 3. + +Copyright Askbot S.p.A and the project contributors, 2010-2013. + +"Askbot" is a trademark and service mark registered in the United States, number 4323777. +