Просмотр исходного кода

Added license comment template.

[SVN r22586]
Dave Abrahams 22 лет назад
Родитель
Сommit
b0c69e471b
1 измененных файлов с 30 добавлено и 6 удалено
  1. 30 6
      more/license_info.html

+ 30 - 6
more/license_info.html

@@ -33,11 +33,14 @@
 
 <h2><a name="Introduction">Introduction</a></h2>
 
-<p>The <a href="../LICENSE_1_0.txt">Boost Software License</a> specifies the terms and 
-conditions of use for the Boost libraries covered by the license.</p>
+<p>The <a href="../LICENSE_1_0.txt">Boost Software License</a>
+specifies the terms and conditions of use for those Boost libraries
+that it covers.</p>
 
-<p>Some Boost libraries have their own licenses. The hope is that eventually all 
-Boost libraries will be covered by the Boost Software License.</p>
+<p>Currently, some Boost libraries have their own licenses. The hope is that
+eventually all Boost libraries will be covered by the Boost Software
+License.  In the meantime, <b>all</b> libraries comply with the <a
+href="#requirements">Boost License requirements</a>.</p>
 
 <h2><a name="History">History</a></h2>
 
@@ -51,6 +54,8 @@ if the license wording met legal needs.</p>
 the <a href="http://cyber.law.harvard.edu">Berkman Center for Internet &amp; Society</a> 
 at Harvard Law School, Cambridge, Massachusetts, USA. It was requested that a 
 single Boost license be developed that met the traditional requirements that Boost licenses, particularly:</p>
+
+<a name="requirements"></a>
 <ul>
   <li>Must be simple to read and understand. </li>
   <li>Must grant permission without fee to copy, use and modify the software for 
@@ -131,10 +136,29 @@ license.</p>
 
 <h2><a name="FAQ">FAQ</a></h2>
 
+<p><b>How should Boost programmers apply the license to source and
+header files?</b></p>
+
+<p>Include a comment based on the following template, substituting
+appropriate text for the italicized portion:
+
+<pre>
+// Copyright <i>2004 Joe Coder</i>. Distributed under the Boost
+// Software License, Version 1.0. (See accompanying file
+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+</pre>
+
+<p>Other ways of licensing source files have been considered, but some
+of them turned out to unintentionally nullify legal elements of the
+license.  Having fixed language for referring to the license helps
+corporate legal departments evaluate the boost distribution.
+Creativity in license reference language is strongly discouraged.
+
 <p><b>How is the Boost license different from the
 <a href="http://www.opensource.org/licenses/gpl-license.php">GNU General Public 
 License (GPL)</a>?</b></p>
 
+
 <p>The Boost license permits the creation of derivative works for
 commercial or non-commercial use with no legal requirement to release
 your source code. Other differences include Boost not requiring
@@ -209,9 +233,9 @@ contributed analysis of Boost issues and drafts of various legal documents.
 Boost members reviewed drafts of the license. Beman Dawes wrote this web page.</p>
 <hr>
 <p>Revised
-<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->03 December, 2003<!--webbot bot="Timestamp" endspan i-checksum="39365" --></p>
+<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%d %B, %Y" startspan -->03 April, 2004<!--webbot bot="Timestamp" endspan i-checksum="39365" --></p>
 
-<p> © Copyright Beman Dawes, Daniel Frey 2003.</p>
+<p> © Copyright 2003-2004 Beman Dawes, Daniel Frey, David Abrahams.</p>
 <p> Use, modification, and distribution are subject to the Boost Software 
 License, Version 1.0. (See accompanying file <a href="../LICENSE_1_0.txt">
 LICENSE_1_0.txt</a> or copy at <a href="http://www.boost.org/LICENSE_1_0.txt">

粤ICP备19079148号