web/html/about/trademarks/guidelines index.php,1.1.1.1,1.2

[Karsten Wade (kwade)]

Author: kwade

Update of /cvs/fedora/web/html/about/trademarks/guidelines
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15400/web/html/about/trademarks/guidelines

Modified Files:
	index.php 
Log Message:
Applying patch from bz#189069


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/about/trademarks/guidelines/index.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- index.php	30 Mar 2005 17:47:22 -0000	1.1.1.1
+++ index.php	13 Oct 2006 17:20:12 -0000	1.2
@@ -1,43 +1,11 @@
-<?
-include("site.inc");
+<?php
+//
+// Easily-changeable template for redirection.
+//
 
-$template = new Page;
-$template->initCommon();
+//$NEWURL="http://fedora.redhat.com/about/trademarks/guidelines/";
+$NEWURL="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines";
 
-$template->displayHeader();
-
-?>
-		<td valign="top">
-		<h1><? print $BASE_NAME; ?> Trademark Guidelines</h1>
-		Updated September 25, 2003
-		
-		<h2>Contents</h2>
-						
-		<ul class="gray">
-			<li><a href="page1.php">Basic Introduction</a></li>
-			<li><a href="page2.php">Protection of Trademarks</a></li>
-			<li><a href="page3.php">"Fair Use" of Trademarks</a></li>
-			<li><a href="page4.php">Use of <? print $TRADEMARK_NAME; ?> Trademark</a></li>
-			<li><a href="page5.php">Publishing and Marketing <? print $TRADEMARK_NAME; ?> Software That Has Been Modified</a></li>
-			<li><a href="page6.php">Authorized FTP or Electronic Download Sites</a></li>
-			<li><a href="page7.php">Conclusion</a></li>
-		</ul>
-		<hr>
-
-		<p>RED HAT, INC. RESERVES THE RIGHT TO CHANGE THESE GUIDELINES AT ANY TIME. YOU SHOULD PERIODICALLY CHECK THESE GUIDELINES TO BE SURE THAT YOU ARE IN COMPLIANCE.</p>
-
-		<p>Red Hat, Inc. has a long and distinguished history of being an active contributor to the open source software community. One of the key features of open source software is that anyone has the right to copy, modify and redistribute the software, subject to the terms and conditions of certain license agreements or copyright permissions, such as the GNU General Public License. It is important to understand that, although Red Hat allows third parties to replicate its open source software under the GNU GPL, absent a written agreement or other express permission it does not allow third parties to use its trademarks. For example, absent a trademark license from Red Hat,a party would have the right to copy, modify and sell Red Hat's open source software, but they would have to call it by another name. Red Hat has always been fully supportive of open source rights with regard to copyrights and demonstrates that support by releasing the software we develop under open source lice!
 nses. This document is designed to provide guidance on how the software developed and marketed under the <? print $PROJECT_NAME; ?>  may be marketed by others, using Red Hat's <? print $TRADEMARK_NAME; ?>.</p>
-
-		<h2>A Brief Introduction To Copyright And Trademark Law As They Relate To Software</h2>
-The guidelines in this document are based on United States law. Although many countries follow the same principles discussed below, the laws of other countries may also differ on some points.</p>
-
-		<h2>Copyright</h2>
-Copyright law protects the expression of an idea. <? print $TRADEMARK_NAME; ?> consists of hundreds of software modules, some developed by Red Hat and many developed by other members of the open source community. Those authors hold the copyrights in the modules or code they developed. At the same time, the combined body of work that constitutes <? print $TRADEMARK_NAME; ?> is a collective work which has been organized by the <? print $TRADEMARK_NAME; ?> Project, and the <? print $PROJECT_NAME; ?>  holds the copyright in that collective work. <? print $THE_PROJECT_NAME; ?> then permits others to copy, modify and redistribute the collective work. To grant this permission the <? print $PROJECT_NAME; ?> usually uses the GNU General Public License ("GPL") version 2 and the <? print $PROJECT_NAME; ?>'s own End User License Agreement. Although software licensed under the GPL is "open source software," the <? print $PROJECT_NAME; ?> retains ownership of the copyright in its collect!
 ive work. If someone violates the GPL regarding that collective work, only the <? print $PROJECT_NAME; ?>, as the copyright owner and licensor of that collective work, has legal authority to enforce the GPL against the violator. Although the <? print $PROJECT_NAME; ?> "owns" the collective work, in licensing it under the GPL, the <? print $PROJECT_NAME; ?> grants broad rights in the collective work to others. Neither the GPL nor the <? print $PROJECT_NAME; ?>'s End User License Agreement grant any right to use Red Hat's trademarks in the redistribution of the collective work.</p>
-
-
-<?
-print docs_nav("","page1.php");
-
-$template->displayFooter('$Date$');
+include("redirect.inc");
 
 ?>