diff options
Diffstat (limited to 'templates/about.html')
| -rw-r--r-- | templates/about.html | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/templates/about.html b/templates/about.html index 6d5f3060..db8c764e 100644 --- a/templates/about.html +++ b/templates/about.html @@ -12,6 +12,7 @@ </div> <div class="content"> +<<<<<<< HEAD:templates/about.html <!-- default text <p>edit file templates/about.html. Below are just suggestions of what can go here</p> <p>what is your site for?</p> @@ -40,6 +41,31 @@ {% blocktrans %} If you would like to find out more about this site - please see <strong><a href="{% url faq %}">frequently asked questions</a></strong>. {% endblocktrans %} +======= + <p><strong>NMR Wiki <span class="orange">Q&A</span></strong> is a collaboratively edited question + and answer site created for the <strong>Magnetic Resonance</strong> community, i.e. those people who + work in the fields of <strong>NMR</strong>, <strong>EPR</strong>, <strong>MRI</strong></strong>, etc. + NMR Wiki Q&A is affiliated with <strong><a href="http://nmrwiki.org">NMR Wiki</a></strong> - + the public wiki knowledge base about the Magnetic Resonance, which currently counts ~300 registered users. The most useful information collected here + will be further distilled on the wiki site. + </p> + <p>Here you can <strong>ask</strong> and <strong>answer</strong> questions, <strong>comment</strong> + and <strong>vote</strong> for the questions of others and their answers. Both questions and answers + <strong>can be revised</strong> and improved. Questions can be <strong>tagged</strong> with + the relevant keywords to simplify future access and organize the accumulated material. + </p> + + <p>This <span class="orange">Q&A</span> site is moderated by its members, hopefully - including yourself! + Moderation rights are gradually assigned to the site users based on the accumulated <strong>"reputation"</strong> + 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. + </p> + <p>No points are necessary to ask or answer the questions - so please - + <strong><a href="{% url user_signin %}">join us!</a></strong> + </p> + <p> + If you would like to find out more about this site - please see <strong><a href="{% url faq %}">frequently asked questions</a></strong>. +>>>>>>> 82d35490db90878f013523c4d1a5ec3af2df8b23:templates/about.html </p> </div> {% endblock %} |