svn commit: r45169 - head/en_US.ISO8859-1/articles/contributing

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.</para>
 
       <para>When working with large amounts of code, the touchy
-	subject of copyrights also invariably comes up.  Acceptable
-	copyrights for code included in FreeBSD are:</para>
-
-      <orderedlist>
-	<listitem>
-	  <para>The BSD copyright<indexterm><primary>BSD
-	      copyright</primary></indexterm>.  This copyright is most
-	    preferred due to its <quote>no strings attached</quote>
-	    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.</para>
-	</listitem>
-
-	<listitem>
-	  <para>
-	    <indexterm>
-	      <primary>GPL</primary>
-	      <see>GNU General Public License</see>
-	    </indexterm>
-
-	    <indexterm>
-	      <primary>GNU General Public License</primary>
-	    </indexterm>
-	    The GNU General Public License, or <quote>GPL</quote>.
-	    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
-	    <filename>/sys/gnu</filename> or
-	    <filename>/usr/src/gnu</filename>, and
-	    is therefore easily identifiable to anyone for whom the
-	    GPL presents a problem.</para>
-	</listitem>
-      </orderedlist>
-
-      <para>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.</para>
-
-      <para>To place a <quote>BSD-style</quote> 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 <literal>%%</literal> with the appropriate
-	information:</para>
-
-      <programlisting>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.
-
-        &dollar;&os;&dollar;</programlisting>
-
-      <para>For your convenience, a copy of this text can be found in
-	<filename>/usr/share/examples/etc/bsd-style-copyright</filename>.</para>
+	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 <link
+	xlink:href="&url.base;/internal/software-license.html">core team
+	licensing policy</link> page.</para>
     </sect2>
 
     <sect2>
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"