[PATCH] Documentation: Rename Samba's DCO to Samba Contributor Representation

[Jeremy Allison]

On Thu, Oct 15, 2020 at 10:49:26AM -0700, Bradley M. Kuhn via samba-technical wrote:
> Samba Developers,
> 
> As you know, it's rare that Conservancy offers specific patches upstream to
> our projects, but I've submitted a merge request here:
>         https://gitlab.com/samba-team/samba/-/merge_requests/1609
> and I've also attached the patch here.
> 
> As many of you may know, Jeremy Allison originally requested that the
> Samba's Contributor Representation be named DCO as a tribute to Linux and
> its DCO.
> 
> But, for a variety of reasons, I (with this patch) recommend to change the
> name.  Also included is some cleanup work regarding the copyright and
> license on the DCO text itself.

Sorry Bradley,

I guess I screwed up in calling our Samba contributor
agreement a "DCO" as that's what Linux uses, but ours
is different from theirs.

In my defense I just thought that's what such things
were supposed to be called.

Plus I didn't notice the original text was copyrighted
and under a CC-By-SA license, so we should certainly
fix that.

Sorry :-(.

RB+ from me.

Jeremy.

> From 2f011583294626e9919db7d8ddc7961a2f177f4a Mon Sep 17 00:00:00 2001
> From: "Bradley M. Kuhn" <bkuhn at sfconservancy.org>
> Date: Thu, 15 Oct 2020 07:52:21 -0700
> Subject: [PATCH] Rename Samba's DCO to Samba Contributor Representation
> 
> In an effort to reduce perceived confusion about the quite necessary
> differences between the Samba DCO and the Linux DCO, and as a favor
> to the Linux community, rename the Samba DCO to the Samba Contributor
> Representation.
> 
> Additionally, note that the text is copyrighted and add notice for
> compliance with the text's license, CC-By-SA.
> 
> Signed-off-by: Bradley M. Kuhn <bkuhn at sfconservancy.org>
> ---
>  README.contributing | 13 +++++++++++--
>  1 file changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/README.contributing b/README.contributing
> index 2a44e37f9e8..c4a0c7f4bc9 100644
> --- a/README.contributing
> +++ b/README.contributing
> @@ -48,7 +48,7 @@ your employer, simply email a copy of the following text
>  from your corporate email address to contributing at samba.org
>  
>  ------------------------------------------------------------
> -Samba Developer's Certificate of Origin. Version 1.0
> +Samba Contributor Representation, Version 1.0
>  
>  By making a contribution to this project, I certify that:
>  
> @@ -95,7 +95,7 @@ above, add a line that states:
>  Signed-off-by: Random J Developer <random at developer.example.org>
>  
>  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
> +you used to send the Samba Contributor Representation to us
>  (sorry, no pseudonyms or anonymous contributions.)
>  
>  That's it ! Such code can then quite happily contain changes that have
> @@ -113,3 +113,12 @@ Have fun and happy Samba hacking !
>  
>  The Samba Team.
>  
> +
> +The "Samba Contributor Representation, Version 1.0" is:
> +  (C) 2013 Software Freedom Conservancy, Inc.
> +  (C) 2005 Open Source Development Labs, Inc.
> +
> +licensed under Creative Commons Attribution-ShareAlike 4.0 License as found
> +at https://creativecommons.org/licenses/by-sa/4.0/legalcode and based on
> +"Developer's Certificate of Origin 1.1" as found at
> +http://web.archive.org/web/20070306195036/http://osdlab.org/newsroom/press_releases/2004/2004_05_24_dco.html
> -- 
> 2.26.1
> 

> 
> -- 
> Bradley M. Kuhn - he/him
> Policy Fellow & Hacker-in-Residence at Software Freedom Conservancy
> ========================================================================
> Become a Conservancy Supporter today: https://sfconservancy.org/supporter