From bde68c0c4230e9550dd68709f6dc87341f820915 Mon Sep 17 00:00:00 2001
From: "Edward Z. Yang" <edwardzyang@thewritingpot.com>
Date: Tue, 5 May 2009 23:29:05 -0400
Subject: [PATCH] Canonicalize URLs (updated xhtml-compiler), move news.xhtml
 appropriately.

Signed-off-by: Edward Z. Yang <edwardzyang@thewritingpot.com>
---
 common-navigation.xml          | 4 ++--
 news.css => news/index.css     | 0
 news.xhtml => news/index.xhtml | 4 ++--
 redirects.txt                  | 1 +
 xhtml-compiler                 | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)
 rename news.css => news/index.css (100%)
 rename news.xhtml => news/index.xhtml (90%)

diff --git a/common-navigation.xml b/common-navigation.xml
index d937f8c..b7fb0e2 100644
--- a/common-navigation.xml
+++ b/common-navigation.xml
@@ -3,7 +3,7 @@
   <div id="navigation">
     <h2>Navigation</h2>
     <ol>
-      <li id="navigation-news"><a href="news.html" xc:absolute="href">News</a></li>
+      <li id="navigation-news"><a href="news/" xc:absolute="href">News</a></li>
       <li id="navigation-compare"><a href="comparison.html" xc:absolute="href">Compare</a></li>
       <li id="navigation-demo"><a href="demo.php" xc:absolute="href">Demo</a></li>
       <li id="navigation-download"><a href="download.html" xc:absolute="href">Download</a></li>
@@ -12,4 +12,4 @@
       <li id="navigation-contact"><a href="contact.html" xc:absolute="href">Contact</a></li>
     </ol>
   </div>
-</body>
\ No newline at end of file
+</body>
diff --git a/news.css b/news/index.css
similarity index 100%
rename from news.css
rename to news/index.css
diff --git a/news.xhtml b/news/index.xhtml
similarity index 90%
rename from news.xhtml
rename to news/index.xhtml
index 46b1992..a5f3fcd 100644
--- a/news.xhtml
+++ b/news/index.xhtml
@@ -15,7 +15,7 @@
 <meta name="keywords"
       content="HTMLPurifier, HTML Purifier, HTML, filter, filtering, standards, compliant, w3c, news, blog, releases, rss" />
 <link rel="alternate" type="application/rss+xml"
-      title="News - HTML Purifier" href="news.rss"
+      title="News - HTML Purifier" href="../news.rss"
       rss:for="news-container"
       rss:description="Recent news and updates on HTML Purifier" />
 </head>
@@ -26,7 +26,7 @@
 <div id="main">
 <h1 id="title">News</h1>
 <div id="content">
-  <div news:source="news" id="news-container" class="news" />
+  <div news:source="." id="news-container" class="news" />
 </div>
 </div>
 
diff --git a/redirects.txt b/redirects.txt
index d4785c2..cf7acce 100644
--- a/redirects.txt
+++ b/redirects.txt
@@ -10,3 +10,4 @@
 #       mod_rewrite's RewriteRule
 
 news/2.0.0-released.html news/2007/2.0.0-released.html
+news.html news/
diff --git a/xhtml-compiler b/xhtml-compiler
index a9723f6..597e6cc 160000
--- a/xhtml-compiler
+++ b/xhtml-compiler
@@ -1 +1 @@
-Subproject commit a9723f67430a19d0d99b027b8e4e0f84f9f94849
+Subproject commit 597e6cc1ee0c8bc41f4d6d5aab2a0f277a368640
-- 
2.11.4.GIT