Author: ricky Update of /cvs/fedora/web/static/F-7/legal/licenses In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31712/legal/licenses Modified Files: beta_eula.html eula.html index.html Log Message: Huge legal/ cleanup- fixed invalid HTML, made all links relative, other misc changes Index: beta_eula.html =================================================================== RCS file: /cvs/fedora/web/static/F-7/legal/licenses/beta_eula.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- beta_eula.html 26 Jun 2007 07:39:33 -0000 1.3 +++ beta_eula.html 26 Jun 2007 15:54:18 -0000 1.4 @@ -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,151 +15,151 @@ <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> - <ul> - <li id="nav"><a href="eula.html">Fedora™ Release</a></li> - <li id="nav"><a href="beta_eula.html">Fedora™ Test Release</a></li> - </ul> - </li> - <li id="nav"><a href="/legal/trademarks/">About Fedora Trademarks</a></li> - </ul> - </div> + <div class="nav"> + <ul> + <li><a href="/legal/licenses/">About Fedora Licenses</a> + <ul> + <li><a href="eula.html">Fedora™ Release</a></li> + <li><a href="beta_eula.html">Fedora™ Test Release</a></li> + </ul> + </li> + <li><a href="/legal/trademarks/">About Fedora Trademarks</a></li> + </ul> + </div> </div> <div id="content"> - <h1>LICENSE AGREEMENT FEDORA™ TEST RELEASE</h1> + <h2>LICENSE AGREEMENT FEDORA™ TEST RELEASE</h2> - <p>This agreement governs the download, installation or use of - the Software (as defined below) and any updates to the - Software, regardless of the delivery mechanism. The Software - is a collective work under U.S. Copyright Law. Subject to - the following terms, Fedora Project grants to the user - (“User”) a license to this collective work - pursuant to the GNU General Public License. By downloading, - installing or using the Software, User agrees to the terms of - this agreement.</p> - - <p><b>1. The Software.</b> Fedora (the - “Software”) is a modular Linux operating system - consisting of hundreds of software components. The end user - license agreement for each component is located in the - component's source code. With the exception of certain image - files containing the Fedora trademark identified in Section 2 - below, the license terms for the components permit User to - copy, modify, and redistribute the component, in both source - code and binary code forms. This agreement does not limit - User's rights under, or grant User rights that supersede, the - license terms of any particular component. </p> - - <p><b>2. Intellectual Property Rights.</b> The Software and - each of its components, including the source code, - documentation, appearance, structure and organization are - copyrighted by Fedora Project and others and are protected - under copyright and other laws. Title to the Software and any - component, or to any copy, modification, or merged portion - shall remain with the aforementioned, subject to the - applicable license. The “Fedora” trademark is a - trademark of Red Hat, Inc. (“Red Hat”) in the - U.S. and other countries and is used by permission. This - agreement permits User to distribute unmodified copies of - Software using the Fedora trademark on the condition that User - follows Red Hat's trademark guidelines located at <a - href="http://fedoraproject.org/legal">http://fedoraproject.org/legal</a>. - User must abide by these trademark guidelines when - distributing the Software, regardless of whether the Software - has been modified. If User modifies the Software, then User - must replace all images containing the “Fedora” - trademark. Those images are found in the anaconda-images and - fedora-logos packages. Merely deleting these files may - corrupt the Software.</p> - - <p><b>3. Limited Warranty.</b> Except as specifically stated in - this agreement or a license for a particular component, <b>to - the maximum extent permitted under applicable law, the - Software and the components are provided and licensed - “as is” without warranty of any kind, expressed or - implied, including the implied warranties of merchantability, - non-infringement or fitness for a particular purpose.</b> - Neither the Fedora Project nor Red Hat warrants that the - functions contained in the Software will meet User's - requirements or that the operation of the Software will be - entirely error free or appear precisely as described in the - accompanying documentation. User acknowledges that this - Software is not fully tested and that it, and any - documentation, may contain defects, fail to comply with - specifications, produce unintended or erroneous results. - <b>Use of the Software is at User's own risk.</b></p> - - <p><b>4. Limitation of Remedies and Liability. To the maximum - extent permitted by applicable law, Fedora Project and Red Hat - will not be liable to User for any damages, including - incidental or consequential damages, lost profits or lost - savings arising out of the use or inability to use the - Software, even if Fedora Project or Red Hat has been advised - of the possibility of such damages.</b></p> - - <p><b>5. Export Control.</b> As required by U.S. law, User - represents and warrants that it: (a) understands that the - Software is subject to export controls under the U.S. Commerce - Department’s Export Administration Regulations - (“EAR”); (b) is not located in a prohibited - destination country under the EAR or U.S. sanctions - regulations (currently Cuba, Iran, Iraq, Libya, North Korea, - Sudan and Syria); (c) will not export, re-export, or transfer - the Software to any prohibited destination, entity, or - individual without the necessary export license(s) or - authorizations(s) from the U.S. Government; (d) will not use - or transfer the Software for use in any sensitive nuclear, - chemical or biological weapons, or missile technology end-uses - unless authorized by the U.S. Government by regulation or - specific license; (e) understands and agrees that if it is in - the United States and exports or transfers the Software to - eligible end users, it will, as required by EAR Section - 741.17(e), submit semi-annual reports to the Commerce - Department’s Bureau of Industry & Security (BIS), which - include the name and address (including country) of each - transferee; and (f) understands that countries other than the - United States may restrict the import, use, or export of - encryption products and that it shall be solely responsible - for compliance with any such import, use, or export - restrictions.</p> - - <p><b>6. General.</b> If any provision of this agreement is - held to be unenforceable, that shall not affect the - enforceability of the remaining provisions. This agreement - shall be governed by the laws of the State of North Carolina - and of the United States, without regard to any conflict of - laws provisions, except that the United Nations Convention on - the International Sale of Goods shall not apply.</p> - <p> - Copyright © 2007 Red Hat, Inc. and others. All rights - reserved. “Red Hat” and “Fedora” are - trademarks of Red Hat, Inc. “Linux” is a - registered trademark of Linus Torvalds. All other trademarks - are the property of their respective owners. - </p> + <p>This agreement governs the download, installation or use of + the Software (as defined below) and any updates to the + Software, regardless of the delivery mechanism. The Software + is a collective work under U.S. Copyright Law. Subject to + the following terms, Fedora Project grants to the user + (“User”) a license to this collective work + pursuant to the GNU General Public License. By downloading, + installing or using the Software, User agrees to the terms of + this agreement.</p> + + <p><strong>1. The Software.</strong> Fedora (the + “Software”) is a modular Linux operating system + consisting of hundreds of software components. The end user + license agreement for each component is located in the + component’s source code. With the exception of certain image + files containing the Fedora trademark identified in Section 2 + below, the license terms for the components permit User to + copy, modify, and redistribute the component, in both source + code and binary code forms. This agreement does not limit + User’s rights under, or grant User rights that supersede, the + license terms of any particular component. </p> + + <p><strong>2. Intellectual Property Rights.</strong> The Software and + each of its components, including the source code, + documentation, appearance, structure and organization are + copyrighted by Fedora Project and others and are protected + under copyright and other laws. Title to the Software and any + component, or to any copy, modification, or merged portion + shall remain with the aforementioned, subject to the + applicable license. The “Fedora” trademark is a + trademark of Red Hat, Inc. (“Red Hat”) in the + U.S. and other countries and is used by permission. This + agreement permits User to distribute unmodified copies of + Software using the Fedora trademark on the condition that User + follows Red Hat’s trademark guidelines located at <a + href="http://fedoraproject.org/legal">http://fedoraproject.org/legal</a>. + User must abide by these trademark guidelines when + distributing the Software, regardless of whether the Software + has been modified. If User modifies the Software, then User + must replace all images containing the “Fedora” + trademark. Those images are found in the anaconda-images and + fedora-logos packages. Merely deleting these files may + corrupt the Software.</p> + + <p><strong>3. Limited Warranty.</strong> Except as specifically stated in + this agreement or a license for a particular component, <strong>to + the maximum extent permitted under applicable law, the + Software and the components are provided and licensed + “as is” without warranty of any kind, expressed or + implied, including the implied warranties of merchantability, + non-infringement or fitness for a particular purpose.</strong> + Neither the Fedora Project nor Red Hat warrants that the + functions contained in the Software will meet User’s + requirements or that the operation of the Software will be + entirely error free or appear precisely as described in the + accompanying documentation. User acknowledges that this + Software is not fully tested and that it, and any + documentation, may contain defects, fail to comply with + specifications, produce unintended or erroneous results. + <strong>Use of the Software is at User’s own risk.</strong></p> + + <p><strong>4. Limitation of Remedies and Liability. To the maximum + extent permitted by applicable law, Fedora Project and Red Hat + will not be liable to User for any damages, including + incidental or consequential damages, lost profits or lost + savings arising out of the use or inability to use the + Software, even if Fedora Project or Red Hat has been advised + of the possibility of such damages.</strong></p> + + <p><strong>5. Export Control.</strong> As required by U.S. law, User + represents and warrants that it: (a) understands that the + Software is subject to export controls under the U.S. Commerce + Department’s Export Administration Regulations + (“EAR”); (b) is not located in a prohibited + destination country under the EAR or U.S. sanctions + regulations (currently Cuba, Iran, Iraq, Libya, North Korea, + Sudan and Syria); (c) will not export, re-export, or transfer + the Software to any prohibited destination, entity, or + individual without the necessary export license(s) or + authorizations(s) from the U.S. Government; (d) will not use + or transfer the Software for use in any sensitive nuclear, + chemical or biological weapons, or missile technology end-uses + unless authorized by the U.S. Government by regulation or + specific license; (e) understands and agrees that if it is in + the United States and exports or transfers the Software to + eligible end users, it will, as required by EAR Section + 741.17(e), submit semi-annual reports to the Commerce + Department’s Bureau of Industry & Security (BIS), which + include the name and address (including country) of each + transferee; and (f) understands that countries other than the + United States may restrict the import, use, or export of + encryption products and that it shall be solely responsible + for compliance with any such import, use, or export + restrictions.</p> + + <p><strong>6. General.</strong> If any provision of this agreement is + held to be unenforceable, that shall not affect the + enforceability of the remaining provisions. This agreement + shall be governed by the laws of the State of North Carolina + and of the United States, without regard to any conflict of + laws provisions, except that the United Nations Convention on + the International Sale of Goods shall not apply.</p> + <p> + Copyright © 2007 Red Hat, Inc. and others. All rights + reserved. “Red Hat” and “Fedora” are + trademarks of Red Hat, Inc. “Linux” is a + registered trademark of Linus Torvalds. All other trademarks + are the property of their respective owners. + </p> </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@xxxxxxxxxxxxxxxxx">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@xxxxxxxxxxxxxxxxx">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: eula.html =================================================================== RCS file: /cvs/fedora/web/static/F-7/legal/licenses/eula.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- eula.html 26 Jun 2007 07:39:33 -0000 1.3 +++ eula.html 26 Jun 2007 15:54:18 -0000 1.4 @@ -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,148 +15,148 @@ <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> - <ul> - <li id="nav"><a href="eula.html">Fedora™ Release</a></li> - <li id="nav"><a href="beta_eula.html">Fedora™ Test Release</a></li> - </ul> - </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> + <ul> + <li><a href="eula.html">Fedora™ Release</a></li> + <li><a href="beta_eula.html">Fedora™ Test Release</a></li> + </ul> + </li> + <li><a href="../trademarks/">About Fedora Trademarks</a></li> + </ul> + </div> </div> <div id="content"> - <h1>LICENSE AGREEMENT FEDORA™</h1> - - <p>This agreement governs the download, installation or use of - the Software (as defined below) and any updates to the - Software, regardless of the delivery mechanism. The Software - is a collective work under U.S. Copyright Law. Subject to the - following terms, Fedora Project grants to the user - (“User”) a license to this collective work - pursuant to the GNU General Public License. By downloading, - installing or using the Software, User agrees to the terms of - this agreement.</p> - - <p><b>1. The Software.</b> Fedora (the - “Software”) is a modular Linux operating system - consisting of hundreds of software components. The end user - license agreement for each component is located in the - component's source code. With the exception of certain image - files containing the Fedora trademark identified in Section 2 - below, the license terms for the components permit User to - copy, modify, and redistribute the component, in both source - code and binary code forms. This agreement does not limit - User's rights under, or grant User rights that supersede, the - license terms of any particular component.</p> - - <p><b>2. Intellectual Property Rights.</b> The Software and - each of its components, including the source code, - documentation, appearance, structure and organization are - copyrighted by Fedora Project and others and are protected - under copyright and other laws. Title to the Software and any - component, or to any copy, modification, or merged portion - shall remain with the aforementioned, subject to the - applicable license. The “Fedora” trademark is a - trademark of Red Hat, Inc. (“Red Hat”) in the - U.S. and other countries and is used by permission. This - agreement permits User to distribute unmodified copies of - Software using the Fedora trademark on the condition that User - follows Red Hat's trademark guidelines located at <a - href="http://fedoraproject.org/legal/">http://fedoraproject.org/legal/</a>. - User must abide by these trademark guidelines when - distributing the Software, regardless of whether the Software - has been modified. If User modifies the Software, then User - must replace all images containing the “Fedora” - trademark. Those images are found in the anaconda-images and - the fedora-logos packages. Merely deleting these files may - corrupt the Software.</p> - - <p><b>3. Limited Warranty.</b> Except as specifically stated in - this agreement or a license for a particular component, <b>to - the maximum extent permitted under applicable law, the - Software and the components are provided and licensed - “as is” without warranty of any kind, expressed or - implied, including the implied warranties of merchantability, - non-infringement or fitness for a particular purpose.</b> - Neither the Fedora Project nor Red Hat warrants that the - functions contained in the Software will meet User's - requirements or that the operation of the Software will be - entirely error free or appear precisely as described in the - accompanying documentation. <b>Use of the Software is at - User's own risk.</b></p> - - <p><b>4. Limitation of Remedies and Liability. To the maximum - extent permitted by applicable law, Fedora Project and Red - Hat will not be liable to User for any damages, including - incidental or consequential damages, lost profits or lost - savings arising out of the use or inability to use the - Software, even if Fedora Project or Red Hat has been advised - of the possibility of such damages.</b></p> - - <p><b>5. Export Control.</b> As required by U.S. law, User - represents and warrants that it: (a) understands that the - Software is subject to export controls under the U.S. Commerce - Department’s Export Administration Regulations - (“EAR”); (b) is not located in a prohibited - destination country under the EAR or U.S. sanctions - regulations (currently Cuba, Iran, Iraq, Libya, North Korea, - Sudan and Syria); (c) will not export, re-export, or transfer - the Software to any prohibited destination, entity, or - individual without the necessary export license(s) or - authorizations(s) from the U.S. Government; (d) will not use - or transfer the Software for use in any sensitive nuclear, - chemical or biological weapons, or missile technology end-uses - unless authorized by the U.S. Government by regulation or - specific license; (e) understands and agrees that if it is in - the United States and exports or transfers the Software to - eligible end users, it will, as required by EAR Section - 741.17(e), submit semi-annual reports to the Commerce - Department’s Bureau of Industry & Security (BIS), - which include the name and address (including country) of each - transferee; and (f) understands that countries other than the - United States may restrict the import, use, or export of - encryption products and that it shall be solely responsible - for compliance with any such import, use, or export - restrictions.</p> - - <p><b>6. General.</b> If any provision of this agreement is held - to be unenforceable, that shall not affect the enforceability - of the remaining provisions. This agreement shall be governed - by the laws of the State of North Carolina and of the United - States, without regard to any conflict of laws provisions, - except that the United Nations Convention on the International - Sale of Goods shall not apply.</p> - - <p> Copyright © 2007 Red Hat Inc. and others. All rights - reserved. "Red Hat" and “Fedora” are - trademarks of Red Hat, Inc. "Linux" is a registered - trademark of Linus Torvalds. All other trademarks are the - property of their respective owners.</p> - </p> + <h2>LICENSE AGREEMENT FEDORA™</h2> + + <p>This agreement governs the download, installation or use of + the Software (as defined below) and any updates to the + Software, regardless of the delivery mechanism. The Software + is a collective work under U.S. Copyright Law. Subject to the + following terms, Fedora Project grants to the user + (“User”) a license to this collective work + pursuant to the GNU General Public License. By downloading, + installing or using the Software, User agrees to the terms of + this agreement.</p> + + <p><strong>1. The Software.</strong> Fedora (the + “Software”) is a modular Linux operating system + consisting of hundreds of software components. The end user + license agreement for each component is located in the + component’s source code. With the exception of certain image + files containing the Fedora trademark identified in Section 2 + below, the license terms for the components permit User to + copy, modify, and redistribute the component, in both source + code and binary code forms. This agreement does not limit + User’s rights under, or grant User rights that supersede, the + license terms of any particular component.</p> + + <p><strong>2. Intellectual Property Rights.</strong> The Software and + each of its components, including the source code, + documentation, appearance, structure and organization are + copyrighted by Fedora Project and others and are protected + under copyright and other laws. Title to the Software and any + component, or to any copy, modification, or merged portion + shall remain with the aforementioned, subject to the + applicable license. The “Fedora” trademark is a + trademark of Red Hat, Inc. (“Red Hat”) in the + U.S. and other countries and is used by permission. This + agreement permits User to distribute unmodified copies of + Software using the Fedora trademark on the condition that User + follows Red Hat’s trademark guidelines located at <a + href="http://fedoraproject.org/legal/">http://fedoraproject.org/legal/</a>. + User must abide by these trademark guidelines when + distributing the Software, regardless of whether the Software + has been modified. If User modifies the Software, then User + must replace all images containing the “Fedora” + trademark. Those images are found in the anaconda-images and + the fedora-logos packages. Merely deleting these files may + corrupt the Software.</p> + + <p><strong>3. Limited Warranty.</strong> Except as specifically stated in + this agreement or a license for a particular component, <strong>to + the maximum extent permitted under applicable law, the + Software and the components are provided and licensed + “as is” without warranty of any kind, expressed or + implied, including the implied warranties of merchantability, + non-infringement or fitness for a particular purpose.</strong> + Neither the Fedora Project nor Red Hat warrants that the + functions contained in the Software will meet User’s + requirements or that the operation of the Software will be + entirely error free or appear precisely as described in the + accompanying documentation. <strong>Use of the Software is at + User’s own risk.</strong></p> + + <p><strong>4. Limitation of Remedies and Liability. To the maximum + extent permitted by applicable law, Fedora Project and Red + Hat will not be liable to User for any damages, including + incidental or consequential damages, lost profits or lost + savings arising out of the use or inability to use the + Software, even if Fedora Project or Red Hat has been advised + of the possibility of such damages.</strong></p> + + <p><strong>5. Export Control.</strong> As required by U.S. law, User + represents and warrants that it: (a) understands that the + Software is subject to export controls under the U.S. Commerce + Department’s Export Administration Regulations + (“EAR”); (b) is not located in a prohibited + destination country under the EAR or U.S. sanctions + regulations (currently Cuba, Iran, Iraq, Libya, North Korea, + Sudan and Syria); (c) will not export, re-export, or transfer + the Software to any prohibited destination, entity, or + individual without the necessary export license(s) or + authorizations(s) from the U.S. Government; (d) will not use + or transfer the Software for use in any sensitive nuclear, + chemical or biological weapons, or missile technology end-uses + unless authorized by the U.S. Government by regulation or + specific license; (e) understands and agrees that if it is in + the United States and exports or transfers the Software to + eligible end users, it will, as required by EAR Section + 741.17(e), submit semi-annual reports to the Commerce + Department’s Bureau of Industry & Security (BIS), + which include the name and address (including country) of each + transferee; and (f) understands that countries other than the + United States may restrict the import, use, or export of + encryption products and that it shall be solely responsible + for compliance with any such import, use, or export + restrictions.</p> + + <p><strong>6. General.</strong> If any provision of this agreement is held + to be unenforceable, that shall not affect the enforceability + of the remaining provisions. This agreement shall be governed + by the laws of the State of North Carolina and of the United + States, without regard to any conflict of laws provisions, + except that the United Nations Convention on the International + Sale of Goods shall not apply.</p> + + <p> Copyright © 2007 Red Hat Inc. and others. All rights + reserved. "Red Hat" and “Fedora” are + trademarks of Red Hat, Inc. "Linux" is a registered + trademark of Linus Torvalds. All other trademarks are the + property of their respective owners.</p> + </p> </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@xxxxxxxxxxxxxxxxx">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@xxxxxxxxxxxxxxxxx">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: index.html =================================================================== RCS file: /cvs/fedora/web/static/F-7/legal/licenses/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:18 -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,51 +15,51 @@ <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 License Agreements</h1> - <p> - Releases of software from the Fedora Project are - covered by an End User License Agreement. The text of some - license agreements may be found below. At this time, all - license agreements shown are governed by the contractual laws - of the State of North Carolina and the intellectual property - laws of the United States of America, unless otherwise - indicated. - </p> - <p> - <ul> - <li><a href="eula.html">Fedora™ Release</a></li> - <li><a href="beta_eula.html">Fedora™ Test Release</a></li> - </ul> - </p> + <h2>Fedora License Agreements</h2> + <p> + Releases of software from the Fedora Project are + covered by an End User License Agreement. The text of some + license agreements may be found below. At this time, all + license agreements shown are governed by the contractual laws + of the State of North Carolina and the intellectual property + laws of the United States of America, unless otherwise + indicated. + </p> + <p> + <ul> + <li><a href="eula.html">Fedora™ Release</a></li> + <li><a href="beta_eula.html">Fedora™ Test Release</a></li> + </ul> + </p> </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@xxxxxxxxxxxxxxxxx">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@xxxxxxxxxxxxxxxxx">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>