Author: kwade Update of /cvs/fedora/web/static/F-7/legal/trademarks/guidelines In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11346/trademarks/guidelines Modified Files: index.html page1.html page2.html page3.html page4.html page5.html page6.html page7.html Log Message: fixing HTMl cruft; div container moves fix a broken footer where the sidebar (background) was appearing twice in the footer; thanks Eric Kerby <eric(a)epkphoto.com&gt; for the catch and esp. for the fix, which involves moving #bottom outside of the #wrapper. Index: index.html =================================================================== RCS file: /cvs/fedora/web/static/F-7/legal/trademarks/guidelines/index.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.html 24 Jun 2007 09:19:54 -0000 1.1 +++ index.html 26 Jun 2007 07:39:33 -0000 1.2 @@ -25,7 +25,7 @@ </ul> </div> </div> - <div id="content">Fedora&trade;Fedora&trade; + <div id="content"> <h1>Fedora Trademark Guidelines</h1> <div id="nav"> <ul> @@ -104,21 +104,21 @@ <a href="page1.html" accesskey="n" id="doc-nav-right">Next</a> </div> </div> - <div id="bottom"> - <div id="footer"> - <p class="copy"> - Copyright &copy; 2007 Red Hat, Inc. and others. All Rights Reserved. - Please send any comments or corrections to the <a href="mailto:webmaster@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>&l... - <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines"&... Guidelines</a></li> - </ul> - </div> + </div> + <div id="bottom"> + <div id="footer"> + <p class="copy"> + Copyright &copy; 2007 Red Hat, Inc. and others. All Rights Reserved. + Please send any comments or corrections to the <a href="mailto:webmaster@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>&l... + <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines"&... 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- page1.html 24 Jun 2007 09:19:54 -0000 1.1 +++ page1.html 26 Jun 2007 07:39:33 -0000 1.2 @@ -34,7 +34,7 @@ </ul> </div> </div> - <div id="content">Fedora&trade;Fedora&trade; + <div id="content"> <h2>Fedora Trademark Guidelines</h2> <h3>Basic Introduction</h3> @@ -82,14 +82,15 @@ <a href="page2.html" accesskey="n" id="doc-nav-right">Next</a> </div> </div> - <div id="bottom"> + </div> + <div id="bottom"> <div id="footer"> <p class="copy"> - Copyright &copy; 2007 Red Hat, Inc. and others. All Rights Reserved. - Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>. + Copyright &copy; 2007 Red Hat, Inc. and others. All Rights Reserved. + Please send any comments or corrections to the <a href="mailto:webmaster@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>&l... <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines"&... Guidelines</a></li> Index: page2.html =================================================================== RCS file: /cvs/fedora/web/static/F-7/legal/trademarks/guidelines/page2.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- page2.html 24 Jun 2007 09:19:54 -0000 1.1 +++ page2.html 26 Jun 2007 07:39:33 -0000 1.2 @@ -72,14 +72,15 @@ <a href="page3.html" accesskey="n" id="doc-nav-right">Next</a> </div> </div> - <div id="bottom"> - <div id="footer"> + </div> + <div id="bottom"> + <div id="footer"> <p class="copy"> - Copyright &copy; 2007 Red Hat, Inc. and others. All Rights Reserved. - Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>. + Copyright &copy; 2007 Red Hat, Inc. and others. All Rights Reserved. + Please send any comments or corrections to the <a href="mailto:webmaster@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>&l... <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines"&... Guidelines</a></li> Index: page3.html =================================================================== RCS file: /cvs/fedora/web/static/F-7/legal/trademarks/guidelines/page3.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- page3.html 24 Jun 2007 09:19:54 -0000 1.1 +++ page3.html 26 Jun 2007 07:39:33 -0000 1.2 @@ -67,14 +67,15 @@ <a href="page4.html" accesskey="n" id="doc-nav-right">Next</a> </div> </div> - <div id="bottom"> - <div id="footer"> + </div> + <div id="bottom"> + <div id="footer"> <p class="copy"> - Copyright &copy; 2007 Red Hat, Inc. and others. All Rights Reserved. - Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>. + Copyright &copy; 2007 Red Hat, Inc. and others. All Rights Reserved. + Please send any comments or corrections to the <a href="mailto:webmaster@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>&l... <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines"&... Guidelines</a></li> Index: page4.html =================================================================== RCS file: /cvs/fedora/web/static/F-7/legal/trademarks/guidelines/page4.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- page4.html 24 Jun 2007 09:19:54 -0000 1.1 +++ page4.html 26 Jun 2007 07:39:33 -0000 1.2 @@ -110,22 +110,23 @@ <a href="page5.html" accesskey="n" id="doc-nav-right">Next</a> </div> </div> - <div id="bottom"> - <div id="footer"> - <p class="copy"> - Copyright &copy; 2007 Red Hat, Inc. and others. All Rights Reserved. - Please send any comments or corrections to the <a href="mailto:webmaster@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>&l... - <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines"&... Guidelines</a></li> - </ul> - </div> + </div> + <div id="bottom"> + <div id="footer"> + <p class="copy"> + Copyright &copy; 2007 Red Hat, Inc. and others. All Rights Reserved. + Please send any comments or corrections to the <a href="mailto:webmaster@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>&l... + <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines"&... Guidelines</a></li> + </ul> </div> </div> + </div> </body> </html> Index: page5.html =================================================================== RCS file: /cvs/fedora/web/static/F-7/legal/trademarks/guidelines/page5.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- page5.html 24 Jun 2007 09:19:54 -0000 1.1 +++ page5.html 26 Jun 2007 07:39:33 -0000 1.2 @@ -99,22 +99,23 @@ <a href="page6.html" accesskey="n" id="doc-nav-right">Next</a> </div> </div> - <div id="bottom"> - <div id="footer"> - <p class="copy"> - Copyright &copy; 2007 Red Hat, Inc. and others. All Rights Reserved. - Please send any comments or corrections to the <a href="mailto:webmaster@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>&l... - <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines"&... Guidelines</a></li> - </ul> - </div> + </div> + <div id="bottom"> + <div id="footer"> + <p class="copy"> + Copyright &copy; 2007 Red Hat, Inc. and others. All Rights Reserved. + Please send any comments or corrections to the <a href="mailto:webmaster@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>&l... + <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines"&... Guidelines</a></li> + </ul> </div> </div> + </div> </body> </html> Index: page6.html =================================================================== RCS file: /cvs/fedora/web/static/F-7/legal/trademarks/guidelines/page6.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- page6.html 24 Jun 2007 09:19:54 -0000 1.1 +++ page6.html 26 Jun 2007 07:39:33 -0000 1.2 @@ -62,21 +62,21 @@ <a href="page7.html" accesskey="n" id="doc-nav-right">Next</a> </div> </div> - <div id="bottom"> - <div id="footer"> - <p class="copy"> - Copyright &copy; 2007 Red Hat, Inc. and others. All Rights Reserved. - Please send any comments or corrections to the <a href="mailto:webmaster@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>&l... - <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines"&... Guidelines</a></li> - </ul> - </div> + </div> + <div id="bottom"> + <div id="footer"> + <p class="copy"> + Copyright &copy; 2007 Red Hat, Inc. and others. All Rights Reserved. + Please send any comments or corrections to the <a href="mailto:webmaster@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>&l... + <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines"&... 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- page7.html 24 Jun 2007 09:19:54 -0000 1.1 +++ page7.html 26 Jun 2007 07:39:33 -0000 1.2 @@ -50,21 +50,21 @@ <a href="./" accesskey="h" id="doc-nav">Home</a> </div> </div> - <div id="bottom"> - <div id="footer"> - <p class="copy"> - Copyright &copy; 2007 Red Hat, Inc. and others. All Rights Reserved. - Please send any comments or corrections to the <a href="mailto:webmaster@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>&l... - <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines"&... Guidelines</a></li> - </ul> - </div> + </div> + <div id="bottom"> + <div id="footer"> + <p class="copy"> + Copyright &copy; 2007 Red Hat, Inc. and others. All Rights Reserved. + Please send any comments or corrections to the <a href="mailto:webmaster@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>&l... + <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines"&... Guidelines</a></li> + </ul> </div> </div> </body>