Merge branch 'deploy'

content/about.html

@@ -70,10 +70,10 @@ resources made available freely by their authors:
 
 The content is split into two sections:
 [Technical](/technical/articles/) and [Personal](/personal/articles/). There is
-a [combined feed](http://feeds.feedburner.com/wezm) containing all posts as
+a [combined feed](/feed/) containing all posts as
 well as separate ones for
-[technical](http://feeds.feedburner.com/wezm-technical) and
+[technical](/technical/feed/) and
-[personal](http://feeds.feedburner.com/wezm-personal) posts.
+[personal](/personal/feed/) posts.
 
 Projects
 --------

content/feed.yaml

@@ -2,6 +2,5 @@
 title: WezM.net - All Articles
 author_name: Wesley Moore
 author_uri: http://www.wezm.net/about/
-#feed_url: http://feeds.feedburner.com/wezm/
 is_hidden: true
-feed_url: http://feeds.feedburner.com/wezm
+feed_url: http://www.wezm.net/feed/

content/personal/feed.yaml

@@ -3,4 +3,4 @@ title: WezM.net - Personal Articles
 author_name: Wesley Moore
 author_uri: http://www.wezm.net/about/
 is_hidden: true
-feed_url: http://feeds.feedburner.com/wezm-personal
+feed_url: http://www.wezm.net/personal/feed/

content/technical/2010/08/howto-install-consolas-font-mac.mkdn

@@ -23,7 +23,7 @@ Installation
 <figure>
   <a href="/images/2010/08/open-xml-converter-show-package-contents.png" rel="prettyPhoto[openxml]"><img src="/images/2010/08/open-xml-converter-show-package-contents-small.jpg" width="600" height="325" alt="Step 1: Show Package Contents" /></a>
   <figcaption><span class="label">Step 3:</span> Show Package Contents</figcaption>
-<figure>
+</figure>
 
 <figure>
   <a href="/images/2010/08/open-xml-converter-all-fonts.png" rel="prettyPhoto[openxml]"><img src="/images/2010/08/open-xml-converter-all-fonts-small.jpg" width="600" height="180" alt="Step 4: Navigating to the package" /></a>

content/technical/feed.yaml

@@ -3,4 +3,4 @@ title: WezM.net - Technical Articles
 author_name: Wesley Moore
 author_uri: http://www.wezm.net/about/
 is_hidden: true
-feed_url: http://feeds.feedburner.com/wezm-technical
+feed_url: http://www.wezm.net/technical/feed/

layouts/_head.html

@@ -10,9 +10,9 @@
 <link rel="stylesheet" href="/css/screen.css" type="text/css" media="screen,projection" />
 <link rel="stylesheet" href="/css/mobile.css" type="text/css" media="only screen and (max-device-width: 480px)" />
 <link rel="stylesheet" href="/css/prettyPhoto.css?v=3.0.1" type="text/css" media="screen" charset="utf-8" />
-<link rel="alternate" href="http://feeds.feedburner.com/wezm" type="application/atom+xml" title="WezM.net - All Articles" />
+<link rel="alternate" href="/feed/" type="application/atom+xml" title="WezM.net - All Articles" />
-<link rel="alternate" href="http://feeds.feedburner.com/wezm-technical" type="application/atom+xml" title="WezM.net - Technical Articles" />
+<link rel="alternate" href="/technical/feed/" type="application/atom+xml" title="WezM.net - Technical Articles" />
-<link rel="alternate" href="http://feeds.feedburner.com/wezm-personal" type="application/atom+xml" title="WezM.net - Personal Articles" />
+<link rel="alternate" href="/personal/feed/" type="application/atom+xml" title="WezM.net - Personal Articles" />
 <script src="/js/jquery-1.4.4.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/js/jquery.timers-1.1.2.js" type="text/javascript" charset="utf-8"></script>
 <script src="/js/jquery.prettyPhoto.js?v=3.0.1" type="text/javascript" charset="utf-8"></script>

layouts/_header.html

@@ -7,7 +7,7 @@
     <li><a href="/projects/">Projects</a></li>
     <li><a href="/weather/">Weather</a></li>
     <li>
-      <a href="http://feeds.feedburner.com/wezm"><img src="/images/white-feed-icon.png" width="12" height="12" alt="White Feed Icon" /></a>&nbsp;<a href="http://feeds.feedburner.com/wezm">Feed</a>
+      <a href="/feed/"><img src="/images/white-feed-icon.png" width="12" height="12" alt="White Feed Icon" /></a>&nbsp;<a href="/feed/">Feed</a>
     </li>
   </nav>
 </header>

layouts/articles.html

@@ -25,8 +25,11 @@
       <% menu.each do |menu_item|
         label, count = menu_item
         path = (label != "All" ? '/' + label.downcase : '') + "/articles/"
-        feed = 'http://feeds.feedburner.com/wezm'
+        if label != "All"
-        feed += "-#{label.downcase}" if label != "All"
+          feed = "/#{label.downcase}/feed/"
+        else
+          feed = '/feed/'
+        end
         active = (@item.identifier.sub(%r{page/$}, '') == path)
       %>
       <li>

layouts/home.html

@@ -10,7 +10,7 @@
   <section id="technical" class="column">
     <div>
       <h1><a href="/technical/articles/">Technical</a>
-        <sup><a href="http://feeds.feedburner.com/wezm-technical"><img src="/images/black-feed-icon.png" class="feed-icon" width="12" height="12" alt="Black Feed Icon" /></a></sup>
+        <sup><a href="/technical/feed/"><img src="/images/black-feed-icon.png" class="feed-icon" width="12" height="12" alt="Black Feed Icon" /></a></sup>
       </h1>
       <ul class="articles">
       <% technical_articles[0..4].each do |article| %>
@@ -24,7 +24,7 @@
   <section id="personal" class="column">
     <div>
       <h1><a href="/personal/articles/">Personal</a>
-        <sup><a href="http://feeds.feedburner.com/wezm-personal"><img src="/images/black-feed-icon.png" class="feed-icon" width="12" height="12" /></a></sup>
+        <sup><a href="/personal/feed/"><img src="/images/black-feed-icon.png" class="feed-icon" width="12" height="12" /></a></sup>
       </h1>
       <ul class="articles">
       <% personal_articles[0..4].each do |article| %>