[gnu-pl] wwwgnudiff - raport nr 445

--- prev/www/licenses/gpl-faq.html	Sun Nov 28 05:28:01 2004
+++ curr/www/licenses/gpl-faq.html	Fri Dec 17 05:27:54 2004
@@ -458,8 +458,6 @@
     <li><a href="#Consider" name="TOCConsider">Consider this situation:
 		1. X releases V1 of a project under the GPL.
-		2. Y contributes to the development of V2 with
-              changes and new code based on V1.
-		3. wants to convert V2 to a non-GPL license.
-     Does X need Y's permission?</a></li>
+		2. Y contributes to the development of V2 with changes and new code based on V1.
+		3. X wants to convert V2 to a non-GPL license.  Does X need Y's permission?</a></li>
   
     <li><a href="#ManyDifferentLicenses" name="TOCManyDifferentLicenses">I
@@ -1517,8 +1515,6 @@
 <dt><b><a href="#TOCConsider" name="Consider">Consider this situation:
 	1. X releases V1 of a project under the GPL.
-	2. Y contributes to the development of V2 with
-      changes and new code based on V1.
-	3. X wants to convert V2 to a non-GPL license.   
-Does X need Y's permission?</a></b></dt>
+	2. Y contributes to the development of V2 with changes and new code based on V1.
+	3. X wants to convert V2 to a non-GPL license. Does X need Y's permission?</a></b></dt>
 
 <dd> 
@@ -2276,5 +2272,5 @@
 Updated:
 <!-- timestamp start -->
-$Date: 2004/11/27 17:03:55 $ $Author: taz $
+$Date: 2004/12/16 15:10:37 $ $Author: corey $
 <!-- timestamp end -->
 </p>
--- prev/www/philosophy/words-to-avoid.html	Sun Dec 12 05:28:16 2004
+++ curr/www/philosophy/words-to-avoid.html	Fri Dec 17 05:28:16 2004
@@ -229,8 +229,7 @@
 <p>
 Also, if you use other languages than English, please try to avoid
-borrowing English words such as "free software" or "freeware."
-Try to use the less ambiguous wording that
-<a href="/philosophy/fs-translations.html">your language</a>
-probably offers, e.g.</p>
+borrowing English terms such as "free software" or "freeware."
+It is better to translate the term "free software" into
+<a href="/philosophy/fs-translations.html">your language</a>.
 
 <p>
@@ -501,5 +500,5 @@
 Updated:
 <!-- timestamp start -->
-$Date: 2004/12/11 04:30:50 $ $Author: rms $
+$Date: 2004/12/16 14:52:06 $ $Author: rms $
 <!-- timestamp end -->
 </p>