diff --git a/en/logo.sgml b/en/logo.sgml
index 899c929cb3..bbaa558bd9 100644
--- a/en/logo.sgml
+++ b/en/logo.sgml
@@ -1,93 +1,125 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
 <!ENTITY date "$FreeBSD: www/en/logo.sgml,v 1.4 2006/05/23 08:07:01 pav Exp $">
 <!ENTITY title "FreeBSD Logo">
 <!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
 <!ENTITY % developers SYSTEM "developers.sgml"> %developers;
 ]>
 
 <html>
   &header;
 
-    <ul>
-      <li><a href="#GUIDELINE">Usage Guideline</a></li>
-      <li><a href="#RESOURCE">Resource</a></li>
-      <li><a href="#SAMPLE">Sample</a></li>
-    </ul>
-
-    <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-basic.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;">&nbsp;</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>
-
-    &footer;
+  <ul>
+    <li><a href="#GUIDELINE">Usage Guideline</a></li>
+    <li><a href="#RESOURCE">Resource</a></li>
+    <li><a href="#SAMPLE">Sample</a></li>
+  </ul>
+
+  <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-basic.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;">&nbsp;</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>
+
+  &footer;
   </body>
 </html>
 
 <!--
      Local Variables:
      mode: sgml
      sgml-indent-data: t
      sgml-omittag: nil
      sgml-always-quote-attributes: t
      End:
 -->
