diff options
Diffstat (limited to 'templates/about.html')
-rw-r--r-- | templates/about.html | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/templates/about.html b/templates/about.html index db8c764e..2ca75500 100644 --- a/templates/about.html +++ b/templates/about.html @@ -12,36 +12,6 @@ </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> - <p>how does it work? what are roles of members?</p> - <p>is there a place to find out more about this website?</p> - --> - <p>{% blocktrans %}<strong>CNPROG <span class="orange">Q&A</span></strong> is a collaboratively edited question - and answer site created for the <strong>CNPROG</strong> community. - {% endblocktrans %} - </p> - <p>{% blocktrans %}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.{% endblocktrans %} - </p> - - <p>{% blocktrans %}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.{% endblocktrans %} - </p> - <p>{% blocktrans %}No points are necessary to ask or answer the questions - so please - - <strong><a href="{% url user_signin %}">join us!</a></strong>{% endblocktrans %} - </p> - <p> - {% 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. @@ -65,7 +35,6 @@ </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 %} |