Add license links, copyright messages, plus changes to reflect new license

[SVN r19682]

2 files changed, 44 insertions, 16 deletions

diff --git a/more/index.htm b/more/index.htm
index d1005efffd..e5d0be8b20 100644
--- a/more/index.htm
+++ b/more/index.htm
@@ -65,6 +65,8 @@ content="text/html; charset=iso-8859-1">
 <h2>Boost Whatever</h2>
 
 <blockquote>
+    <p><b><a href="license_info.html">License Information</a> </b>&nbsp;Information 
+    about the Boost Software License.</p>
     <p><b><a href="bibliograpy.html">Bibliography</a> </b>&nbsp;Print and online 
     publications relating to Boost and Boost libraries.</p>
     <p><a href="../status/compiler_status.html"><b>Compiler
@@ -125,7 +127,12 @@ content="text/html; charset=iso-8859-1">
 
 <hr>
 
-<p>Revised <!--webbot bot="Timestamp" s-type="EDITED"
-s-format="%d %B, %Y" startspan -->25 July, 2003<!--webbot bot="Timestamp" i-checksum="21104" endspan --></p>
+<p> © Copyright Beman Dawes 2003.</p>
+<p> See accompanying <a href="../LICENSE">license</a> for terms and conditions 
+of use.</p>
+
+<p>Revised 
+<!--webbot bot="Timestamp" s-type="EDITED"
+s-format="%d %B, %Y" startspan -->18 August, 2003<!--webbot bot="Timestamp" endspan i-checksum="34485" --></p>
 </body>
 </html>
\ No newline at end of file
diff --git a/more/lib_guide.htm b/more/lib_guide.htm
index 416ffca641..7e2a67bfdd 100644
--- a/more/lib_guide.htm
+++ b/more/lib_guide.htm
@@ -79,23 +79,28 @@ making a submission. It has been noted, however, that submissions which begin
 embarrassingly.</p>
 <h3 align="left"><a name="License">License</a> requirements</h3>
 <ul>
-  <li>Must be simple to read and understand.
+  <li>Must be simple to read and understand. 
   </li>
-  <li>Must grant permission without fee to copy, use and modify the software for any use
-    (commercial and non-commercial). 
+  <li>Must grant permission without fee to copy, use and modify the software for 
+  any use (commercial and non-commercial).  
   </li>
-  <li>Must require that the license appear on all copies of the software source
-    code.
+  <li>Must require that the license appear on all copies of the software source 
+  code. 
   </li>
-  <li>Must not require that the license appear with executables or other binary
-    uses of the library.
+  <li>Must not require that the license appear with executables or other binary 
+  uses of the library. 
   </li>
-  <li>Must not require that the source code be
-    available for execution or other binary uses of the library.
+  <li>Must not require that the source code be available for execution or other 
+  binary uses of the library. 
   </li>
-  <li>May restrict the use of the name and description of the library to the
-    standard version found on the Boost web site.</li>
+  <li>May restrict the use of the name and description of the library to the 
+  standard version found on the Boost web site.</li>
 </ul>
+<p>The preferred way to meet these license requirements is to use the
+<a href="../LICENSE">Boost Software License</a>. See <a href="license_info.html">
+license information</a>. If for any reason you do not intend to use the Boost 
+Software License, please discuss the issues on the Boost
+<a href="mailing_lists.htm#main">developers mailing list</a> first.</p>
 <h3 align="left"><a name="Portability">Portability</a> requirements</h3>
 <ul>
   <li>
@@ -215,10 +220,22 @@ library, but a reasonable effort to comply is expected.</p>
   </li>
 </ul>
 <ul>
-  <li>Begin all source files with:
+  <li>End all documentation files (HTML or otherwise) with a copyright message 
+  and a licensing message. See the <a href="#Copyright">end of this file</a> for 
+  an example of the preferred form.</li>
+</ul>
+<ul>
+  <li>Begin all source files (including programs, headers, scripts, etc.) with:
     <ul>
       <li>A comment line describing the contents of the file.</li>
-      <li>Comments describing copyright and licensing.</li>
+      <li>Comments describing copyright and licensing. The preferred form is:<br>
+      <br>
+        <code>// Copyright Jane Programmer, 2003.<br>
+      // See accompanying license for terms and conditions of use.</code><br>
+        <br>
+      See the <a href="license_info.html">license information page</a> for 
+      details.  
+</li>
       <li>A comment line referencing your library on the Boost web site:<br>
       <br>
         <code>// See http://www.boost.org/libs/foo for documentation.</code><br>
@@ -449,7 +466,11 @@ suggestion.&nbsp; Major contributions are usually acknowledged in the
 documentation, while minor fixes are often mentioned in comments within the code
 itself.</p>
 <hr>
-<p>Revised <!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %B, %Y" startspan -->26 February, 2003<!--webbot bot="Timestamp" endspan i-checksum="40410" --></p>
+<p> © <a name="Copyright">Copyright</a> Beman Dawes 2003.</p>
+<p> See accompanying <a href="../LICENSE">license</a> for terms and conditions 
+of use.</p>
+<p>Revised 
+<!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %B, %Y" startspan -->18 August, 2003<!--webbot bot="Timestamp" endspan i-checksum="34485" --></p>
 
 </body>