[openssl-commits] [web] master update

Rich Salz rsalz at openssl.org
Fri Sep 2 16:10:57 UTC 2016


The branch master has been updated
       via  8749c57308886f250c42d655f7d664b6d322d410 (commit)
      from  7cb880c96d12b96dcdd8cea17076f6a616faaa57 (commit)


- Log -----------------------------------------------------------------
commit 8749c57308886f250c42d655f7d664b6d322d410
Author: Rich Salz <rsalz at akamai.com>
Date:   Fri Sep 2 12:10:29 2016 -0400

    Rename .inc files to .shtml
    
    So that SSI can work and we can properly generate TITLE elements.
    See RT 4668.

-----------------------------------------------------------------------

Summary of changes:
 bin/mk-manpages                          |  6 +++---
 community/binaries.html                  |  8 ++++----
 community/conduct.html                   |  8 ++++----
 community/contacts.html                  |  8 ++++----
 community/getting-started.html           |  8 ++++----
 community/index.html                     |  8 ++++----
 community/mailinglists.html              |  8 ++++----
 community/team.html                      |  8 ++++----
 community/thanks.html                    |  8 ++++----
 docs/faq.html                            | 10 +++++-----
 docs/fips.html                           | 10 +++++-----
 docs/fips/privatelabel.html              |  6 +++---
 docs/fipsnotes.html                      |  8 ++++----
 docs/fipsvalidation.html                 |  8 ++++----
 docs/index.html                          |  8 ++++----
 docs/man1.0.1/apps/index.html            | 10 +++++-----
 docs/man1.0.1/crypto/index.html          | 10 +++++-----
 docs/man1.0.1/index.html                 |  8 ++++----
 docs/man1.0.1/ssl/index.html             | 10 +++++-----
 docs/man1.0.2/apps/index.html            | 10 +++++-----
 docs/man1.0.2/crypto/index.html          | 10 +++++-----
 docs/man1.0.2/index.html                 |  8 ++++----
 docs/man1.0.2/ssl/index.html             | 10 +++++-----
 docs/man1.1.0/apps/index.html            | 10 +++++-----
 docs/man1.1.0/crypto/index.html          | 10 +++++-----
 docs/man1.1.0/index.html                 |  8 ++++----
 docs/man1.1.0/ssl/index.html             | 10 +++++-----
 docs/manmaster/apps/index.html           | 10 +++++-----
 docs/manmaster/crypto/index.html         | 10 +++++-----
 docs/manmaster/index.html                |  8 ++++----
 docs/manmaster/ssl/index.html            | 10 +++++-----
 docs/manpages.html                       |  8 ++++----
 docs/standards.html                      |  8 ++++----
 err404.html                              |  8 ++++----
 inc/{banner.inc => banner.shtml}         |  0
 inc/{footer.inc => footer.shtml}         |  0
 inc/head.inc                             | 28 ----------------------------
 inc/head.shtml                           |  3 +--
 inc/{legalities.inc => legalities.shtml} |  0
 inc/{mansidebar.inc => mansidebar.shtml} |  0
 index.html                               | 12 ++++++------
 news/changelog.html                      | 10 +++++-----
 news/index.html                          |  7 +++----
 news/newslog.html                        | 10 +++++-----
 news/openssl-notes.html.in               | 10 +++++-----
 news/pgpkey.html                         |  7 +++----
 news/vulnerabilities.html                | 10 +++++-----
 policies/cla.html                        |  8 ++++----
 policies/codingstyle.html                |  8 ++++----
 policies/index.html                      |  8 ++++----
 policies/releasestrat.html               |  8 ++++----
 policies/roadmap.html                    |  8 ++++----
 policies/secpolicy.html                  |  8 ++++----
 source/gitrepo.html                      |  8 ++++----
 source/index.html                        | 12 ++++++------
 source/license.html                      |  8 ++++----
 source/mirror.html                       |  8 ++++----
 source/old/0.9.x/index.html              | 12 ++++++------
 source/old/1.0.0/index.html              | 12 ++++++------
 source/old/1.0.1/index.html              | 12 ++++++------
 source/old/1.0.2/index.html              | 12 ++++++------
 source/old/1.1.0/index.html              | 12 ++++++------
 source/old/fips/index.html               | 12 ++++++------
 source/old/index.html                    | 10 +++++-----
 support/acks.html                        |  8 ++++----
 support/contracts.html                   |  8 ++++----
 support/donations.html                   |  8 ++++----
 support/index.html                       |  8 ++++----
 template-file.html                       |  8 ++++----
 69 files changed, 284 insertions(+), 315 deletions(-)
 rename inc/{banner.inc => banner.shtml} (100%)
 rename inc/{footer.inc => footer.shtml} (100%)
 delete mode 100644 inc/head.inc
 rename inc/{legalities.inc => legalities.shtml} (100%)
 rename inc/{mansidebar.inc => mansidebar.shtml} (100%)

