Merge branch 'develop' of https://github.com/craws/OpenAtlas into fea…

…ture/multi_instance

openatlas/static/manual/examples/report_issue.html

@@ -128,7 +128,7 @@ <h2>Where to report - Redmine<a class="headerlink" href="#where-to-report-redmin
 <section id="id1">
 <h2>How to report an issue<a class="headerlink" href="#id1" title="Permalink to this heading"></a></h2>
 <section id="get-a-redmine-account">
-<h3>Get a redmine account<a class="headerlink" href="#get-a-redmine-account" title="Permalink to this heading"></a></h3>
+<h3>Get a Redmine account<a class="headerlink" href="#get-a-redmine-account" title="Permalink to this heading"></a></h3>
 <p>To report an issue, an account must first be created. This is - of course -
 completely free of charge and all you need is a valid email address and a
 password.

openatlas/static/manual/tools/text_annotation.html

@@ -117,7 +117,7 @@ <h2>Usage<a class="headerlink" href="#usage" title="Permalink to this heading">
 <ul class="simple">
 <li><p>Mark the specific text part in the source with the left mouse button</p></li>
 <li><p>Click the <strong>Annotate</strong> button above the text field</p></li>
-<li><p>Select the entity which is releated to the annotation and/or add a comment</p></li>
+<li><p>Select the entity which is related to the annotation and/or add a comment</p></li>
 <li><p>Click on add</p></li>
 <li><p>Press the save button of the form to submit it</p></li>
 </ul>

sphinx/source/tools/text_annotation.rst

@@ -15,7 +15,7 @@ A text can be annotated when adding or updating a :doc:`/entity/source`
 
 * Mark the specific text part in the source with the left mouse button
 * Click the **Annotate** button above the text field
-* Select the entity which is releated to the annotation and/or add a comment
+* Select the entity which is related to the annotation and/or add a comment
 * Click on add
 * Press the save button of the form to submit it