web/static/F-7/legal/trademarks/guidelines index.html, 1.2, 1.3 page1.html, 1.2, 1.3 page2.html, 1.2, 1.3 page3.html, 1.2, 1.3 page4.html, 1.2, 1.3 page5.html, 1.2, 1.3 page6.html, 1.2, 1.3 page7.html, 1.2, 1.3

Ricky Zhou (ricky) fedora-websites-list at redhat.com
Tue Jun 26 15:54:21 UTC 2007


Author: ricky

Update of /cvs/fedora/web/static/F-7/legal/trademarks/guidelines
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31712/legal/trademarks/guidelines

Modified Files:
	index.html page1.html page2.html page3.html page4.html 
	page5.html page6.html page7.html 
Log Message:
Huge legal/ cleanup- fixed invalid HTML, made all links relative, other misc changes



Index: index.html
===================================================================
RCS file: /cvs/fedora/web/static/F-7/legal/trademarks/guidelines/index.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.html	26 Jun 2007 07:39:33 -0000	1.2
+++ index.html	26 Jun 2007 15:54:19 -0000	1.3
@@ -15,110 +15,110 @@
   <body class="home">
     <div id="wrapper">
       <div id="head">
-        <h1><a href="index.html">Fedora</a></h1>
+        <h1><a href="../../../index.html">Fedora</a></h1>
       </div>
       <div id="sidebar">
-	<div id="nav">
-	  <ul>
-	    <li id="nav"><a href="/legal/licenses/">About Fedora Licenses</a></li>
-	    <li id="nav"><a href="/legal/trademarks/">About Fedora Trademarks</a></li>
-	  </ul>
-	</div>
+        <div class="nav">
+          <ul>
+            <li><a href="../../licenses/">About Fedora Licenses</a></li>
+            <li><a href="../../trademarks/">About Fedora Trademarks</a></li>
+          </ul>
+        </div>
       </div>
       <div id="content">
-        <h1>Fedora Trademark Guidelines</h1>
-	<div id="nav">
-	  <ul>
-	    <li id="nav"><a href="page2.html">Protection of Trademarks</a></li>
-	    <li id="nav"><a href="page3.html">"Fair Use" of Trademarks</a></li>
-	    <li id="nav"><a href="page4.html">Use of Fedora™ Trademark</a></li>
-	    <li id="nav"><a href="page5.html">Publishing and Marketing
-	    Fedora™ Software That Has Been Modified</a></li>
-	    <li id="nav"><a href="page6.html">Authorized FTP or Electronic Download Sites</a></li>
-	    <li id="nav"><a href="page7.html">Conclusion</a></li>
-	  </ul>
-	</div>
-	<hr></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 licenses. 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>
-
-	<p>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>
-
-	<p>Copyright law protects the expression of an idea.
-	Fedora™ 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 Fedora™ is a collective work
-	which has been organized by the Fedora™ Project, and the
-	Fedora Project holds the copyright in that collective work.
-	Fedora Project then permits others to copy, modify and
-	redistribute the collective work. To grant this permission the
-	Fedora Project usually uses the GNU General Public License
-	("GPL") version 2 and the Fedora Project's own End User License
-	Agreement. Although software licensed under the GPL is "open
-	source software," the Fedora Project retains ownership of the
-	copyright in its collective work. If someone violates the GPL
-	regarding that collective work, only the Fedora Project, as the
-	copyright owner and licensor of that collective work, has legal
-	authority to enforce the GPL against the violator. Although the
-	Fedora Project "owns" the collective work, in licensing it under
-	the GPL, the Fedora Project grants broad rights in the
-	collective work to others. Neither the GPL nor the Fedora
-	Project's End User License Agreement grant any right to use Red
-	Hat's trademarks in the redistribution of the collective
-	work.</p>
-	<div class="doc-nav">
-	  <a href="./" accesskey="h" id="doc-nav">Home</a>
-	  <a href="page1.html" accesskey="n" id="doc-nav-right">Next</a>
-	</div>
+        <h2>Fedora Trademark Guidelines</h2>
+        <div class="nav">
+          <ul>
+            <li><a href="page2.html">Protection of Trademarks</a></li>
+            <li><a href="page3.html">“Fair Use” of Trademarks</a></li>
+            <li><a href="page4.html">Use of Fedora™ Trademark</a></li>
+            <li><a href="page5.html">Publishing and Marketing
+              Fedora™ Software That Has Been Modified</a></li>
+            <li><a href="page6.html">Authorized FTP or Electronic Download Sites</a></li>
+            <li><a href="page7.html">Conclusion</a></li>
+          </ul>
+        </div>
+        <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 licenses. 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>
+
+        <h3>A Brief Introduction To Copyright And Trademark Law As They
+          Relate To Software</h3>
+
+        <p>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>
+
+        <h3>Copyright</h3>
+
+        <p>Copyright law protects the expression of an idea.
+        Fedora™ 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 Fedora™ is a collective work
+        which has been organized by the Fedora™ Project, and the
+        Fedora Project holds the copyright in that collective work.
+        Fedora Project then permits others to copy, modify and
+        redistribute the collective work. To grant this permission the
+        Fedora Project usually uses the GNU General Public License
+        ("GPL") version 2 and the Fedora Project’s own End User License
+        Agreement. Although software licensed under the GPL is "open
+        source software," the Fedora Project retains ownership of the
+        copyright in its collective work. If someone violates the GPL
+        regarding that collective work, only the Fedora Project, as the
+        copyright owner and licensor of that collective work, has legal
+        authority to enforce the GPL against the violator. Although the
+        Fedora Project "owns" the collective work, in licensing it under
+        the GPL, the Fedora Project grants broad rights in the
+        collective work to others. Neither the GPL nor the Fedora
+        Project’s End User License Agreement grant any right to use Red
+        Hat’s trademarks in the redistribution of the collective
+        work.</p>
+        <div class="doc-nav">
+          <a href="./" accesskey="h" id="doc-nav">Home</a>
+          <a href="page1.html" accesskey="n" id="doc-nav-right">Next</a>
+        </div>
       </div>
     </div>
     <div id="bottom">
       <div id="footer">
-	<p class="copy">
-	  Copyright © 2007 Red Hat, Inc. and others.  All Rights Reserved.
-	  Please send any comments or corrections to the <a href="mailto:webmaster at fedoraproject.org">websites team</a>.
-	</p>
-	<p class="disclaimer">
-	  The Fedora Project is maintained and driven by the community
-	  and sponsored by Red Hat.  This is a community maintained
-	  site.  Red Hat is not responsible for content.</p>
-	<ul>
-	  <li class="first"><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
-	  <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
-	</ul>
+        <p class="copy">
+        Copyright © 2007 Red Hat, Inc. and others.  All Rights Reserved.
+        Please send any comments or corrections to the <a href="mailto:webmaster at fedoraproject.org">websites team</a>.
+        </p>
+        <p class="disclaimer">
+        The Fedora Project is maintained and driven by the community
+        and sponsored by Red Hat.  This is a community maintained
+        site.  Red Hat is not responsible for content.</p>
+        <ul>
+          <li class="first"><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
+          <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
+        </ul>
       </div>
     </div>
   </body>


