From e62bbfc623fa7516285e0104a3849f581b7383bc Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Mon, 23 May 2005 17:38:18 +0000
Subject: [PATCH] Updated the information about the Moodle trademark

---
 lang/en/docs/licence.html | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/lang/en/docs/licence.html b/lang/en/docs/licence.html
index db9becc65ae..d7f6a221023 100644
--- a/lang/en/docs/licence.html
+++ b/lang/en/docs/licence.html
@@ -13,11 +13,16 @@
     
 <h1>Copyright License for Moodle</h1>
 <blockquote>
-  <p>The name <strong>Moodle&#8482;</strong> is a registered trademark of The Moodle Trust.<br />
-  You have permission to use this name for any activity related to the <br />
-  Moodle software described below.</p>
-  <p>Moodle software is Copyright &copy; 1999-2004, <a href="http://dougiamas.com/">Martin 
-  Dougiamas</a>.</p>
+  <p>The <u>name</u> <strong>Moodle&#8482;</strong> is a registered trademark of The Moodle Trust.<br />
+  If you are intending to use the name to promote commercial Moodle services,<br />
+  then you must seek permission from the Trust via the <a href="http://moodle.com/helpdesk/">moodle.com helpdesk</a>,<br />
+  in accordance with normal trademark restrictions.  There are no restrictions<br />
+  on how you use the name in other contexts.<br />
+  </p>
+
+  <p>The <u>software</u> Moodle is Copyright &copy; 1999 onwards, 
+  <a href="http://dougiamas.com/">Martin Dougiamas</a>.</p>
+
   <p>This program is free software; you can redistribute it and/or modify<br />
   it under the terms of the GNU General Public License as published by<br />
   the Free Software Foundation; either version 2 of the License, or<br />