svn commit: r49512 - head/en_US.ISO8859-1/htdocs

Thu Oct 13 20:04:37 UTC 2016

Author: hrs
Date: Thu Oct 13 20:04:36 2016
New Revision: 49512
URL: https://svnweb.freebsd.org/changeset/doc/49512

Log:
  Remove old image files and update a link to Foundation's project logo page,
  which now has the latest reusable image files and the terms and conditions.
  
  Discussed with:	deb

Modified:
  head/en_US.ISO8859-1/htdocs/logo.xml

Modified: head/en_US.ISO8859-1/htdocs/logo.xml
==============================================================================

--- head/en_US.ISO8859-1/htdocs/logo.xml	Thu Oct 13 18:48:21 2016	(r49511)
+++ head/en_US.ISO8859-1/htdocs/logo.xml	Thu Oct 13 20:04:36 2016	(r49512)
@@ -6,114 +6,23 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
-      <title>&title;</title>
+    <title>&title;</title>
 
-      <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
-    </head>
+    <cvs:keyword xmlns:cvs="http://www.FreeBSD.org/XML/CVS">$FreeBSD$</cvs:keyword>
+  </head>
 
-    <body class="navinclude.about">
+  <body class="navinclude.about">
 
-  <ul>
-    <li><a href="#guideline">Usage Guideline</a></li>
-    <li><a href="#resource">Resource</a></li>
-    <li><a href="#sample">Sample</a></li>
-  </ul>
+    <h2 id="guideline">Usage Guideline</h2>
 
-  <p></p>
-
-  <h2 id="guideline">Usage Guideline</h2>
-
-  <p>FreeBSD is a registered trademark of The FreeBSD Foundation.  The
-    FreeBSD logo and The Power to Serve are trademarks of The FreeBSD
-    Foundation.</p>
-
-  <p>All images listed under the heading "Resource" are available for
-    use under license from The FreeBSD Foundation.</p>
-
-  <p>For more information on how to obtain permission to use the logo,
-    please refer to the FreeBSD Logo Usage Guidelines at <a
-      href="http://www.freebsdfoundation.org/documents/Guidelines.shtml">The
-    FreeBSD Foundation.</a></p>
-
-  <h2 id="resource">Resource</h2>
-
-  <h3>Standard Logo (fullcolor)</h3>
-
-  <!-- p>Format: <a>Adobe(r) Illustrator(r)</a>, <a>SVG</a>, <a>EPS</a></p -->
-
-  <p><a href="logo/logo-full.png"><img src="logo/logo-full-thumb.png"
-      alt=""/></a></p>
-
-  <h3>Standard Logo (fullcolor for dark background)</h3>
-
-  <!-- p>Format: <a>Adobe(r) Illustrator(r)</a>, <a>SVG</a>, <a>EPS</a></p -->
-
-  <p><a href="logo/logo-reverse.png"><img
-      src="logo/logo-reverse-thumb.png" alt=""/></a></p>
-
-  <!-- h3>Standard Logo (grayscaled)</h3 -->
-
-  <!-- p>Format: <a>Adobe(r) Illustrator(r)</a>, <a>SVG</a>, <a>EPS</a></p -->
-
-  <h3>Standard Logo (black and white)</h3>
-
-  <!-- p>Format: <a>Adobe(r) Illustrator(r)</a>, <a>SVG</a>, <a>EPS</a></p -->
-
-  <p><a href="logo/logo-bw.png"><img src="logo/logo-bw-thumb.png"
-      alt=""/></a></p>
-
-  <h3>Vector formats</h3>
-
-  <p>Format: <a href="logo/logo-basic.ai">Adobe(r) Illustrator(r)</a>,
-    <a href="logo/logo-simple.svg">SVG</a></p>
-
-  <p><a href="logo/logo-basic.png"><img
-    src="logo/logo-basic-thumb.png" alt=""/></a></p>
-
-  <h2 id="sample">Sample</h2>
-
-  <p>NOTE: "free<font color="red">BSD</font>" text in these images
-    were created based on draft version of logo contest.  Correct
-    version of this text should be rendered by one black color, not
-    two colors and first "f" character should be spelled capitalized
-    as "F".</p>
-
-  <h3>CD/DVD package</h3>
-
-  <p><a href="logo/cd.jpg"><img src="logo/cd-thumb.jpg" alt=""/></a></p>
-
-  <h3>Postcard</h3>
-
-  <div><a href="logo/postcard1.jpg"><img style="margin:0.5em;
-    border:2px solid black;" src="logo/postcard1-thumb.jpg"
-    alt=""/></a></div>
-
-  <div style="float:left;"><a href="logo/postcard2.jpg"><img
-    style="margin:0.5em; border:2px solid black;"
-    src="logo/postcard2-thumb.jpg" alt=""/></a></div>
-
-  <div style="float:left;"><a href="logo/postcard3.jpg"><img
-    style="margin:0.5em; border:2px solid black;"
-    src="logo/postcard3-thumb.jpg" alt=""/></a></div>
-
-  <div style="float:left;"><a href="logo/postcard4.jpg"><img
-    style="margin:0.5em; border:2px solid black;"
-    src="logo/postcard4-thumb.jpg" alt=""/></a></div>
-
-  <div style="clear:left;"> </div>
-
-  <h3>Wallpaper</h3>
-
-  <p>Here are sample wallpapers.</p>
-
-  <p><a href="logo/wall1.jpg"><img src="logo/wall1-thumb.jpg"
-      alt=""/></a></p>
-
-  <p><a href="logo/wall2.jpg"><img src="logo/wall2-thumb.jpg"
-      alt=""/></a></p>
-
-  <p><a href="logo/wall3.jpg"><img src="logo/wall3-thumb.jpg"
-      alt=""/></a></p>
+    <p>&os; is a registered trademark of The &os; Foundation.  The
+      &os; logo and The Power to Serve are trademarks of The &os;
+      Foundation.</p>
 
+    <p>For logo image files, Trademark Usage Terms and Conditions, and
+      more information on how to obtain permission to use the logo,
+      please refer to the &os; Project Logo page at <a
+      href="https://www.freebsdfoundation.org/about/project/">The &os;
+      Foundation.</a></p>
   </body>
 </html>