diff --git a/bin/mk-manpages b/bin/mk-manpages
index a605436..3884a6a 100755
--- a/bin/mk-manpages
+++ b/bin/mk-manpages
@@ -226,9 +226,9 @@ sub htmlHeader {
     return <<EOFH;
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -284,7 +284,7 @@ sub htmlFooter {
       $sidebar
     </div>
   </div>
-  <!--#include virtual="/inc/footer.inc" -->
+  <!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 EOFT
diff --git a/community/binaries.html b/community/binaries.html
index 6773bc3..ef9d407 100644
--- a/community/binaries.html
+++ b/community/binaries.html
@@ -1,10 +1,10 @@
 
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -29,11 +29,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/community/conduct.html b/community/conduct.html
index 9b8c2d0..e0bea4f 100644
--- a/community/conduct.html
+++ b/community/conduct.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
 <div id="main">
   <div id="content">
@@ -41,11 +41,11 @@
 	</footer>
       </article>
     </div>
-    <!--#include virtual="sidebar.inc" -->
+    <!--#include virtual="sidebar.shtml" -->
   </div>
 </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/community/contacts.html b/community/contacts.html
index 6f77339..88e01f7 100644
--- a/community/contacts.html
+++ b/community/contacts.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
 <div id="main">
   <div id="content">
@@ -96,11 +96,11 @@
 	</footer>
       </article>
     </div>
-    <!--#include virtual="sidebar.inc" -->
+    <!--#include virtual="sidebar.shtml" -->
   </div>
 </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/community/getting-started.html b/community/getting-started.html
index c02b288..d9d695b 100644
--- a/community/getting-started.html
+++ b/community/getting-started.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -96,9 +96,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/community/index.html b/community/index.html
index 980dd21..a9fe68f 100644
--- a/community/index.html
+++ b/community/index.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -82,11 +82,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/community/mailinglists.html b/community/mailinglists.html
index 1ffb8b0..7da8086 100644
--- a/community/mailinglists.html
+++ b/community/mailinglists.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -99,11 +99,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/community/team.html b/community/team.html
index ca8eda9..adde487 100644
--- a/community/team.html
+++ b/community/team.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
 <div id="main">
   <div id="content">
@@ -169,9 +169,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-  <!--#include virtual="/inc/footer.inc" -->
+  <!--#include virtual="/inc/footer.shtml" -->
   </body>
   </html>
diff --git a/community/thanks.html b/community/thanks.html
index b7a44a9..9a7e52c 100644
--- a/community/thanks.html
+++ b/community/thanks.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -83,11 +83,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/docs/faq.html b/docs/faq.html
index 6f4be47..7f5f039 100644
--- a/docs/faq.html
+++ b/docs/faq.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -11,7 +11,7 @@
 	<article>
 	  <header><h2>Frequently Asked Questions</h2></header>
 	  <div class="entry-content">
-	    <!--#include virtual="faq.inc" -->
+	    <!--#include virtual="faq.shtml" -->
 	  </div>
 	  <footer>
 	    You are here: <a href="/">Home</a>
@@ -21,11 +21,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/docs/fips.html b/docs/fips.html
index 84be232..23fddbe 100644
--- a/docs/fips.html
+++ b/docs/fips.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -46,7 +46,7 @@
 		<td>Date  </td>
 		<td>File </td>
 	      </tr>
-	      <!--#include virtual="fips.inc" -->
+	      <!--#include virtual="fips.shtml" -->
 	    </table>
 	    <p> </p>
 
@@ -59,9 +59,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/docs/fips/privatelabel.html b/docs/fips/privatelabel.html
index ab13f0b..5262215 100644
--- a/docs/fips/privatelabel.html
+++ b/docs/fips/privatelabel.html
@@ -2,9 +2,9 @@
 <!-- THIS FILE IS OUTDATED.  THE INFORMATION HERE IS IN THE FIPS.HTML
      FILE.  THIS FILE EXISTS SO OLD LINKS STILL WORK. -->
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -128,6 +128,6 @@
       </div>
     </div>
   </div>
-  <!--#include virtual="/inc/footer.inc" -->
+  <!--#include virtual="/inc/footer.shtml" -->
   </body>
   </html>
diff --git a/docs/fipsnotes.html b/docs/fipsnotes.html
index ec9a39c..dfc50e3 100644
--- a/docs/fipsnotes.html
+++ b/docs/fipsnotes.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -125,9 +125,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/docs/fipsvalidation.html b/docs/fipsvalidation.html
index 5bfc1a5..4b36886 100644
--- a/docs/fipsvalidation.html
+++ b/docs/fipsvalidation.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -113,9 +113,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/docs/index.html b/docs/index.html
index 7a41609..f3f1b66 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -44,11 +44,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/docs/man1.0.1/apps/index.html b/docs/man1.0.1/apps/index.html
index 17c5e92..e3e09b5 100644
--- a/docs/man1.0.1/apps/index.html
+++ b/docs/man1.0.1/apps/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date  </td>
 		<td>File </td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p> </p>
 
@@ -36,10 +36,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/man1.0.1/crypto/index.html b/docs/man1.0.1/crypto/index.html
index d25091b..2919701 100644
--- a/docs/man1.0.1/crypto/index.html
+++ b/docs/man1.0.1/crypto/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date  </td>
 		<td>File </td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p> </p>
 
@@ -36,9 +36,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/docs/man1.0.1/index.html b/docs/man1.0.1/index.html
index 580c87f..4d250a7 100644
--- a/docs/man1.0.1/index.html
+++ b/docs/man1.0.1/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -30,10 +30,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/man1.0.1/ssl/index.html b/docs/man1.0.1/ssl/index.html
index afc66b7..bf88125 100644
--- a/docs/man1.0.1/ssl/index.html
+++ b/docs/man1.0.1/ssl/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date  </td>
 		<td>File </td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p> </p>
 
@@ -36,10 +36,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/man1.0.2/apps/index.html b/docs/man1.0.2/apps/index.html
index 21b3d91..f719989 100644
--- a/docs/man1.0.2/apps/index.html
+++ b/docs/man1.0.2/apps/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date  </td>
 		<td>File </td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p> </p>
 
@@ -36,10 +36,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/man1.0.2/crypto/index.html b/docs/man1.0.2/crypto/index.html
index faf5b1c..7974fb7 100644
--- a/docs/man1.0.2/crypto/index.html
+++ b/docs/man1.0.2/crypto/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date  </td>
 		<td>File </td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p> </p>
 
@@ -36,9 +36,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/docs/man1.0.2/index.html b/docs/man1.0.2/index.html
index 34b0fdb..c789469 100644
--- a/docs/man1.0.2/index.html
+++ b/docs/man1.0.2/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -30,10 +30,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/man1.0.2/ssl/index.html b/docs/man1.0.2/ssl/index.html
index e0c0864..80e2bd8 100644
--- a/docs/man1.0.2/ssl/index.html
+++ b/docs/man1.0.2/ssl/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date  </td>
 		<td>File </td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p> </p>
 
@@ -36,10 +36,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/man1.1.0/apps/index.html b/docs/man1.1.0/apps/index.html
index e54abd1..42f2879 100644
--- a/docs/man1.1.0/apps/index.html
+++ b/docs/man1.1.0/apps/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date  </td>
 		<td>File </td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p> </p>
 
@@ -36,10 +36,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/man1.1.0/crypto/index.html b/docs/man1.1.0/crypto/index.html
index 64af490..d1b69d6 100644
--- a/docs/man1.1.0/crypto/index.html
+++ b/docs/man1.1.0/crypto/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date  </td>
 		<td>File </td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p> </p>
 
@@ -36,9 +36,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/docs/man1.1.0/index.html b/docs/man1.1.0/index.html
index dc447be..3d41a80 100644
--- a/docs/man1.1.0/index.html
+++ b/docs/man1.1.0/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -30,10 +30,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/man1.1.0/ssl/index.html b/docs/man1.1.0/ssl/index.html
index 5bad03b..33ed9e7 100644
--- a/docs/man1.1.0/ssl/index.html
+++ b/docs/man1.1.0/ssl/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date  </td>
 		<td>File </td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p> </p>
 
@@ -36,10 +36,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/manmaster/apps/index.html b/docs/manmaster/apps/index.html
index afda6dd..951f0b8 100644
--- a/docs/manmaster/apps/index.html
+++ b/docs/manmaster/apps/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date  </td>
 		<td>File </td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p> </p>
 
@@ -36,10 +36,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/manmaster/crypto/index.html b/docs/manmaster/crypto/index.html
index 74414a0..4d49c02 100644
--- a/docs/manmaster/crypto/index.html
+++ b/docs/manmaster/crypto/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date  </td>
 		<td>File </td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p> </p>
 
@@ -36,9 +36,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/docs/manmaster/index.html b/docs/manmaster/index.html
index b9d39b8..beac148 100644
--- a/docs/manmaster/index.html
+++ b/docs/manmaster/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -30,10 +30,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/manmaster/ssl/index.html b/docs/manmaster/ssl/index.html
index 1001761..457466c 100644
--- a/docs/manmaster/ssl/index.html
+++ b/docs/manmaster/ssl/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -21,7 +21,7 @@
 		<td>Date  </td>
 		<td>File </td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p> </p>
 
@@ -36,10 +36,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="/inc/mansidebar.inc" -->
+      <!--#include virtual="/inc/mansidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/manpages.html b/docs/manpages.html
index c9cf0f3..dfe2242 100644
--- a/docs/manpages.html
+++ b/docs/manpages.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -27,10 +27,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/docs/standards.html b/docs/standards.html
index 9234652..fca0e39 100644
--- a/docs/standards.html
+++ b/docs/standards.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -201,10 +201,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
 
diff --git a/err404.html b/err404.html
index 4dc6b1e..5035194 100644
--- a/err404.html
+++ b/err404.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
   <div id="content">
@@ -31,11 +31,11 @@
 	</footer>
       </article>
     </div>
-    <!--#include virtual="sidebar.inc" -->
+    <!--#include virtual="sidebar.shtml" -->
   </div>
 </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/inc/banner.inc b/inc/banner.shtml
similarity index 100%
rename from inc/banner.inc
rename to inc/banner.shtml
diff --git a/inc/footer.inc b/inc/footer.shtml
similarity index 100%
rename from inc/footer.inc
rename to inc/footer.shtml
diff --git a/inc/head.inc b/inc/head.inc
deleted file mode 100644
index f0a017e..0000000
--- a/inc/head.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- head.inc -->
-  <!--#config errmsg="OpenSSL" -->
-  <title>
-  <!--#echo var="$TITLE" -->
-  </title>
-  <meta charset="utf-8">
-  <meta name="author" content="OpenSSL Foundation, Inc.">
-  <meta name="HandheldFriendly" content="True">
-  <meta name="MobileOptimized" content="320">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-  <link rel="canonical" href="https://www.openssl.org/">
-  <link href="/favicon.ico" rel="icon">
-  <link href="/inc/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
-
-  <script src="/inc/modernizr-2.0.js"></script>
-  <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-  <script>!window.jQuery && document.write(unescape('%3Cscript src="./inc/libs/jquery.min.js"%3E%3C/script%3E'))</script>
-  <script src="/inc/octopress.js" type="text/javascript"></script>
-
-  <link href="//fonts.googleapis.com/css?family=PT+Serif:regular,italic,bold,bolditalic" rel="stylesheet" type="text/css">
-  <link href="//fonts.googleapis.com/css?family=PT+Sans:regular,italic,bold,bolditalic" rel="stylesheet" type="text/css">
-
-  <!--[if lt IE 9]>
-    <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-  <![endif]-->
-<!-- end -->
diff --git a/inc/head.shtml b/inc/head.shtml
index 7443fee..c988fe8 100644
--- a/inc/head.shtml
+++ b/inc/head.shtml
@@ -1,7 +1,6 @@
 <!-- head.inc -->
-  <!--#config errmsg="OpenSSL" -->
   <title>
-  <!--#echo var="TITLE" -->
+  <!--#echo var="DOCUMENT_URI"" -->
   </title>
   <meta charset="utf-8">
   <meta name="author" content="OpenSSL Foundation, Inc.">
diff --git a/inc/legalities.inc b/inc/legalities.shtml
similarity index 100%
rename from inc/legalities.inc
rename to inc/legalities.shtml
diff --git a/inc/mansidebar.inc b/inc/mansidebar.shtml
similarity index 100%
rename from inc/mansidebar.inc
rename to inc/mansidebar.shtml
diff --git a/index.html b/index.html
index d1cfe46..d12161a 100644
--- a/index.html
+++ b/index.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
   <div id="content">
@@ -33,12 +33,12 @@
 
 	  <h3>Latest News</h3>
 	  <table class="newsflash" width="90%">
-	    <!--#include virtual="newsflash.inc"-->
+	    <!--#include virtual="newsflash.shtml"-->
 	    <tr><td class="d"><a href="news">More...</a></td><td class="t"></td></tr>
 	  </table>
 	  <p> </p>
 
-	  <!--#include virtual="/inc/legalities.inc" -->
+	  <!--#include virtual="/inc/legalities.shtml" -->
 
 	</div>
 	<footer>
@@ -47,11 +47,11 @@
 	</footer>
       </article>
     </div>
-    <!--#include virtual="sidebar.inc" -->
+    <!--#include virtual="sidebar.shtml" -->
   </div>
 </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/news/changelog.html b/news/changelog.html
index a19b08d..05d85ac 100644
--- a/news/changelog.html
+++ b/news/changelog.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -33,7 +33,7 @@
               <li><a href="cl102.txt">1.0.2</a></li>
               <li><a href="cl110.txt">1.1.0</a></li>
             </ul>
-	    <!--#include virtual="changelog.inc" -->
+	    <!--#include virtual="changelog.shtml" -->
 	  </div>
 	  <footer>
 	    You are here: <a href="/">Home</a>
@@ -43,11 +43,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/news/index.html b/news/index.html
index 7273180..d01858a 100644
--- a/news/index.html
+++ b/news/index.html
@@ -1,10 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#set var="TITLE" value="News" -->
 <!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -37,11 +36,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/news/newslog.html b/news/newslog.html
index 942c80e..07c6b54 100644
--- a/news/newslog.html
+++ b/news/newslog.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -14,7 +14,7 @@
 	    They are almost release notices.
 	    </p>
 	    <table class="newsflash" width="90%">
-	      <!--#include virtual="newsflash.inc"-->
+	      <!--#include virtual="newsflash.shtml"-->
 	    </table>
 	  </div>
 	  <footer>
@@ -25,9 +25,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/news/openssl-notes.html.in b/news/openssl-notes.html.in
index 1376da6..ce5c9c5 100644
--- a/news/openssl-notes.html.in
+++ b/news/openssl-notes.html.in
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -22,7 +22,7 @@
 	    More details can be found in the <a href="changelog.html">ChangeLog</a>.
 	    </p>
 
-	    <!--#include virtual="openssl- at VERSION@-notes.inc" -->
+	    <!--#include virtual="openssl- at VERSION@-notes.shtml" -->
 	  </div>
 	  <footer>
 	    You are here: <a href="/">Home</a>
@@ -31,11 +31,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/news/pgpkey.html b/news/pgpkey.html
index 7258680..492a80d 100644
--- a/news/pgpkey.html
+++ b/news/pgpkey.html
@@ -1,9 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#set var="TITLE" value="$DOCUMENT_URI" -->
 <!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -30,9 +29,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/news/vulnerabilities.html b/news/vulnerabilities.html
index fa66b41..8760693 100644
--- a/news/vulnerabilities.html
+++ b/news/vulnerabilities.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -24,7 +24,7 @@
             as discussed in our
             <a href="/policies/secpolicy.html">Security Policy</a>.
 	    </p>
-            <!--#include virtual="vulnerabilities.inc" -->
+            <!--#include virtual="vulnerabilities.shtml" -->
 	    </p>
 	  </div>
 	  <footer>
@@ -35,11 +35,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/policies/cla.html b/policies/cla.html
index e9526bc..1e6e297 100644
--- a/policies/cla.html
+++ b/policies/cla.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -68,11 +68,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/policies/codingstyle.html b/policies/codingstyle.html
index 70a417e..78f5e66 100644
--- a/policies/codingstyle.html
+++ b/policies/codingstyle.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -29,11 +29,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/policies/index.html b/policies/index.html
index 51187d2..d63090d 100644
--- a/policies/index.html
+++ b/policies/index.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -62,11 +62,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/policies/releasestrat.html b/policies/releasestrat.html
index 71b7353..acbaedf 100644
--- a/policies/releasestrat.html
+++ b/policies/releasestrat.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
 <div id="main">
   <div id="content">
@@ -116,11 +116,11 @@
 	</footer>
       </article>
     </div>
-    <!--#include virtual="sidebar.inc" -->
+    <!--#include virtual="sidebar.shtml" -->
   </div>
 </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/policies/roadmap.html b/policies/roadmap.html
index 5659938..133584a 100644
--- a/policies/roadmap.html
+++ b/policies/roadmap.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
 <div id="main">
   <div id="content">
@@ -410,11 +410,11 @@
 	</footer>
       </article>
     </div>
-    <!--#include virtual="sidebar.inc" -->
+    <!--#include virtual="sidebar.shtml" -->
   </div>
 </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/policies/secpolicy.html b/policies/secpolicy.html
index c17f08a..5dbd624 100644
--- a/policies/secpolicy.html
+++ b/policies/secpolicy.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -205,10 +205,10 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-  <!--#include virtual="/inc/footer.inc" -->
+  <!--#include virtual="/inc/footer.shtml" -->
   </body>
   </html>
 
diff --git a/source/gitrepo.html b/source/gitrepo.html
index 92ea47a..2b9b603 100644
--- a/source/gitrepo.html
+++ b/source/gitrepo.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -66,11 +66,11 @@ $ git checkout .
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/source/index.html b/source/index.html
index 5c1fa5a..4b245bb 100644
--- a/source/index.html
+++ b/source/index.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -44,7 +44,7 @@
 		<td>Date  </td>
 		<td>File </td>
 	      </tr>
-	      <!--#include virtual="index.inc" -->
+	      <!--#include virtual="index.shtml" -->
 	    </table>
 	    <p> </p>
 
@@ -61,7 +61,7 @@
 	    want to keep yourself up-to-date please clone the git repository
 	    instead.</p>
 
-	  <!--#include virtual="/inc/legalities.inc" -->
+	  <!--#include virtual="/inc/legalities.shtml" -->
 	  </div>
 	  <footer>
 	    You are here: <a href="/">Home</a>
@@ -71,11 +71,11 @@
 
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/source/license.html b/source/license.html
index a2ce2e4..851b39e 100644
--- a/source/license.html
+++ b/source/license.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -30,9 +30,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
diff --git a/source/mirror.html b/source/mirror.html
index 8b084bb..ecfa1c0 100644
--- a/source/mirror.html
+++ b/source/mirror.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -53,11 +53,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/source/old/0.9.x/index.html b/source/old/0.9.x/index.html
index f66199b..9bb3e77 100644
--- a/source/old/0.9.x/index.html
+++ b/source/old/0.9.x/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 <div id="main">
   <div id="content">
     <div class="blog-index">
@@ -16,10 +16,10 @@
               <td>Date  </td>
               <td>File </td>
             </tr>
-            <!--#include virtual="index.inc" -->
+            <!--#include virtual="index.shtml" -->
           </table>
           <p> </p>
-          <!--#include virtual="/inc/legalities.inc" -->
+          <!--#include virtual="/inc/legalities.shtml" -->
         </div>
         <footer>
           You are here: <a href="/">Home</a>
@@ -30,10 +30,10 @@
         </footer>
       </article>
     </div>
-    <!--#include virtual="../../sidebar.inc" -->
+    <!--#include virtual="../../sidebar.shtml" -->
   </div>
 
 </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/source/old/1.0.0/index.html b/source/old/1.0.0/index.html
index 125ef28..8ae6265 100644
--- a/source/old/1.0.0/index.html
+++ b/source/old/1.0.0/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 <div id="main">
   <div id="content">
     <div class="blog-index">
@@ -16,10 +16,10 @@
               <td>Date  </td>
               <td>File </td>
             </tr>
-            <!--#include virtual="index.inc" -->
+            <!--#include virtual="index.shtml" -->
           </table>
           <p> </p>
-          <!--#include virtual="/inc/legalities.inc" -->
+          <!--#include virtual="/inc/legalities.shtml" -->
         </div>
         <footer>
           You are here: <a href="/">Home</a>
@@ -32,10 +32,10 @@
 
 
     </div>
-    <!--#include virtual="../../sidebar.inc" -->
+    <!--#include virtual="../../sidebar.shtml" -->
   </div>
 
 </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/source/old/1.0.1/index.html b/source/old/1.0.1/index.html
index 627193c..f6fe7c5 100644
--- a/source/old/1.0.1/index.html
+++ b/source/old/1.0.1/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 <div id="main">
   <div id="content">
     <div class="blog-index">
@@ -16,10 +16,10 @@
               <td>Date  </td>
               <td>File </td>
             </tr>
-            <!--#include virtual="index.inc" -->
+            <!--#include virtual="index.shtml" -->
           </table>
           <p> </p>
-          <!--#include virtual="/inc/legalities.inc" -->
+          <!--#include virtual="/inc/legalities.shtml" -->
         </div>
         <footer>
           You are here: <a href="/">Home</a>
@@ -32,10 +32,10 @@
 
 
     </div>
-    <!--#include virtual="../../sidebar.inc" -->
+    <!--#include virtual="../../sidebar.shtml" -->
   </div>
 
 </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/source/old/1.0.2/index.html b/source/old/1.0.2/index.html
index 930d2bf..31d97e6 100644
--- a/source/old/1.0.2/index.html
+++ b/source/old/1.0.2/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 <div id="main">
   <div id="content">
     <div class="blog-index">
@@ -16,10 +16,10 @@
               <td>Date  </td>
               <td>File </td>
             </tr>
-            <!--#include virtual="index.inc" -->
+            <!--#include virtual="index.shtml" -->
           </table>
           <p> </p>
-          <!--#include virtual="/inc/legalities.inc" -->
+          <!--#include virtual="/inc/legalities.shtml" -->
         </div>
         <footer>
           You are here: <a href="/">Home</a>
@@ -32,10 +32,10 @@
 
 
     </div>
-    <!--#include virtual="../../sidebar.inc" -->
+    <!--#include virtual="../../sidebar.shtml" -->
   </div>
 
 </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/source/old/1.1.0/index.html b/source/old/1.1.0/index.html
index 90f1b73..f077f4a 100644
--- a/source/old/1.1.0/index.html
+++ b/source/old/1.1.0/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 <div id="main">
   <div id="content">
     <div class="blog-index">
@@ -16,10 +16,10 @@
               <td>Date  </td>
               <td>File </td>
             </tr>
-            <!--#include virtual="index.inc" -->
+            <!--#include virtual="index.shtml" -->
           </table>
           <p> </p>
-          <!--#include virtual="/inc/legalities.inc" -->
+          <!--#include virtual="/inc/legalities.shtml" -->
         </div>
         <footer>
           You are here: <a href="/">Home</a>
@@ -32,10 +32,10 @@
 
 
     </div>
-    <!--#include virtual="../../sidebar.inc" -->
+    <!--#include virtual="../../sidebar.shtml" -->
   </div>
 
 </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/source/old/fips/index.html b/source/old/fips/index.html
index 4842af3..29929bc 100644
--- a/source/old/fips/index.html
+++ b/source/old/fips/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 <div id="main">
   <div id="content">
     <div class="blog-index">
@@ -16,10 +16,10 @@
               <td>Date  </td>
               <td>File </td>
             </tr>
-            <!--#include virtual="index.inc" -->
+            <!--#include virtual="index.shtml" -->
           </table>
           <p> </p>
-          <!--#include virtual="/inc/legalities.inc" -->
+          <!--#include virtual="/inc/legalities.shtml" -->
         </div>
         <footer>
           You are here: <a href="/">Home</a>
@@ -32,10 +32,10 @@
 
 
     </div>
-    <!--#include virtual="../../sidebar.inc" -->
+    <!--#include virtual="../../sidebar.shtml" -->
   </div>
 
 </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/source/old/index.html b/source/old/index.html
index 058bd20..a5fe85d 100644
--- a/source/old/index.html
+++ b/source/old/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 <div id="main">
   <div id="content">
     <div class="blog-index">
@@ -19,7 +19,7 @@
             <li><a href="fips">fips</a></li>
           </ul>
         </div>
-        <!--#include virtual="/inc/legalities.inc" -->
+        <!--#include virtual="/inc/legalities.shtml" -->
         <footer>
           You are here: <a href="/">Home</a>
           : <a href=".">Downloads</a>
@@ -30,10 +30,10 @@
 
 
     </div>
-    <!--#include virtual="../sidebar.inc" -->
+    <!--#include virtual="../sidebar.shtml" -->
   </div>
 
 </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/support/acks.html b/support/acks.html
index 29bb761..47d0d4d 100644
--- a/support/acks.html
+++ b/support/acks.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 <div id="main">
   <div id="content">
     <div class="blog-index">
@@ -67,9 +67,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/support/contracts.html b/support/contracts.html
index 9d7a46c..0651184 100644
--- a/support/contracts.html
+++ b/support/contracts.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 
 <body>
-<!--#include virtual="/inc/banner.inc" -->
+<!--#include virtual="/inc/banner.shtml" -->
 
   <div id="main">
     <div id="content">
@@ -158,11 +158,11 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
 
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 
 </html>
diff --git a/support/donations.html b/support/donations.html
index 4969f66..9a1715f 100644
--- a/support/donations.html
+++ b/support/donations.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -70,9 +70,9 @@ Please do not donate to any PayPal account claiming to be associated with us!
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/support/index.html b/support/index.html
index 4ac999e..c618aaf 100644
--- a/support/index.html
+++ b/support/index.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -37,9 +37,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>
diff --git a/template-file.html b/template-file.html
index 298c5a0..a7483d5 100644
--- a/template-file.html
+++ b/template-file.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html>
 <html lang="en">
-<!--#include virtual="/inc/head.inc" -->
+<!--#include virtual="/inc/head.shtml" -->
 <body>
-  <!--#include virtual="/inc/banner.inc" -->
+  <!--#include virtual="/inc/banner.shtml" -->
   <div id="main">
     <div id="content">
       <div class="blog-index">
@@ -23,9 +23,9 @@
 	  </footer>
 	</article>
       </div>
-      <!--#include virtual="sidebar.inc" -->
+      <!--#include virtual="sidebar.shtml" -->
     </div>
   </div>
-<!--#include virtual="/inc/footer.inc" -->
+<!--#include virtual="/inc/footer.shtml" -->
 </body>
 </html>


More information about the openssl-commits mailing list