Merged from stable

diff --git a/lang/en/help/glossary/allowcomments.html b/lang/en/help/glossary/allowcomments.html
index bcf99a23169ed8d5412c63a7da09bc8387baccb1..51c2eff05c3fff48068fb373bdaaf0b0cfdd3778 100644 (file)
--- a/lang/en/help/glossary/allowcomments.html
+++ b/lang/en/help/glossary/allowcomments.html
@@ -1,6 +1,6 @@
 <p align="center"><b>Allow comments on entries</b></p>
 
-<p>It is possible to students to add comments to glossary entries.</p>
+<p>Students can be allowed to add comments to glossary entries.</p>
 
 <p>You can choose whether this feature is enabled or disabled.</p>
 

diff --git a/lang/en/help/glossary/usedynalink.html b/lang/en/help/glossary/usedynalink.html
index 251164fbbff11492ac60143f299a525a5b808ecc..0a20b921c12e0faaffb4384b851b26e19c5c1c4c 100644 (file)
--- a/lang/en/help/glossary/usedynalink.html
+++ b/lang/en/help/glossary/usedynalink.html
@@ -1,9 +1,12 @@
 <P ALIGN=CENTER><B>Enabling automatic linking in a glossary</B></P>
 
-<P>Turning this feature on will allow individual entries in this glossary to be automatically linked if desired, whenever 
+<P>Turning this feature on will allow individual entries in this glossary to be automatically linked whenever 
    the concept words and phrases appear throughout the rest of the same course.  This includes forum
    postings, internal resources, week summaries, journals and so on.  </p>
 
+<p>Note that enabling linking for the glossary does not automatically turn on linking for each entry - 
+   linking needs to be set for each entry individually.</p>
+
 <p>If you do not want particular text to be linked (in a forum posting, say) then you should add &lt;nolink&gt; and &lt;/nolink&gt; tags around the text.</p>
 
 <p>Note that category names are also linked.</p>