# HG changeset patch
# User Tero Koskinen <tero.koskinen@iki.fi>
# Date 1326136125 -7200
# Node ID f98504b2d33b459ed6fd2960df961e5d5010df33
# Parent  050c7e999fe83e4bfb6ee1611b78a5d14b3a0c04
# Parent  0ba8ef451e34db2da87eaf235defc508b9e83d12
Merge.

diff -r 050c7e999fe83e4bfb6ee1611b78a5d14b3a0c04 -r f98504b2d33b459ed6fd2960df961e5d5010df33 computers.html
--- a/computers.html	Mon Jan 09 21:04:43 2012 +0200
+++ b/computers.html	Mon Jan 09 21:08:45 2012 +0200
@@ -13,30 +13,34 @@
 </div>
 <div class="section">
 <h2> Computers </h2>
-<p> I have 2 computers, which I use almost daily. Both of them run OpenBSD currently. </p>
+<p> I have 2 computers, which I use almost daily. Both of them run Fedora Linux currently. </p>
 <h3> Laptop: IBM Thinkpad T42 </h3>
 <img src="t42-small.jpg" />
 <p>
 Thinkpad T42 is my laptop. I bought it in summer 2005, so I could use it
-when I am at the university or when I travel. In addition to OpenBSD, it also has
-prebundled Windows XP installed. I occasionally Windows XP also, but most of my time is spend on OpenBSD.
+when I am at the university or when I travel. In addition to Fedora, it also has
+prebundled Windows XP installed.
 </p>
+<!--
 <p> Almost all devices are supported by OpenBSD (only modem and fingerprint reader
 support is missing) and I have been very satisfied to the laptop.
+-->
 <ul>
 <li> 1.7 GHz, 512 MB RAM, 40 GB hard drive </li>
+<!--
 <li> <a href="t42-dmesg.txt">dmesg</a> </li>
+-->
 </ul>
 </p>
 <h3> Desktop: AMD Phenom II X4 3.4 GHz </h3>
-<p> As my main desktop computer, I use newish AMD Phenom machine.
+<p> As my main desktop computer, I use newish AMD Phenom II machine.
 <ul>
 <li> quad core, 3.4 GHz, 4 GB RAM, 64 GB + 2x 150 GB hard drives</li>
-<li> <a href="phenom-dmesg.txt">dmesg</a> </li>
+<li> <a href="phenom-dmesg.txt">dmesg from OpenBSD</a> </li>
 </ul>
 </p>
 </div>
 <hr/>
-<p> Tero Koskinen, 2011-04-19 </p>
+<p> Tero Koskinen, 2011-09-24 </p>
 </body>
 </html>
diff -r 050c7e999fe83e4bfb6ee1611b78a5d14b3a0c04 -r f98504b2d33b459ed6fd2960df961e5d5010df33 index.html
--- a/index.html	Mon Jan 09 21:04:43 2012 +0200
+++ b/index.html	Mon Jan 09 21:08:45 2012 +0200
@@ -81,6 +81,6 @@
 <p> Sometimes you might find me from IRC with nick tkoskine. </p>
 </div>
 <hr/>
-<p>Tero Koskinen, 2011-09-07 </p>
+<p>Tero Koskinen, 2012-01-09 </p>
 </body>
 </html>