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

license reference wording fix

[SVN r20285]
Beman Dawes 22 лет назад
Родитель
Сommit
fe85bb2dd6
1 измененных файлов с 10 добавлено и 9 удалено
  1. 10 9
      more/lib_guide.htm

+ 10 - 9
more/lib_guide.htm

@@ -78,6 +78,12 @@ making a submission. It has been noted, however, that submissions which begin
 "I just started to read this mailing list ..." seem to fail, often
 "I just started to read this mailing list ..." seem to fail, often
 embarrassingly.</p>
 embarrassingly.</p>
 <h3 align="left"><a name="License">License</a> requirements</h3>
 <h3 align="left"><a name="License">License</a> requirements</h3>
+<p>The preferred way to meet the license requirements is to use the
+<a href="../LICENSE_1_0.txt">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>
+<p>The license requirements:</p>
 <ul>
 <ul>
   <li>Must be simple to read and understand. 
   <li>Must be simple to read and understand. 
   </li>
   </li>
@@ -96,11 +102,6 @@ embarrassingly.</p>
   <li>May restrict the use of the name and description of the library to the 
   <li>May restrict the use of the name and description of the library to the 
   standard version found on the Boost web site.</li>
   standard version found on the Boost web site.</li>
 </ul>
 </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>
 <h3 align="left"><a name="Portability">Portability</a> requirements</h3>
 <ul>
 <ul>
   <li>
   <li>
@@ -232,8 +233,8 @@ library, but a reasonable effort to comply is expected.</p>
 &nbsp;</li>
 &nbsp;</li>
       <li>Comments describing copyright and licensing. The preferred form is:<br>
       <li>Comments describing copyright and licensing. The preferred form is:<br>
       <br>
       <br>
-        <code>//&nbsp; Copyright Jane Programmer 2002. Use, modification and 
-      distribution is<br>
+        <code>//&nbsp; Copyright Jane Programmer 2002. Use, modification, and 
+      distribution are<br>
       //&nbsp; subject to the Boost Software License, Version 1.0. (See 
       //&nbsp; subject to the Boost Software License, Version 1.0. (See 
       accompanying<br>
       accompanying<br>
       //&nbsp; file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)<br>
       //&nbsp; file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)<br>
@@ -477,10 +478,10 @@ documentation, while minor fixes are often mentioned in comments within the code
 itself.</p>
 itself.</p>
 <hr>
 <hr>
 <p>Revised 
 <p>Revised 
-<!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %B, %Y" startspan -->02 October, 2003<!--webbot bot="Timestamp" endspan i-checksum="38549" --></p>
+<!--webbot bot="Timestamp" s-type="EDITED" s-format="%d %B, %Y" startspan -->07 October, 2003<!--webbot bot="Timestamp" endspan i-checksum="38559" --></p>
 
 
 <p> © <a name="Copyright">Copyright</a> Beman Dawes 2003.</p>
 <p> © <a name="Copyright">Copyright</a> Beman Dawes 2003.</p>
-<p> Use, modification, and distribution is subject to the Boost Software 
+<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, 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">
 LICENSE_1_0.txt</a> or copy at <a href="http://www.boost.org/LICENSE_1_0.txt">
 www.boost.org/LICENSE_1_0.txt</a>)</p>
 www.boost.org/LICENSE_1_0.txt</a>)</p>

粤ICP备19079148号