Index: page1.html
===================================================================
RCS file: /cvs/fedora/web/static/F-7/legal/trademarks/guidelines/page1.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- page1.html	26 Jun 2007 07:39:33 -0000	1.2
+++ page1.html	26 Jun 2007 15:54:19 -0000	1.3
@@ -15,82 +15,83 @@
   <body class="home">
     <div id="wrapper">
       <div id="head">
-        <h1><a href="index.html">Fedora</a></h1>
+        <h1><a href="../../../index.html">Fedora</a></h1>
       </div>
       <div id="sidebar">
-	<div id="nav">
-	  <ul>
-	    <li id="nav"><a href="/legal/licenses/">About Fedora Licenses</a></li>
-	    <li id="nav"><a href="/legal/trademarks/">About Fedora Trademarks</a></li>
-	    <ul>
-	      <li id="nav"><a href="page2.html">Protection of Trademarks</a></li>
-	      <li id="nav"><a href="page3.html">"Fair Use" of Trademarks</a></li>
-	      <li id="nav"><a href="page4.html">Use of Fedora™ Trademark</a></li>
-	      <li id="nav"><a href="page5.html">Publishing and Marketing
-		  Fedora™ Software That Has Been Modified</a></li>
-	      <li id="nav"><a href="page6.html">Authorized FTP or Electronic Download Sites</a></li>
-	      <li id="nav"><a href="page7.html">Conclusion</a></li>
-	    </ul>
-	  </ul>
-	</div>
+        <div class="nav">
+          <ul>
+            <li><a href="../../licenses/">About Fedora Licenses</a></li>
+            <li><a href="../../trademarks/">About Fedora Trademarks</a>
+            <ul>
+              <li><a href="page2.html">Protection of Trademarks</a></li>
+              <li><a href="page3.html">“Fair Use” of Trademarks</a></li>
+              <li><a href="page4.html">Use of Fedora™ Trademark</a></li>
+              <li><a href="page5.html">Publishing and Marketing
+                Fedora™ Software That Has Been Modified</a></li>
+              <li><a href="page6.html">Authorized FTP or Electronic Download Sites</a></li>
+              <li><a href="page7.html">Conclusion</a></li>
+            </ul>
+            </li>
+          </ul>
+        </div>
       </div>
       <div id="content">
         <h2>Fedora Trademark Guidelines</h2>
-	<h3>Basic Introduction</h3>
-	
-	<p>Trademarks are used to identify the source of goods and
-	  services in the market. Trademark law is best understood as
-	  consumer protection law, since it enables consumers of
-	  products to know the source of the products they purchase and
-	  allows them to distinguish those products from the products of
-	  other vendors. This is important in order to ensure that
-	  consumers are not fooled into purchasing a product of one
-	  company while believing it is a product of another
-	  company.</p>
-	
-	<p>For instance, Heinz® ketchup is a well-known brand of
-	  ketchup. If Jones Company decided to make its own ketchup, and
-	  was able to market it as Heinz® ketchup, Jones Company
-	  would profit in the sale of its ketchup from the customer
-	  goodwill established by the owner of the well-known Heinz®
-	  brand. Although that might be good for Jones Company, it could
-	  be bad for the consumers who purchased the Jones Company
-	  ketchup, believing that it was Heinz® ketchup. Such
-	  trademark use would be impermissible under applicable
-	  law. This is true even though the Jones Company ketchup
-	  contains exactly the same ingredients as the Heinz®
-	  ketchup.</p>
+        <h3>Basic Introduction</h3>
 
