#
#
# patch "config.inc.php"
#  from [3e9014d6a0dbe31e10bb11ef8f6460a4af30f74b]
#    to [2d35383d2a0e85ccf628221b0c3c203be57f5f64]
# 
# patch "config.inc.php-dist"
#  from [3e9014d6a0dbe31e10bb11ef8f6460a4af30f74b]
#    to [2d35383d2a0e85ccf628221b0c3c203be57f5f64]
# 
# patch "index.php"
#  from [a04322c2729138d13b2b0ba296e1f0fe0c59627c]
#    to [f086167fe809d9c4012f26ad48eb84a75f1cd30b]
# 
# patch "intheblogs.php"
#  from [898c3065df85332e9883ab87ea8dfa08354f6caa]
#    to [8d5267d2a64e88978e7317d894fabbdb362b6a96]
# 
# patch "res/styles.css"
#  from [bf4786d80f29639413ccf3da853bbb93de2ca258]
#    to [49795b0462e382ffde608afd96b2a8f4a9c4cbf1]
#
============================================================
--- config.inc.php	3e9014d6a0dbe31e10bb11ef8f6460a4af30f74b
+++ config.inc.php	2d35383d2a0e85ccf628221b0c3c203be57f5f64
@@ -7,10 +7,12 @@ $CFG["aggregated_feeds"] = array(
 
 $CFG["aggregated_feeds"] = array(
     "http://www.thomaskeller.biz/blog/category/coding/monotone/feed/",
-    "http://tero.stronglytyped.org/blosxom.cgi/monotone/index.rss",
+    "http://tero.stronglytyped.org/blosxom.cgi/monotone/index.atom",
     "http://identi.ca/lapo/tag/monotone/rss",
 );
 
+$CFG['new_msgs_from_feeds_count'] = 3;
+
 $CFG["download_dir"] = dirname(__FILE__) . "/downloads";
 
 $CFG["download_webdir"] = "/downloads";
============================================================
--- config.inc.php-dist	3e9014d6a0dbe31e10bb11ef8f6460a4af30f74b
+++ config.inc.php-dist	2d35383d2a0e85ccf628221b0c3c203be57f5f64
@@ -7,10 +7,12 @@ $CFG["aggregated_feeds"] = array(
 
 $CFG["aggregated_feeds"] = array(
     "http://www.thomaskeller.biz/blog/category/coding/monotone/feed/",
-    "http://tero.stronglytyped.org/blosxom.cgi/monotone/index.rss",
+    "http://tero.stronglytyped.org/blosxom.cgi/monotone/index.atom",
     "http://identi.ca/lapo/tag/monotone/rss",
 );
 
+$CFG['new_msgs_from_feeds_count'] = 3;
+
 $CFG["download_dir"] = dirname(__FILE__) . "/downloads";
 
 $CFG["download_webdir"] = "/downloads";
============================================================
--- index.php	a04322c2729138d13b2b0ba296e1f0fe0c59627c
+++ index.php	f086167fe809d9c4012f26ad48eb84a75f1cd30b
@@ -76,11 +76,10 @@ require_once("simplepie-1.2.0/simplepie.
     $feed = new SimplePie();
     $feed->set_cache_location($CFG['cache_dir']);
     $feed->set_feed_url($CFG['aggregated_feeds']);
-    $feed->set_item_limit(3);
     $feed->init();
     $feed->handle_content_type();
 
-    $items = $feed->get_items();
+    $items = $feed->get_items(0, $CFG['new_msgs_from_feeds_count']);
     if (count($items) == 0):
 ?>
             <p>No blog posts found.</p>
@@ -94,7 +93,13 @@ require_once("simplepie-1.2.0/simplepie.
                 <h2><?php echo $item->get_title() ?></h2>
                 <h3>by <?php echo $author ?>, <?php echo $item->get_date("j F Y | g:i a") ?></h3>
                 <p>
-                    <?php echo $item->get_description() ?>
+                    <?php 
+                        $desc = strip_tags($item->get_description());
+                        if (strlen($desc) > 350):
+                            $desc = substr($desc, 0, 350). " [...]";
+                        endif;
+                        echo $desc;
+                    ?>
                     <a href="<?php echo $item->get_link(0) ?>" target="_blank">&#187; read more</a>
                 </p>
             </div>
@@ -102,7 +107,7 @@ require_once("simplepie-1.2.0/simplepie.
         endforeach;
 ?>
         <p style="text-align: center">
-            <a href="intheblogs.php">&#187; view all entries</a>
+            <a href="intheblogs.php">&#187; view older entries</a>
         </p>
 <?php
     endif;
============================================================
--- intheblogs.php	898c3065df85332e9883ab87ea8dfa08354f6caa
+++ intheblogs.php	8d5267d2a64e88978e7317d894fabbdb362b6a96
@@ -15,7 +15,7 @@ require_once("header.inc.php");
     $feed->init();
     $feed->handle_content_type();
 
-    $items = $feed->get_items();
+    $items = $feed->get_items($CFG['new_msgs_from_feeds_count'] - 1);
     if (count($items) == 0):
 ?>
             <p>No blog posts found.</p>
@@ -29,7 +29,13 @@ require_once("header.inc.php");
                 <h2><?php echo $item->get_title() ?></h2>
                 <h3>by <?php echo $author ?>, <?php echo $item->get_date("j F Y | g:i a") ?></h3>
                 <p>
-                    <?php echo $item->get_description() ?>
+                    <?php
+                        $desc = strip_tags($item->get_description());
+                        if (strlen($desc) > 350):
+                            $desc = substr($desc, 0, 350). " [...]";
+                        endif;
+                        echo $desc;
+                    ?>
                     <a href="<?php echo $item->get_link(0) ?>" target="_blank">&#187; read more</a>
                 </p>
             </div>
============================================================
--- res/styles.css	bf4786d80f29639413ccf3da853bbb93de2ca258
+++ res/styles.css	49795b0462e382ffde608afd96b2a8f4a9c4cbf1
@@ -150,7 +150,7 @@ h1.intheblogs {
 
 .feed-msg h2 {
     font-size: 0.9em;
-    padding-right: 12em;
+    padding-right: 15em;
 }
 
 .feed-msg h3 {