www/philosophy free-system-distribution-guideli...

[Brett Smith]

CVSROOT:        /web/www
Module name:    www
Changes by:     Brett Smith <brett>     08/08/05 13:15:53

Modified files:
        philosophy     : free-system-distribution-guidelines.html 

Log message:
        Add a Trademarks section.  Thanks aoliva.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/philosophy/free-system-distribution-guidelines.html?cvsroot=www&r1=1.8&r2=1.9

Patches:
Index: free-system-distribution-guidelines.html
===================================================================
RCS file: /web/www/www/philosophy/free-system-distribution-guidelines.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- free-system-distribution-guidelines.html    4 Aug 2008 18:38:48 -0000       
1.8
+++ free-system-distribution-guidelines.html    5 Aug 2008 13:15:16 -0000       
1.9
@@ -57,7 +57,7 @@
 included in free system distributions.  We don't de-list distributions
 because of this; instead, we only ask that a distribution put forth a
 good faith effort to avoid including nonfree software, and commit
-itself to removing such programs if they are found later.</p>
+itself to removing such programs if they are discovered later.</p>
 <p>Certain kinds of license situations merit special attention for people
 creating or considering free software distributions; those are
 discussed in the sections below.</p>
@@ -97,6 +97,21 @@
 part of a free system distribution.</p>
 </div>
 <div class="section">
+<h3><a id="trademarks" name="trademarks">Trademarks</a></h3>
+<p>Trademarks are associated with some software.  For example, the
+  name of a program may be trademarked, or its interface may display a
+  trademarked logo.  Often, the use of these marks will be controlled
+  in some way; in particular, developers are commonly asked to remove
+  references to the trademark from the software when they modify
+  it.</p>
+<p>In extreme cases, these restrictions may effectively render the
+  program nonfree.  It is unfair for someone to ask you to remove a
+  trademark from modified code if that trademark is scattered all
+  throughout the original source.  As long as the conditions are
+  reasonable, however, free system distributions may include these
+  programs, either with or without the trademarks.</p>
+</div>
+<div class="section">
 <h3><a id="documentation" name="documentation">Documentation</a></h3>
 <p>All the documentation in a free system distribution must be released
 under an appropriate free license.  Additionally, it must take care
@@ -172,7 +187,7 @@
 <p>
 Updated:
 <!-- timestamp start -->
-$Date: 2008/08/04 18:38:48 $
+$Date: 2008/08/05 13:15:16 $
 <!-- timestamp end -->
 </p>
 </div>