-	<p>A similar situation arises with the trademarks owned by Red
-	  Hat. Many consumers have come to trust the Red Hat®
-	  branded products and services, and look for a Red Hat brand,
-	  including <? print $TRADEMARK_NAME; ?> when they obtain our
-	  open source products. As a result, consumers who obtain
-	  products that are labeled <? print $TRADEMARK_NAME; ?> or some
-	  close variation (see "Use of <? print $BASE_NAME; ?>
-	  Trademark") believe that they are the official products of the
-	  <? print $PROJECT_NAME; ?>. Consumers often expect that such
-	  products will contain features that are available only from
-	  the <? print $PROJECT_NAME; ?>. In order to protect consumers,
-	  Red Hat has an obligation to ensure that its trademarks are
-	  not used to identify the products of other companies or used
-	  in any other manner which states or implies an association or
-	  sponsorship by Red Hat of other companies' products.</p>
-	<div class="doc-nav">
-	  <a href="./" accesskey="b" id="doc-nav-left">Back</a>
-	  <a href="./" accesskey="h" id="doc-nav">Home</a>
-	  <a href="page2.html" accesskey="n" id="doc-nav-right">Next</a>
-	</div>
+        <p>Trademarks are used to identify the source of goods and
+        services in the market. Trademark law is best understood as
+        consumer protection law, since it enables consumers of
+        products to know the source of the products they purchase and
+        allows them to distinguish those products from the products of
+        other vendors. This is important in order to ensure that
+        consumers are not fooled into purchasing a product of one
+        company while believing it is a product of another
+        company.</p>
+
+        <p>For instance, Heinz® ketchup is a well-known brand of
+        ketchup. If Jones Company decided to make its own ketchup, and
+        was able to market it as Heinz® ketchup, Jones Company
+        would profit in the sale of its ketchup from the customer
+        goodwill established by the owner of the well-known Heinz®
+        brand. Although that might be good for Jones Company, it could
+        be bad for the consumers who purchased the Jones Company
+        ketchup, believing that it was Heinz® ketchup. Such
+        trademark use would be impermissible under applicable
+        law. This is true even though the Jones Company ketchup
+        contains exactly the same ingredients as the Heinz®
+        ketchup.</p>
+
+        <p>A similar situation arises with the trademarks owned by Red
+        Hat. Many consumers have come to trust the Red Hat®
+        branded products and services, and look for a Red Hat brand,
+        including <? print $TRADEMARK_NAME; ?> when they obtain our
+        open source products. As a result, consumers who obtain
+        products that are labeled <? print $TRADEMARK_NAME; ?> or some
+        close variation (see "Use of <? print $BASE_NAME; ?>
+        Trademark") believe that they are the official products of the
+        <? print $PROJECT_NAME; ?>. Consumers often expect that such
+        products will contain features that are available only from
+        the <? print $PROJECT_NAME; ?>. In order to protect consumers,
+        Red Hat has an obligation to ensure that its trademarks are
+        not used to identify the products of other companies or used
+        in any other manner which states or implies an association or
+        sponsorship by Red Hat of other companies' products.</p>
+        <div class="doc-nav">
+          <a href="./" accesskey="b" id="doc-nav-left">Back</a>
+          <a href="./" accesskey="h" id="doc-nav">Home</a>
+          <a href="page2.html" accesskey="n" id="doc-nav-right">Next</a>
+        </div>
       </div>
     </div>
     <div id="bottom">
-	<div id="footer">
+      <div id="footer">
         <p class="copy">
-	  Copyright © 2007 Red Hat, Inc. and others.  All Rights Reserved.
-	  Please send any comments or corrections to the <a href="mailto:webmaster at fedoraproject.org">websites team</a>.
+        Copyright © 2007 Red Hat, Inc. and others.  All Rights Reserved.
+        Please send any comments or corrections to the <a href="mailto:webmaster at fedoraproject.org">websites team</a>.
         </p>
         <p class="disclaimer">
-	  The Fedora Project is maintained and driven by the community and sponsored by Red Hat.  This is a community maintained site.  Red Hat is not responsible for content.</p>
+        The Fedora Project is maintained and driven by the community and sponsored by Red Hat.  This is a community maintained site.  Red Hat is not responsible for content.</p>
         <ul>
           <li class="first"><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
           <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>


Index: page2.html
===================================================================
RCS file: /cvs/fedora/web/static/F-7/legal/trademarks/guidelines/page2.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- page2.html	26 Jun 2007 07:39:33 -0000	1.2
+++ page2.html	26 Jun 2007 15:54:19 -0000	1.3
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>Fedora Project</title>
-    <link rel="stylesheet" type="text/css" media="all" href="http://fedoraproject.org/style.css" />
+    <link rel="stylesheet" type="text/css" media="all" href="../../../style.css" />
     <!--[if lt IE 7]>
     <style type="text/css">
       #wrapper
@@ -15,72 +15,72 @@
   <body class="home">
     <div id="wrapper">
       <div id="head">
-        <h1><a href="index.html">Fedora</a></h1>
+        <h1><a href="../../../index.html">Fedora</a></h1>
       </div>
       <div id="sidebar">
-	<div id="nav">
-	  <ul>
-	    <li id="nav"><a href="/legal/licenses/">About Fedora Licenses</a></li>
-	    <li id="nav"><a href="/legal/trademarks/">About Fedora Trademarks</a>
-	      <ul>
-		<li id="nav"><a href="page2.html">Protection of Trademarks</a></li>
-		<li id="nav"><a href="page3.html">"Fair Use" of Trademarks</a></li>
-		<li id="nav"><a href="page4.html">Use of Fedora™ Trademark</a></li>
-		<li id="nav"><a href="page5.html">Publishing and Marketing
-		    Fedora™ Software That Has Been Modified</a></li>
-		<li id="nav"><a href="page6.html">Authorized FTP or Electronic Download Sites</a></li>
-		<li id="nav"><a href="page7.html">Conclusion</a></li>
-	      </ul>
-	    </li>
-	  </ul>
-	</div>
+        <div class="nav">
+          <ul>
+            <li><a href="../../licenses/">About Fedora Licenses</a></li>
+            <li><a href="../../trademarks/">About Fedora Trademarks</a>
+            <ul>
+              <li><a href="page2.html">Protection of Trademarks</a></li>
+              <li><a href="page3.html">“Fair Use” of Trademarks</a></li>
+              <li><a href="page4.html">Use of Fedora™ Trademark</a></li>
+              <li><a href="page5.html">Publishing and Marketing
+                Fedora™ Software That Has Been Modified</a></li>
+              <li><a href="page6.html">Authorized FTP or Electronic Download Sites</a></li>
+              <li><a href="page7.html">Conclusion</a></li>
+            </ul>
+            </li>
+          </ul>
+        </div>
       </div>
       <div id="content">
-        <h1>Fedora Trademark Guidelines</h1>
-	<h2>Protection of Trademarks</h2>
+        <h2>Fedora Trademark Guidelines</h2>
+        <h3>Protection of Trademarks</h3>
 
-	<p>Under trademark law, owners of trademarks who use their
-	  trademarks improperly or who fail to police the use of their
-	  trademarks by others may lose their rights in those
-	  trademarks. For instance, now-common words such as "zipper"
-	  and "elevator" were trademarks at one time. Their owners
-	  allowed the marks to be widely known and used as generic names
-	  for the associated products, and, as a result, all trademark
-	  protection was lost. Some examples of trademarks that are
-	  protected by their owners at great lengths today from such
-	  "genericide" include Kleenex® brand facial tissues,
-	  Band-Aid® brand bandages and Xerox® brand
-	  photocopiers. In addition to monitoring the use of trademarks
-	  by others, policing also requires maintaining control over the
-	  nature and quality of the goods and services that are marketed
-	  under the trademarks.</p>
-	
-	<p>Red Hat has filed to register the trademark Fedora™ in
-	  the United States Patent and Trademark Office. We are also
-	  seeking registration of the mark in many other countries
-	  around the world, have filed applications to register the mark
-	  in still other countries, and we will continue to aggressively
-	  register our trademarks in countries where we do business.</p>
+        <p>Under trademark law, owners of trademarks who use their
+        trademarks improperly or who fail to police the use of their
+        trademarks by others may lose their rights in those
+        trademarks. For instance, now-common words such as "zipper"
+        and "elevator" were trademarks at one time. Their owners
+        allowed the marks to be widely known and used as generic names
+        for the associated products, and, as a result, all trademark
+        protection was lost. Some examples of trademarks that are
+        protected by their owners at great lengths today from such
+        "genericide" include Kleenex® brand facial tissues,
+        Band-Aid® brand bandages and Xerox® brand
+        photocopiers. In addition to monitoring the use of trademarks
+        by others, policing also requires maintaining control over the
+        nature and quality of the goods and services that are marketed
+        under the trademarks.</p>
 
-	<p>Our unregistered trademarks are also protected under
-	  trademark law. Unregistered trademarks of Red Hat include,
-	  RPM™ and Bluecurve™.</p>
+        <p>Red Hat has filed to register the trademark Fedora™ in
+        the United States Patent and Trademark Office. We are also
+        seeking registration of the mark in many other countries
+        around the world, have filed applications to register the mark
+        in still other countries, and we will continue to aggressively
+        register our trademarks in countries where we do business.</p>
 
-	<div class="doc-nav">
-	  <a href="page1.html" accesskey="b" id="doc-nav-left">Back</a>
-	  <a href="./" accesskey="h" id="doc-nav">Home</a>
-	  <a href="page3.html" accesskey="n" id="doc-nav-right">Next</a>
-	</div>
+        <p>Our unregistered trademarks are also protected under
+        trademark law. Unregistered trademarks of Red Hat include,
+        RPM™ and Bluecurve™.</p>
+
+        <div class="doc-nav">
+          <a href="page1.html" accesskey="b" id="doc-nav-left">Back</a>
+          <a href="./" accesskey="h" id="doc-nav">Home</a>
+          <a href="page3.html" accesskey="n" id="doc-nav-right">Next</a>
+        </div>
       </div>
     </div>
     <div id="bottom">
       <div id="footer">
         <p class="copy">
-	  Copyright © 2007 Red Hat, Inc. and others.  All Rights Reserved.
-	  Please send any comments or corrections to the <a href="mailto:webmaster at fedoraproject.org">websites team</a>.
+        Copyright © 2007 Red Hat, Inc. and others.  All Rights Reserved.
+        Please send any comments or corrections to the <a href="mailto:webmaster at fedoraproject.org">websites team</a>.
         </p>
         <p class="disclaimer">
-	  The Fedora Project is maintained and driven by the community and sponsored by Red Hat.  This is a community maintained site.  Red Hat is not responsible for content.</p>
+        The Fedora Project is maintained and driven by the community and sponsored by Red Hat.  This is a community maintained site.  Red Hat is not responsible for content.</p>
         <ul>
           <li class="first"><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
           <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>


Index: page3.html
===================================================================
RCS file: /cvs/fedora/web/static/F-7/legal/trademarks/guidelines/page3.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- page3.html	26 Jun 2007 07:39:33 -0000	1.2
+++ page3.html	26 Jun 2007 15:54:19 -0000	1.3
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>Fedora Project</title>
-    <link rel="stylesheet" type="text/css" media="all" href="http://fedoraproject.org/style.css" />
+    <link rel="stylesheet" type="text/css" media="all" href="../../../style.css" />
     <!--[if lt IE 7]>
     <style type="text/css">
       #wrapper
@@ -15,67 +15,67 @@
   <body class="home">
     <div id="wrapper">
       <div id="head">
-        <h1><a href="index.html">Fedora</a></h1>
+        <h1><a href="../../../index.html">Fedora</a></h1>
       </div>
       <div id="sidebar">
-	<div id="nav">
-	  <ul>
-	    <li id="nav"><a href="/legal/licenses/">About Fedora Licenses</a></li>
-	    <li id="nav"><a href="/legal/trademarks/">About Fedora Trademarks</a>
-	      <ul>
-		<li id="nav"><a href="page2.html">Protection of Trademarks</a></li>
-		<li id="nav"><a href="page3.html">"Fair Use" of Trademarks</a></li>
-		<li id="nav"><a href="page4.html">Use of Fedora™ Trademark</a></li>
-		<li id="nav"><a href="page5.html">Publishing and Marketing
-		    Fedora™ Software That Has Been Modified</a></li>
-		<li id="nav"><a href="page6.html">Authorized FTP or Electronic Download Sites</a></li>
-		<li id="nav"><a href="page7.html">Conclusion</a></li>
-	      </ul>
-	    </li>
-	  </ul>
-	</div>
+        <div class="nav">
+          <ul>
+            <li><a href="../../licenses/">About Fedora Licenses</a></li>
+            <li><a href="../../trademarks/">About Fedora Trademarks</a>
+            <ul>
+              <li><a href="page2.html">Protection of Trademarks</a></li>
+              <li><a href="page3.html">“Fair Use” of Trademarks</a></li>
+              <li><a href="page4.html">Use of Fedora™ Trademark</a></li>
+              <li><a href="page5.html">Publishing and Marketing
+                Fedora™ Software That Has Been Modified</a></li>
+              <li><a href="page6.html">Authorized FTP or Electronic Download Sites</a></li>
+              <li><a href="page7.html">Conclusion</a></li>
+            </ul>
+            </li>
+          </ul>
+        </div>
       </div>
       <div id="content">
-        <h1>Fedora Trademark Guidelines</h1>
-	<h2>"Fair Use" of Trademarks</h2>
-	
-	<p>Although a trademark owner should take action to police the
-	  use of its trademarks by others, it cannot prevent others from
-	  using its trademarks under all circumstances. For instance, a
-	  company may refer to the trademarks of competing products in
-	  marketing its own products. As an example, Burger King might
-	  choose to state in advertisements that "Burger King®
-	  french fries were preferred over McDonald's® french fries
-	  in a taste test." Although McDonald's® is a trademark of
-	  McDonald's Corporation, Burger King could mention it in its
-	  marketing in this fashion so long as the statement is truthful
-	  and not misleading, does not imply an improper association
-	  with or sponsorship by McDonald's and otherwise complies with
-	  applicable laws. A key element in evaluating whether the use
-	  of someone else's trademark is acceptable is whether the use
-	  is likely to cause confusion in the marketplace as to the
-	  source or sponsorship of a product. Burger King's use of
-	  "McDonald's®" in the statement above is not likely to lead
-	  consumers to believe that Burger King® french fries are a
-	  product of McDonald's or that Burger King® french fries
-	  emanate from or are sponsored or approved by McDonald's
-	  Corporation.</p>
+        <h2>Fedora Trademark Guidelines</h2>
+        <h3>"Fair Use" of Trademarks</h3>
 
-	<div class="doc-nav">
-	  <a href="page2.html" accesskey="b" id="doc-nav-left">Back</a>
-	  <a href="./" accesskey="h" id="doc-nav">Home</a>
-	  <a href="page4.html" accesskey="n" id="doc-nav-right">Next</a>
-	</div>
+        <p>Although a trademark owner should take action to police the
+        use of its trademarks by others, it cannot prevent others from
+        using its trademarks under all circumstances. For instance, a
+        company may refer to the trademarks of competing products in
+        marketing its own products. As an example, Burger King might
+        choose to state in advertisements that “Burger King®
+        french fries were preferred over McDonald’s® french fries
+        in a taste test.” Although McDonald’s® is a trademark of
+        McDonald’s Corporation, Burger King could mention it in its
+        marketing in this fashion so long as the statement is truthful
+        and not misleading, does not imply an improper association
+        with or sponsorship by McDonald’s and otherwise complies with
+        applicable laws. A key element in evaluating whether the use
+        of someone else’s trademark is acceptable is whether the use
+        is likely to cause confusion in the marketplace as to the
+        source or sponsorship of a product. Burger King’s use of
+        ”McDonald’s®” in the statement above is not likely to lead
+        consumers to believe that Burger King® french fries are a
+        product of McDonald’s or that Burger King® french fries
+        emanate from or are sponsored or approved by McDonald’s
+        Corporation.</p>
+
+        <div class="doc-nav">
+          <a href="page2.html" accesskey="b" id="doc-nav-left">Back</a>
+          <a href="./" accesskey="h" id="doc-nav">Home</a>
+          <a href="page4.html" accesskey="n" id="doc-nav-right">Next</a>
+        </div>
       </div>
     </div>
     <div id="bottom">
       <div id="footer">
         <p class="copy">
-	  Copyright © 2007 Red Hat, Inc. and others.  All Rights Reserved.
-	  Please send any comments or corrections to the <a href="mailto:webmaster at fedoraproject.org">websites team</a>.
+        Copyright © 2007 Red Hat, Inc. and others.  All Rights Reserved.
+        Please send any comments or corrections to the <a href="mailto:webmaster at fedoraproject.org">websites team</a>.
         </p>
         <p class="disclaimer">
-	  The Fedora Project is maintained and driven by the community and sponsored by Red Hat.  This is a community maintained site.  Red Hat is not responsible for content.</p>
+        The Fedora Project is maintained and driven by the community and sponsored by Red Hat.  This is a community maintained site.  Red Hat is not responsible for content.</p>
         <ul>
           <li class="first"><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
           <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>


Index: page4.html
===================================================================
RCS file: /cvs/fedora/web/static/F-7/legal/trademarks/guidelines/page4.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- page4.html	26 Jun 2007 07:39:33 -0000	1.2
+++ page4.html	26 Jun 2007 15:54:19 -0000	1.3
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>Fedora Project</title>
-    <link rel="stylesheet" type="text/css" media="all" href="http://fedoraproject.org/style.css" />
+    <link rel="stylesheet" type="text/css" media="all" href="../../../style.css" />
     <!--[if lt IE 7]>
     <style type="text/css">
       #wrapper
@@ -15,118 +15,118 @@
   <body class="home">
     <div id="wrapper">
       <div id="head">
-        <h1><a href="index.html">Fedora</a></h1>
+        <h1><a href="../../../index.html">Fedora</a></h1>
       </div>
       <div id="sidebar">
-	<div id="nav">
-	  <ul>
-	    <li id="nav"><a href="/legal/licenses/">About Fedora Licenses</a></li>
-	    <li id="nav"><a href="/legal/trademarks/">About Fedora Trademarks</a>
-	      <ul>
-		<li id="nav"><a href="page2.html">Protection of Trademarks</a></li>
-		<li id="nav"><a href="page3.html">"Fair Use" of Trademarks</a></li>
-		<li id="nav"><a href="page4.html">Use of Fedora™ Trademark</a></li>
-		<li id="nav"><a href="page5.html">Publishing and Marketing
-		    Fedora™ Software That Has Been Modified</a></li>
-		<li id="nav"><a href="page6.html">Authorized FTP or Electronic Download Sites</a></li>
-		<li id="nav"><a href="page7.html">Conclusion</a></li>
-	      </ul>
-	    </li>
-	  </ul>
-	</div>
+        <div class="nav">
+          <ul>
+            <li><a href="../../licenses/">About Fedora Licenses</a></li>
+            <li><a href="../../trademarks/">About Fedora Trademarks</a>
+            <ul>
+              <li><a href="page2.html">Protection of Trademarks</a></li>
+              <li><a href="page3.html">“Fair Use” of Trademarks</a></li>
+              <li><a href="page4.html">Use of Fedora™ Trademark</a></li>
+              <li><a href="page5.html">Publishing and Marketing
+                Fedora™ Software That Has Been Modified</a></li>
+              <li><a href="page6.html">Authorized FTP or Electronic Download Sites</a></li>
+              <li><a href="page7.html">Conclusion</a></li>
+            </ul>
+            </li>
+          </ul>
+        </div>
       </div>
       <div id="content">
-        <h1>Fedora Trademark Guidelines</h1> 
+        <h2>Fedora Trademark Guidelines</h2> 
 
-	<h2>Use of the Fedora Mark and Other Red Hat Trademarks Which
-	Are Included in Fedora</h2>
+        <h3>Use of the Fedora Mark and Other Red Hat Trademarks Which
+          Are Included in Fedora</h3>
 
-	<p>One of the purposes of the Fedora Project is to make a
-	  cutting-edge version of Linux® widely available in a
-	  consistent format that the public can come to trust. In order
-	  to achieve this purpose it is important that the technology
-	  can quickly be identified and that the recipient knows the
-	  technology they are receiving is the official and unmodified
-	  version. Red Hat has chosen the Fedora™ mark to identify
-	  this effort and is granting broad usage rights in that
-	  trademark in order to assure widespread availability.</p>
-
-	<p>Companies, governments, schools or individuals who wish to
-	  produce CD-ROM and other products that contain the software
-	  which the Fedora Project distributes under the Fedora™
-	  may do so as long as they follow these guidelines. Except as
-	  expressly granted herein or under rights of fair use, no party
-	  has a right to use the Fedora™ mark in association with
-	  the software provided by the Fedora Project. Doing so would
-	  cause confusion among the customers who obtain those products,
-	  because they may believe they are obtaining a product
-	  emanating from or sponsored by the Fedora Project but, in
-	  reality, it is a product of another company altogether.</p>
-	
-	<p>To address this issue, we have developed the following
-	  guidelines for the use of the Fedora™ trademark and such
-	  other Red Hat marks as are included in Fedora™. These
-	  guidelines are designed to serve both consumers of Linux-based
-	  products, to ensure that they know the source of the products
-	  they purchase, and publishers of Linux-based products, so that
-	  they can avoid improperly generating confusion in the
-	  marketplace.</p>
-
-	<h2>Use of the Brand "Fedora"</h2> 
-
-	<p>Fedora™ is a trademark of Red Hat, Inc. and may only be
-	  used with Red Hat Inc.'s express permission. Except as
-	  provided herein, you may not use "Fedora" or any confusingly
-	  similar mark as a trademark for your product, or use "Fedora"
-	  in any other manner that might cause confusion in the
-	  marketplace, including in advertising, on auction sites, or on
-	  software or hardware. Any party wishing to use the
-	  Fedora™ mark may do so as long as they meet two
-	  conditions:</p>
-
-	<ol>
-	  <li>They must only use the Fedora™ mark in association
-	    with the original Fedora™ code found on the Fedora
-	    Project website (see <a
-	    href="http://fedoraproject.org">http://fedoraproject.org</a>)
-	    without modification; and</li>
-	  
-	  <li>If they charge a fee for the CD-ROM or other media on
-	    which they deliver the Fedora™ code, they warranty the
-	    media on which the Fedora™ code is delivered, thus
-	    ensuring that the recipient receives a usable copy.</li>
-	</ol>
-
-	<p>This same permission applies to such other Red Hat trademarks
-	  as are included in the authorized Fedora™ distribution,
-	  such as RPM™. Except as expressly stated herein, no
-	  other rights are granted to use any other Red Hat trademarks,
-	  specifically including the RED HAT® and "Shadowman"
-	  logo® marks. <em>Absolutely no exceptions</em>.</p>
-
-	<div class="doc-nav">
-	  <a href="page3.html" accesskey="b" id="doc-nav-left">Back</a>
-	  <a href="./" accesskey="h" id="doc-nav">Home</a>
-	  <a href="page5.html" accesskey="n" id="doc-nav-right">Next</a>
-	</div>
+        <p>One of the purposes of the Fedora Project is to make a
+        cutting-edge version of Linux® widely available in a
+        consistent format that the public can come to trust. In order
+        to achieve this purpose it is important that the technology
+        can quickly be identified and that the recipient knows the
+        technology they are receiving is the official and unmodified
+        version. Red Hat has chosen the Fedora™ mark to identify
+        this effort and is granting broad usage rights in that
+        trademark in order to assure widespread availability.</p>
+
+        <p>Companies, governments, schools or individuals who wish to
+        produce CD-ROM and other products that contain the software
+        which the Fedora Project distributes under the Fedora™
+        may do so as long as they follow these guidelines. Except as
+        expressly granted herein or under rights of fair use, no party
+        has a right to use the Fedora™ mark in association with
+        the software provided by the Fedora Project. Doing so would
+        cause confusion among the customers who obtain those products,
+        because they may believe they are obtaining a product
+        emanating from or sponsored by the Fedora Project but, in
+        reality, it is a product of another company altogether.</p>
+
+        <p>To address this issue, we have developed the following
+        guidelines for the use of the Fedora™ trademark and such
+        other Red Hat marks as are included in Fedora™. These
+        guidelines are designed to serve both consumers of Linux-based
+        products, to ensure that they know the source of the products
+        they purchase, and publishers of Linux-based products, so that
+        they can avoid improperly generating confusion in the
+        marketplace.</p>
+
+        <h2>Use of the Brand “Fedora”</h2> 
+
+        <p>Fedora™ is a trademark of Red Hat, Inc. and may only be
+        used with Red Hat Inc.’s express permission. Except as
+        provided herein, you may not use “Fedora” or any confusingly
+        similar mark as a trademark for your product, or use “Fedora”
+        in any other manner that might cause confusion in the
+        marketplace, including in advertising, on auction sites, or on
+        software or hardware. Any party wishing to use the
+        Fedora™ mark may do so as long as they meet two
+        conditions:</p>
+
+        <ol>
+          <li>They must only use the Fedora™ mark in association
+          with the original Fedora™ code found on the Fedora
+          Project website (see <a
+            href="http://fedoraproject.org">http://fedoraproject.org</a>)
+          without modification; and</li>
+
+          <li>If they charge a fee for the CD-ROM or other media on
+          which they deliver the Fedora™ code, they warranty the
+          media on which the Fedora™ code is delivered, thus
+          ensuring that the recipient receives a usable copy.</li>
+        </ol>
+
+        <p>This same permission applies to such other Red Hat trademarks
+        as are included in the authorized Fedora™ distribution,
+        such as RPM™. Except as expressly stated herein, no
+        other rights are granted to use any other Red Hat trademarks,
+        specifically including the RED HAT® and “Shadowman”
+        logo® marks. <em>Absolutely no exceptions</em>.</p>
+
+        <div class="doc-nav">
+          <a href="page3.html" accesskey="b" id="doc-nav-left">Back</a>
+          <a href="./" accesskey="h" id="doc-nav">Home</a>
+          <a href="page5.html" accesskey="n" id="doc-nav-right">Next</a>
+        </div>
       </div>
     </div>
     <div id="bottom">
       <div id="footer">
-	<p class="copy">
-	  Copyright © 2007 Red Hat, Inc. and others.  All Rights Reserved.
-	  Please send any comments or corrections to the <a href="mailto:webmaster at fedoraproject.org">websites team</a>.
-	</p>
-	<p class="disclaimer">
-	  The Fedora Project is maintained and driven by the community
-	  and sponsored by Red Hat.  This is a community maintained
-	  site.  Red Hat is not responsible for content.</p>
-	<ul>
-	  <li class="first"><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
-	  <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
-	</ul>
+        <p class="copy">
+        Copyright © 2007 Red Hat, Inc. and others.  All Rights Reserved.
+        Please send any comments or corrections to the <a href="mailto:webmaster at fedoraproject.org">websites team</a>.
+        </p>
+        <p class="disclaimer">
+        The Fedora Project is maintained and driven by the community
+        and sponsored by Red Hat.  This is a community maintained
+        site.  Red Hat is not responsible for content.</p>
+        <ul>
+          <li class="first"><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
+          <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
+        </ul>
       </div>
     </div>
   </div>
-  </body>
+</body>
 </html>


Index: page5.html
===================================================================
RCS file: /cvs/fedora/web/static/F-7/legal/trademarks/guidelines/page5.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- page5.html	26 Jun 2007 07:39:33 -0000	1.2
+++ page5.html	26 Jun 2007 15:54:19 -0000	1.3
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>Fedora Project</title>
-    <link rel="stylesheet" type="text/css" media="all" href="http://fedoraproject.org/style.css" />
+    <link rel="stylesheet" type="text/css" media="all" href="../../../style.css" />
     <!--[if lt IE 7]>
     <style type="text/css">
       #wrapper
@@ -15,107 +15,107 @@
   <body class="home">
     <div id="wrapper">
       <div id="head">
-        <h1><a href="index.html">Fedora</a></h1>
+        <h1><a href="../../../index.html">Fedora</a></h1>
       </div>
       <div id="sidebar">
-	<div id="nav">
-	  <ul>
-	    <li id="nav"><a href="/legal/licenses/">About Fedora Licenses</a></li>
-	    <li id="nav"><a href="/legal/trademarks/">About Fedora Trademarks</a>
-	      <ul>
-		<li id="nav"><a href="page2.html">Protection of Trademarks</a></li>
-		<li id="nav"><a href="page3.html">"Fair Use" of Trademarks</a></li>
-		<li id="nav"><a href="page4.html">Use of Fedora™ Trademark</a></li>
-		<li id="nav"><a href="page5.html">Publishing and Marketing
-		    Fedora™ Software That Has Been Modified</a></li>
-		<li id="nav"><a href="page6.html">Authorized FTP or Electronic Download Sites</a></li>
-		<li id="nav"><a href="page7.html">Conclusion</a></li>
-	      </ul>
-	    </li>
-	  </ul>
-	</div>
+        <div class="nav">
+          <ul>
+            <li><a href="../../licenses/">About Fedora Licenses</a></li>
+            <li><a href="../../trademarks/">About Fedora Trademarks</a>
+            <ul>
+              <li><a href="page2.html">Protection of Trademarks</a></li>
+              <li><a href="page3.html">“Fair Use” of Trademarks</a></li>
+              <li><a href="page4.html">Use of Fedora™ Trademark</a></li>
+              <li><a href="page5.html">Publishing and Marketing
+                Fedora™ Software That Has Been Modified</a></li>
+              <li><a href="page6.html">Authorized FTP or Electronic Download Sites</a></li>
+              <li><a href="page7.html">Conclusion</a></li>
+            </ul>
+            </li>
+          </ul>
+        </div>
       </div>
       <div id="content">
-        <h1>Fedora Trademark Guidelines</h1> 
+        <h2>Fedora Trademark Guidelines</h2> 
 
-	<h2>Publishing And Marketing Fedora™ Software That Has
-	  Been Modified</h2>
-	
-	<p>As a licensee under the GPL and other applicable licenses,
-	  you may make modifications to the software contained in
-	  Fedora™ and may market the revised product in accordance
-	  with the terms of the copyright licenses. In order to do this,
-	  you must follow these guidelines:</p>
-
-	<ol>
-	  <li><p>You must comply with all applicable copyright licenses
-	      for the software and the trademark guidelines in this
-	      document.</p></li>
-
-	  <li><p>You may not name or brand your product "Fedora" or use
-	      the Fedora™ or Red Hat® trademarks in any way,
-	      either on your product or in related advertising. You must
-	      use a different trademark for your product that will not
-	      cause confusion with the trademarks of Red Hat, will not
-	      indicate or imply that your product originates from or is
-	      sponsored or approved by Red Hat, and which otherwise
-	      complies with applicable trademark laws.</p></li>
-	  
-	  <li><p>You may not state that your product "contains
-	      Fedora™" This would amount to impermissible use of
-	      Red Hat's trademarks.</p></li>
-	  
-	  <li><p>You must modify the files identified as FEDORA-LOGOS
-	      and ANACONDA-IMAGES so as to remove all use of images
-	      containing the "Fedora" trademark.  Note that mere
-	      deletion of these files may corrupt the software.</p></li>
-	</ol>
-	
-	<p>Shipping Fedora™ code unmodified from the original
-	  download with separate patches that may be applied by the end
-	  user at his/her discretion is not a modification of the
-	  original code, provided:</p>
-	
-	<ol type="a">
-	  <li><p>The original Fedora™ code is intact and
-	      identifiable at the time of installation and on the media
-	      on which the code is delivered;</p></li>
-
-	  <li><p>The patches are provided independent of the original
-	      Fedora™ code and are identifiable on the media on
-	      which the code is delivered;</p></li>
-
-	  <li><p>The end user is given the discretion as to whether to
-	      install the patches; and</p></li>
-
-	  <li><p>Any marketing materials related to such a distribution
-	      make clear that the vendor is providing patches which, if
-	      installed by the user, will modify the Fedora™ code
-	      from its original form.</p></li>
-	</ol>
-	<div class="doc-nav">
-	  <a href="page4.html" accesskey="b" id="doc-nav-left">Back</a>
-	  <a href="./" accesskey="h" id="doc-nav">Home</a>
-	  <a href="page6.html" accesskey="n" id="doc-nav-right">Next</a>
-	</div>
+        <h3>Publishing And Marketing Fedora™ Software That Has
+          Been Modified</h3>
+
+        <p>As a licensee under the GPL and other applicable licenses,
+        you may make modifications to the software contained in
+        Fedora™ and may market the revised product in accordance
+        with the terms of the copyright licenses. In order to do this,
+        you must follow these guidelines:</p>
+
+        <ol>
+          <li><p>You must comply with all applicable copyright licenses
+          for the software and the trademark guidelines in this
+          document.</p></li>
+
+          <li><p>You may not name or brand your product “Fedora” or use
+          the Fedora™ or Red Hat® trademarks in any way,
+          either on your product or in related advertising. You must
+          use a different trademark for your product that will not
+          cause confusion with the trademarks of Red Hat, will not
+          indicate or imply that your product originates from or is
+          sponsored or approved by Red Hat, and which otherwise
+          complies with applicable trademark laws.</p></li>
+
+          <li><p>You may not state that your product “contains
+          Fedora™” This would amount to impermissible use of
+          Red Hat’s trademarks.</p></li>
+
+          <li><p>You must modify the files identified as FEDORA-LOGOS
+          and ANACONDA-IMAGES so as to remove all use of images
+          containing the “Fedora” trademark.  Note that mere
+          deletion of these files may corrupt the software.</p></li>
+        </ol>
+
+        <p>Shipping Fedora™ code unmodified from the original
+        download with separate patches that may be applied by the end
+        user at his/her discretion is not a modification of the
+        original code, provided:</p>
+
+        <ol type="a">
+          <li><p>The original Fedora™ code is intact and
+          identifiable at the time of installation and on the media
+          on which the code is delivered;</p></li>
+
+          <li><p>The patches are provided independent of the original
+          Fedora™ code and are identifiable on the media on
+          which the code is delivered;</p></li>
+
+          <li><p>The end user is given the discretion as to whether to
+          install the patches; and</p></li>
+
+          <li><p>Any marketing materials related to such a distribution
+          make clear that the vendor is providing patches which, if
+          installed by the user, will modify the Fedora™ code
+          from its original form.</p></li>
+        </ol>
+        <div class="doc-nav">
+          <a href="page4.html" accesskey="b" id="doc-nav-left">Back</a>
+          <a href="./" accesskey="h" id="doc-nav">Home</a>
+          <a href="page6.html" accesskey="n" id="doc-nav-right">Next</a>
+        </div>
       </div>
     </div>
     <div id="bottom">
       <div id="footer">
-	<p class="copy">
-	  Copyright © 2007 Red Hat, Inc. and others.  All Rights Reserved.
-	  Please send any comments or corrections to the <a href="mailto:webmaster at fedoraproject.org">websites team</a>.
-	</p>
-	<p class="disclaimer">
-	  The Fedora Project is maintained and driven by the community
-	  and sponsored by Red Hat.  This is a community maintained
-	  site.  Red Hat is not responsible for content.</p>
-	<ul>
-	  <li class="first"><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
-	  <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
-	</ul>
+        <p class="copy">
+        Copyright © 2007 Red Hat, Inc. and others.  All Rights Reserved.
+        Please send any comments or corrections to the <a href="mailto:webmaster at fedoraproject.org">websites team</a>.
+        </p>
+        <p class="disclaimer">
+        The Fedora Project is maintained and driven by the community
+        and sponsored by Red Hat.  This is a community maintained
+        site.  Red Hat is not responsible for content.</p>
+        <ul>
+          <li class="first"><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
+          <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
+        </ul>
       </div>
     </div>
   </div>
-  </body>
+</body>
 </html>


Index: page6.html
===================================================================
RCS file: /cvs/fedora/web/static/F-7/legal/trademarks/guidelines/page6.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- page6.html	26 Jun 2007 07:39:33 -0000	1.2
+++ page6.html	26 Jun 2007 15:54:19 -0000	1.3
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>Fedora Project</title>
-    <link rel="stylesheet" type="text/css" media="all" href="http://fedoraproject.org/style.css" />
+    <link rel="stylesheet" type="text/css" media="all" href="../../../style.css" />
     <!--[if lt IE 7]>
     <style type="text/css">
       #wrapper
@@ -15,68 +15,68 @@
   <body class="home">
     <div id="wrapper">
       <div id="head">
-        <h1><a href="index.html">Fedora</a></h1>
+        <h1><a href="../../../index.html">Fedora</a></h1>
       </div>
       <div id="sidebar">
-	<div id="nav">
-	  <ul>
-	    <li id="nav"><a href="/legal/licenses/">About Fedora Licenses</a></li>
-	    <li id="nav"><a href="/legal/trademarks/">About Fedora Trademarks</a>
-	      <ul>
-		<li id="nav"><a href="page2.html">Protection of Trademarks</a></li>
-		<li id="nav"><a href="page3.html">"Fair Use" of Trademarks</a></li>
-		<li id="nav"><a href="page4.html">Use of Fedora™ Trademark</a></li>
-		<li id="nav"><a href="page5.html">Publishing and Marketing
-		    Fedora™ Software That Has Been Modified</a></li>
-		<li id="nav"><a href="page6.html">Authorized FTP or Electronic Download Sites</a></li>
-		<li id="nav"><a href="page7.html">Conclusion</a></li>
-	      </ul>
-	    </li>
-	  </ul>
-	</div>
+        <div class="nav">
+          <ul>
+            <li><a href="../../licenses/">About Fedora Licenses</a></li>
+            <li><a href="../../trademarks/">About Fedora Trademarks</a>
+            <ul>
+              <li><a href="page2.html">Protection of Trademarks</a></li>
+              <li><a href="page3.html">“Fair Use” of Trademarks</a></li>
+              <li><a href="page4.html">Use of Fedora™ Trademark</a></li>
+              <li><a href="page5.html">Publishing and Marketing
+                Fedora™ Software That Has Been Modified</a></li>
+              <li><a href="page6.html">Authorized FTP or Electronic Download Sites</a></li>
+              <li><a href="page7.html">Conclusion</a></li>
+            </ul>
+            </li>
+          </ul>
+        </div>
       </div>
       <div id="content">
-        <h1>Fedora Trademark Guidelines</h1> 
-	
-	<h2>Authorized FTP or Electronic Download Sites</h2>
+        <h2>Fedora Trademark Guidelines</h2> 
 
-	<p>If you have requested from the Fedora Project the ability to
-	serve as an FTP or other electronic download site, you have
-	permission to identify the download using the Fedora™
-	trademark. If you are using the Fedora™ mark to identify
-	the download, we ask that you also display the following
-	statement: "This distribution of Fedora™ is subject to
-	Fedora's End User License Agreement which may be found at <a
-	href="http://fedoraproject.org/legal/licenses">http://fedoraproject.org/legal/licenses</a>.
-	Of course, you are always permitted to redistribute the code
-	without utilizing the Fedora™ trademark so long as you
-	otherwise comply with the GNU General Public License and
-	Fedora's Trademark Guidelines. Please bear in mind that you are
-	solely responsible for ensuring that the download you provide
-	contains no modifications from the software you obtained
-	directly from the Fedora Project.</p>
+        <h3>Authorized FTP or Electronic Download Sites</h3>
 
-	<div class="doc-nav">
-	  <a href="page5.html" accesskey="b" id="doc-nav-left">Back</a>
-	  <a href="./" accesskey="h" id="doc-nav">Home</a>
-	  <a href="page7.html" accesskey="n" id="doc-nav-right">Next</a>
-	</div>
+        <p>If you have requested from the Fedora Project the ability to
+        serve as an FTP or other electronic download site, you have
+        permission to identify the download using the Fedora™
+        trademark. If you are using the Fedora™ mark to identify
+        the download, we ask that you also display the following
+        statement: “This distribution of Fedora™ is subject to
+        Fedora’s End User License Agreement which may be found at <a
+          href="http://fedoraproject.org/legal/licenses">http://fedoraproject.org/legal/licenses</a>.”
+        Of course, you are always permitted to redistribute the code
+        without utilizing the Fedora™ trademark so long as you
+        otherwise comply with the GNU General Public License and
+        Fedora’s Trademark Guidelines. Please bear in mind that you are
+        solely responsible for ensuring that the download you provide
+        contains no modifications from the software you obtained
+        directly from the Fedora Project.</p>
+
+        <div class="doc-nav">
+          <a href="page5.html" accesskey="b" id="doc-nav-left">Back</a>
+          <a href="./" accesskey="h" id="doc-nav">Home</a>
+          <a href="page7.html" accesskey="n" id="doc-nav-right">Next</a>
+        </div>
       </div>
     </div>
     <div id="bottom">
       <div id="footer">
-	<p class="copy">
-	  Copyright © 2007 Red Hat, Inc. and others.  All Rights Reserved.
-	  Please send any comments or corrections to the <a href="mailto:webmaster at fedoraproject.org">websites team</a>.
-	</p>
-	<p class="disclaimer">
-	  The Fedora Project is maintained and driven by the community
-	  and sponsored by Red Hat.  This is a community maintained
-	  site.  Red Hat is not responsible for content.</p>
-	<ul>
-	  <li class="first"><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
-	  <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
-	</ul>
+        <p class="copy">
+        Copyright © 2007 Red Hat, Inc. and others.  All Rights Reserved.
+        Please send any comments or corrections to the <a href="mailto:webmaster at fedoraproject.org">websites team</a>.
+        </p>
+        <p class="disclaimer">
+        The Fedora Project is maintained and driven by the community
+        and sponsored by Red Hat.  This is a community maintained
+        site.  Red Hat is not responsible for content.</p>
+        <ul>
+          <li class="first"><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
+          <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
+        </ul>
       </div>
     </div>
   </body>


Index: page7.html
===================================================================
RCS file: /cvs/fedora/web/static/F-7/legal/trademarks/guidelines/page7.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- page7.html	26 Jun 2007 07:39:33 -0000	1.2
+++ page7.html	26 Jun 2007 15:54:19 -0000	1.3
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>Fedora Project</title>
-    <link rel="stylesheet" type="text/css" media="all" href="http://fedoraproject.org/style.css" />
+    <link rel="stylesheet" type="text/css" media="all" href="../../../style.css" />
     <!--[if lt IE 7]>
     <style type="text/css">
       #wrapper
@@ -15,56 +15,56 @@
   <body class="home">
     <div id="wrapper">
       <div id="head">
-        <h1><a href="index.html">Fedora</a></h1>
+        <h1><a href="../../../index.html">Fedora</a></h1>
       </div>
       <div id="sidebar">
-	<div id="nav">
-	  <ul>
-	    <li id="nav"><a href="/legal/licenses/">About Fedora Licenses</a></li>
-	    <li id="nav"><a href="/legal/trademarks/">About Fedora Trademarks</a>
-	      <ul>
-		<li id="nav"><a href="page2.html">Protection of Trademarks</a></li>
-		<li id="nav"><a href="page3.html">"Fair Use" of Trademarks</a></li>
-		<li id="nav"><a href="page4.html">Use of Fedora™ Trademark</a></li>
-		<li id="nav"><a href="page5.html">Publishing and Marketing
-		    Fedora™ Software That Has Been Modified</a></li>
-		<li id="nav"><a href="page6.html">Authorized FTP or Electronic Download Sites</a></li>
-		<li id="nav"><a href="page7.html">Conclusion</a></li>
-	      </ul>
-	    </li>
-	  </ul>
-	</div>
+        <div class="nav">
+          <ul>
+            <li><a href="../../licenses/">About Fedora Licenses</a></li>
+            <li><a href="../../trademarks/">About Fedora Trademarks</a>
+            <ul>
+              <li><a href="page2.html">Protection of Trademarks</a></li>
+              <li><a href="page3.html">"Fair Use" of Trademarks</a></li>
+              <li><a href="page4.html">Use of Fedora™ Trademark</a></li>
+              <li><a href="page5.html">Publishing and Marketing
+                Fedora™ Software That Has Been Modified</a></li>
+              <li><a href="page6.html">Authorized FTP or Electronic Download Sites</a></li>
+              <li><a href="page7.html">Conclusion</a></li>
+            </ul>
+            </li>
+          </ul>
+        </div>
       </div>
       <div id="content">
         <h1>Fedora Trademark Guidelines</h1>
 
-	<h2>Conclusion</h2>
-	
-	<p>This document is designed to assist both publishers of
-	  Linux-based products and consumers of those products.  If you
-	  are aware of violations of them, please contact us at <a
-	  href="mailto:trademarks at redhat.com">trademarks at redhat.com</a>.</p>
-	
-	<div class="doc-nav">
-	  <a href="page6.html" accesskey="b" id="doc-nav-left">Back</a>
-	  <a href="./" accesskey="h" id="doc-nav">Home</a>
-	</div>
+        <h2>Conclusion</h2>
+
+        <p>This document is designed to assist both publishers of
+        Linux-based products and consumers of those products.  If you
+        are aware of violations of them, please contact us at <a
+          href="mailto:trademarks at redhat.com">trademarks at redhat.com</a>.</p>
+
+        <div class="doc-nav">
+          <a href="page6.html" accesskey="b" id="doc-nav-left">Back</a>
+          <a href="./" accesskey="h" id="doc-nav">Home</a>
+        </div>
       </div>
     </div>
     <div id="bottom">
       <div id="footer">
-	<p class="copy">
-	  Copyright © 2007 Red Hat, Inc. and others.  All Rights Reserved.
-	  Please send any comments or corrections to the <a href="mailto:webmaster at fedoraproject.org">websites team</a>.
-	</p>
-	<p class="disclaimer">
-	  The Fedora Project is maintained and driven by the community
-	  and sponsored by Red Hat.  This is a community maintained
-	  site.  Red Hat is not responsible for content.</p>
-	<ul>
-	  <li class="first"><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
-	  <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
-	</ul>
+        <p class="copy">
+        Copyright © 2007 Red Hat, Inc. and others.  All Rights Reserved.
+        Please send any comments or corrections to the <a href="mailto:webmaster at fedoraproject.org">websites team</a>.
+        </p>
+        <p class="disclaimer">
+        The Fedora Project is maintained and driven by the community
+        and sponsored by Red Hat.  This is a community maintained
+        site.  Red Hat is not responsible for content.</p>
+        <ul>
+          <li class="first"><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li>
+          <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li>
+        </ul>
       </div>
     </div>
   </body>




More information about the Fedora-websites-list mailing list