smbd-server: Use MSG_SMB_IP_DROPPED

[samba.git] / README.contributing

diff --git a/README.contributing b/README.contributing
index 2d72f0c3c4c377cf28b44ebd926233da93b4e53b..80eb6b42302d4673f67830cd037cfb2d0911a381 100644 (file)
--- a/README.contributing
+++ b/README.contributing
@@ -1,16 +1,11 @@
 How to contribute a patch to Samba
 ----------------------------------
 
-Simple, just make the code change, and email it as either a "diff -u"
-change, or as a "git format-patch" change against the original source
-code to samba-technical@samba.org, or attach it to a bug report at
-http://bugzilla.samba.org
+Please see https://wiki.samba.org/index.php/Contribute
+for detailed set-by-step instructions on how to submit a patch
+for Samba via GitLab.
 
-For larger code changes, breaking the changes up into a set of simple
-patches, each of which does a single thing, are much easier to review.
-Patch sets like that will most likely have an easier time being merged
-into the Samba code than large single patches that make lots of
-changes in one large diff.
+Samba's GitLab mirror is at https://gitlab.com/samba-team/samba
 
 Ownership of the contributed code
 ---------------------------------
@@ -53,7 +48,7 @@ your employer, simply email a copy of the following text
 from your corporate email address to contributing@samba.org
 
 ------------------------------------------------------------
-Samba Developer's Certificate of Origin. Version 1.0
+Samba Developer's Declaration, Version 1.0
 
 By making a contribution to this project, I certify that:
 
@@ -100,7 +95,7 @@ above, add a line that states:
 Signed-off-by: Random J Developer <random@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 Developer's Declaration to us
 (sorry, no pseudonyms or anonymous contributions.)
 
 That's it ! Such code can then quite happily contain changes that have
@@ -110,7 +105,7 @@ 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
+Samba Developer's Declaration for each patch, or inside each
 patch. Just the sign-off message is all that is required once we've
 received the initial email.
 
@@ -118,3 +113,12 @@ Have fun and happy Samba hacking !
 
 The Samba Team.
 
+
+The "Samba Developer's Declaration, Version 1.0" is:
+  (C) 2011 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