From: daniel_james_at_[hidden]
Date: 2007-11-10 11:37:04
Author: danieljames
Date: 2007-11-10 11:37:03 EST (Sat, 10 Nov 2007)
New Revision: 40995
URL: http://svn.boost.org/trac/boost/changeset/40995
Log:
Update the license info from trunk, and delete from the trunk. Fixes #1359.
Text files modified:
website/public_html/beta/users/license.html | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
Modified: website/public_html/beta/users/license.html
==============================================================================
--- website/public_html/beta/users/license.html (original)
+++ website/public_html/beta/users/license.html 2007-11-10 11:37:03 EST (Sat, 10 Nov 2007)
@@ -183,16 +183,22 @@
<p class="faq"><span class="faq-question">How should Boost
programmers apply the license to source and header
- files?</span> <span class="faq-answer">Include a comment based
- on the following template, substituting appropriate text for
- the italicized portion:</span></p>
+ files?</span> <span class="faq-answer">Add a comment based on
+ the following template, substituting appropriate text for the
+ italicized portion:</span></p>
<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)
+// Copyright <i>Joe Coder 2004 - 2006</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>Please leave an empty line before and after the above
+ comment block. It is fine if the copyright and license messages
+ are not on different lines; in no case there should be other
+ intervening text. Do not include "All rights reserved"
+ anywhere.</p>
+
<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
@@ -201,6 +207,21 @@
strongly discouraged, but judicious changes in the use of
whitespace are fine.</p>
+ <p class="faq"><span class="faq-question">How should the
+ license be applied to documentation files, instead?</span>
+ <span class="faq-answer">Very similarly to the way it is
+ applied to source files: the user should see the very same text
+ indicated in the template above, with the only difference that
+ both the local and the web copy of LICENSE_1_0.txt should be
+ linked to. Refer to the HTML source code of this page in case
+ of doubt.</span></p>
+
+ <p><span class="faq-answer">Note that the location of the local
+ LICENSE_1_0.txt needs to be indicated relatively to the
+ position of your documentation file
+ (<code>../LICENSE_1_0.txt</code>,
+ <code>../../LICENSE_1_0.txt</code> etc.)</span></p>
+
<p class="faq"><span class="faq-question">How is the Boost
license different from the <a href=
"http://www.opensource.org/licenses/gpl-license.php" class=