From owner-svn-doc-all@FreeBSD.ORG Mon Jun 30 02:47:52 2014 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9F29AC36; Mon, 30 Jun 2014 02:47:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 810F320C4; Mon, 30 Jun 2014 02:47:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5U2lqmm092809; Mon, 30 Jun 2014 02:47:52 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5U2lqIb092808; Mon, 30 Jun 2014 02:47:52 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201406300247.s5U2lqIb092808@svn.freebsd.org> From: Eitan Adler Date: Mon, 30 Jun 2014 02:47:52 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r45169 - head/en_US.ISO8859-1/articles/contributing X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jun 2014 02:47:52 -0000 Author: eadler Date: Mon Jun 30 02:47:52 2014 New Revision: 45169 URL: http://svnweb.freebsd.org/changeset/doc/45169 Log: Direct contributors to the licensing policy page instead of incorrectly instructing them in this article. Discussed with: imp, core Modified: head/en_US.ISO8859-1/articles/contributing/article.xml Modified: head/en_US.ISO8859-1/articles/contributing/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/contributing/article.xml Sun Jun 29 22:10:23 2014 (r45168) +++ head/en_US.ISO8859-1/articles/contributing/article.xml Mon Jun 30 02:47:52 2014 (r45169) @@ -397,88 +397,12 @@ someone to host the changes for you. When working with large amounts of code, the touchy - subject of copyrights also invariably comes up. Acceptable - copyrights for code included in FreeBSD are: - - - - The BSD copyrightBSD - copyright. This copyright is most - preferred due to its no strings attached - nature and general attractiveness to commercial - enterprises. Far from discouraging such commercial use, - the FreeBSD Project actively encourages such participation - by commercial interests who might eventually be inclined - to invest something of their own into FreeBSD. - - - - - - GPL - GNU General Public License - - - - GNU General Public License - - The GNU General Public License, or GPL. - This license is not quite as popular with us due to the - amount of extra effort demanded of anyone using the code - for commercial purposes, but given the sheer quantity of - GPL'd code we currently require (compiler, assembler, text - formatter, etc) it would be silly to refuse additional - contributions under this license. Code under the GPL also - goes into a different part of the tree, that being - /sys/gnu or - /usr/src/gnu, and - is therefore easily identifiable to anyone for whom the - GPL presents a problem. - - - - Contributions coming under any other type of copyright - must be carefully reviewed before their inclusion into FreeBSD - will be considered. Contributions for which particularly - restrictive commercial copyrights apply are generally - rejected, though the authors are always encouraged to make - such changes available through their own channels. - - To place a BSD-style copyright on your - work, include the following text at the very beginning of - every source code file you wish to protect, replacing the text - between the %% with the appropriate - information: - - Copyright (c) %%proper_years_here%% - %%your_name_here%%, %%your_state%% %%your_zip%%. - All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer as - the first lines of this file unmodified. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY %%your_name_here%% ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL %%your_name_here%% BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - $&os;$ - - For your convenience, a copy of this text can be found in - /usr/share/examples/etc/bsd-style-copyright. + subject of copyrights also invariably comes up. &os; + prefers free software licenses such as BSD or ISC. + Copyleft licenses such as GPLv2 are sometimes permitted. The + complete listing can be found on the core team + licensing policy page.