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

[Karsten Wade (kwade)]

Author: kwade

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

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


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/about/trademarks/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,29 +1,11 @@
-<?
-include("site.inc");
- 
-$template = new Page;
-$template->initCommon();
- 
-$template->displayHeader();
- 
-?>
-	<h1><? print $BASE_NAME; ?> Trademark Guidelines and Policies</h1>
-					
-						<p><a href="guidelines/"><? print $BASE_NAME; ?> Trademark Guidelines</a><br />
-						The trademark guidelines provide general guidance on Red Hat's policies relating to its <? print $BASE_NAME; ?> trademark and proper referential use of Red Hat's trademarks.</p>
-						
-						<p>If you do not find the answer to your question in the published guidelines, please consult your legal counsel for advice.  Red Hat will not review requests for permission to use trademarks or for guidance pertaining to the use of its trademarks unless it is in the course of a business relationship.  Therefore, Red Hat will not respond to requests to review such matters, including but not limited to product packaging, advertising, domain names, marketing materials or other collateral.  If you have a request that is not addressed here, please consult your legal counsel.</p>
+<?php
+//
+// Easily-changeable template for redirection.
+//
 
-<p>Without waiving any of its rights, Red Hat does not advise others on the scope of its intellectual property rights.  Red Hat does not permit or consent to any use of its trademarks in any manner that is likely to cause confusion by implying association with or sponsorship by Red Hat.  If you are aware of any such use, please contact us at <A HREF="mailto:trademarks at redhat.com">trademarks at redhat.com</A>.  Consult your legal counsel if you have questions.</p>
+//$NEWURL="http://fedora.redhat.com/About/legal/trademarks/";
+$NEWURL="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines";
 
-<p>If you have trademark questions pertaining to an existing agreement or other business dealings with Red Hat, please contact your Red Hat business contact.  They will seek advice from the Red Hat Legal Department as appropriate.</p>
-						
-						<p><a href="trademark_usage.pdf">Trademark Style Sheet</a> <b>[PDF] - For Parties Authorized to Use Red Hat Marks</b><br />
-						The Trademark Style Sheet must be followed when use of Red Hat's trademarks is authorized by Red Hat.</p>
+include("redirect.inc");
 
- <?
-	 
-	$template->displayFooter('$Date$');
-	 
-	?>
-	
+?>