[SCM] Samba Website Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  8af03ee Update and clarify the Samba copyright policy and Developer Certificate Origin
      from  c989bdc Revert "docs: The russian translation site times out"

http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8af03ee622aa0e1d27fc5a927967c8c660b04c3b
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Jun 19 15:07:16 2013 +1000

    Update and clarify the Samba copyright policy and Developer Certificate Origin
    
    This clarifies how this process interacts with Signed-off-by for
    individual developers.
    
    Andrew Bartlett

-----------------------------------------------------------------------

Summary of changes:
 devel/copyright-policy.html |   66 ++++++++++++++++++++++++++++++------------
 1 files changed, 47 insertions(+), 19 deletions(-)


Changeset truncated at 500 lines:

diff --git a/devel/copyright-policy.html b/devel/copyright-policy.html
index d24eddc..a160119 100644
--- a/devel/copyright-policy.html
+++ b/devel/copyright-policy.html
@@ -38,27 +38,36 @@ copyright ownership. It just requires a simple set-up process first.
 <p>
 We use a process very similar to the way things are done in the Linux
 kernel community, so it should be very easy to get a sign off from
-your corporate legal department. The only changes we've made are to
-accommodate the licenses we use, which are
-<a href="http://www.gnu.org/licenses/gpl-3.0.html">GPLv3</a> and
-<a href="http://www.gnu.org/licenses/lgpl-3.0.html">LGPLv3</a> (or later)
-whereas the Linux kernel uses
-<a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GPLv2</a>.
+your corporate legal department. The only changes we've made are: (a)
+Samba uses
+the <a href="http://www.gnu.org/licenses/gpl-3.0.html">GPLv3-or-later</a>
+and <a href="http://www.gnu.org/licenses/lgpl-3.0.html">LGPLv3-or-later</a>
+licenses, whereas the Linux kernel
+uses <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GPLv2-only</a>,
+and we (b) don't mandate signing Samba's DCO if copyright is held by
+individuals. (Individuals who wish to sign the DCO are welcome to do
+so if they like.)
 </p>
-
+ 
 <p>
 The process is called signing.
 </p>
 
-<h2>How to sign your work</h2>
+<h2>How to sign your work on behalf of your employer</h2>
 
 <p>
-Once you have permission to contribute to Samba from
-your employer, simply email a copy of the following text
-from your corporate email address to <a href=
-"mailto:contributing at samba.org">contributing at samba.org</a>
+Once you have permission to contribute to Samba from your employer,
+complete our signing process by completing two steps:
+</p>
+
+<ol>
+<li>
+<p>Email a copy of the following text from your corporate email
+address to <a href=
+"mailto:contributing at samba.org">contributing at samba.org</a>:
 </p>
 
+
 <pre>
 <code>
 Samba Developer's Certificate of Origin. Version 1.0
@@ -101,10 +110,11 @@ We will maintain a copy of that email as a record that you have the
 rights to contribute code to Samba under the required licenses whilst
 working for the company where the email came from.
 </p>
+</li>
 
+<li>
 <p>
-Then when sending in a patch via the normal mechanisms described
-above, add a line that states:
+Whenever sending in a patch, add a line that states:
 </p>
 
 <pre>
@@ -115,10 +125,12 @@ above, add a line that states:
 </pre>
 
 <p>
-using your real name and the email address you sent the original email
-you used to send the Samba Developer's Certificate of Origin to us
-(sorry, no pseudonyms or anonymous contributions.)
+using your real name and the company email address you used to send
+the Samba Developer's Certificate of Origin to us (sorry, no
+pseudonyms or anonymous contributions.)
 </p>
+</li>
+</ol>
 
 <p>
 That's it ! Such code can then quite happily contain changes that have
@@ -136,8 +148,24 @@ copyright messages such as :
 and can be merged into the Samba codebase in the same way as patches
 from any other individual. You don't need to send in a copy of the
 Samba Developer's Certificate of Origin for each patch, or inside each
-patch. Just the sign-off message is all that is required once we've
-received the initial email.
+patch. Just the sign-off is all that is required once we've received
+the initial email.
+</p>
+
+<p>
+Please note that merely including a sign-off in the commit does not
+imply assent to the Samba Developer's Certificate of Origin, whether
+you're submitting a patch containing your personal copyrights or those
+of your employer.  As such, we won't be able to accept patches
+submitted by companies that don't follow *both* steps of this signing
+process.  Individual copyright holders who don't assent to the DCO
+should use other means (such as copyright/license headers in the
+source files) to indicate their chosen license for contributed code.
+</p>
+
+<p>
+If you have any questions about signing, please email us at <a href=
+"mailto:contributing at samba.org">contributing at samba.org</a>.
 </p>
 
 <p>


-- 
Samba Website Repository