Define a bit better the 'automatic link' feature at glossary and entry levels.

Bug 1745
(http://moodle.org/bugs/bug.php?op=show&bugid=1745)

Merged from MOODLE_14_STABLE

diff --git a/lang/en/help/glossary/index.html b/lang/en/help/glossary/index.html
index afab820062d8acdc385cda5fdbfbe021d26f5863..af713dc1e3a767b3c75081707a390b394c3af61c 100644 (file)
--- a/lang/en/help/glossary/index.html
+++ b/lang/en/help/glossary/index.html
@@ -13,7 +13,7 @@ Glossary level help files:
   <li><a href="help.php?module=glossary&file=displayformat.html">Display formats for entries</a>
   <li><a href="help.php?module=glossary&file=entbypage.html">Number of entries shown by page</a>
   <li><a href="help.php?module=glossary&file=shows.html">Browsing options in Alphabet View frame</a>
-  <li><a href="help.php?module=glossary&file=linkcategories.html">Automatically linking categories</a>
+  <li><a href="help.php?module=glossary&file=usedynalink.html">Enabling automatic linking in a glossary</a>
   <li><a href="help.php?module=glossary&file=filetoimport.html">Importing entries</a>
   <li><a href="help.php?module=glossary&file=importcategories.html">Importing categories</a>
   <li><a href="help.php?module=glossary&file=destination.html">Destination of the entries to import</a>
@@ -25,9 +25,9 @@ Glossary level help files:
 <blockquote>
 Entry level help files:
 <ul>
-  <li><a href="help.php?module=glossary&file=usedynalink.html">Automaic linking of entries</a>
+  <li><a href="help.php?module=glossary&file=usedynalinkentry.html">Enabling automatic linking in a entry</a>
   <li><a href="help.php?module=glossary&file=aliases.html">Keywords: What are them?</a>
-  <li><a href="help.php?module=glossary&file=casesensitive.html">Case sensitive automatic linking</a>
+  <li><a href="help.php?module=glossary&file=casesensitive.html">Case sensitive auto-linking</a>
   <li><a href="help.php?module=glossary&file=fullmatch.html">Whole words auto-linking</a>
 </ul>
 </blockquote>

diff --git a/lang/en/help/glossary/usedynalink.html b/lang/en/help/glossary/usedynalink.html
index 0b735e226d975b72e76dd0afebc500dde3ebcdfd..251164fbbff11492ac60143f299a525a5b808ecc 100644 (file)
--- a/lang/en/help/glossary/usedynalink.html
+++ b/lang/en/help/glossary/usedynalink.html
@@ -1,10 +1,9 @@
-<P ALIGN=CENTER><B>Automatically link glossary entries</B></P>
+<P ALIGN=CENTER><B>Enabling automatic linking in a glossary</B></P>
 
-<P>Turning this feature on will allow the entries in this glossary to be automatically linked whenever 
+<P>Turning this feature on will allow individual entries in this glossary to be automatically linked if desired, 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>If you do not want particular text to be linked (in a forum posting, say) then you should add &lt;nolink> and &lt;/nolink> tags around the text.</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>
-

diff --git a/lang/en/help/glossary/usedynalinkentry.html b/lang/en/help/glossary/usedynalinkentry.html
new file mode 100644 (file)
index 0000000..baca91d
--- /dev/null
+++ b/lang/en/help/glossary/usedynalinkentry.html
@@ -0,0 +1,9 @@
+<P ALIGN=CENTER><B>Enabling automatic linking in a entry</B></P>
+
+<P>Turning this feature on will allow the entry 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>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>To be able to turn on this feature, auto linking must be enabled at glossary level.</p>

diff --git a/mod/glossary/edit.html b/mod/glossary/edit.html
index 3572563be8eee6e987027ca523c36994302ccd20..bbff83113d065089bf73917f826136970303edac 100644 (file)
--- a/mod/glossary/edit.html
+++ b/mod/glossary/edit.html
@@ -75,7 +75,7 @@ if (isset($errors)) {
         echo '<font size="-1">';
         print_string("entryusedynalink","glossary");
         echo '</font>';
-        echo helpbutton("usedynalink", strip_tags(get_string("usedynalink", "glossary")), "glossary");
+        echo helpbutton("usedynalinkentry", strip_tags(get_string("usedynalink", "glossary")), "glossary");
         echo '<br />';
 
         if (!empty($newentry->casesensitive)) {