X-Git-Url: http://pere.pagekite.me/gitweb/homepage.git/blobdiff_plain/0ee7f1b555332c34549654e3548c4899adbb3ca6..d91a137cb15c1dd69cb50280d829d269364da65c:/index.html

diff --git a/index.html b/index.html
index a0c51c5a46..179c90b057 100644
--- a/index.html
+++ b/index.html
@@ -27,9 +27,9 @@ I used to be a student at
 <A HREF="http://www.cs.uit.no/">Seksjon for Informatikk</A> at the 
 <A HREF="http://www.uit.no/">University of Tromsø</A> in <A HREF="http://www.uit.no/norge/homepage-no.shtml">Norway</A>. 
 
-<A HREF="http://pubweb.parc.xerox.com/map/color=1/features=alltypes/ht=17.56/lat=67.45/lon=14.53/mark=68.32N,16.81E,7,16/wd=35.16">I was raised here</A>.
-My address is: Morells Vei 26B, 0487 Oslo, Norway.
-Phone is +47 2271 3393 (beeper 965 22 942).
+<a href="http://www.openstreetmap.org/?mlat=68.3324&mlon=16.7939&zoom=4&layers=0BT">I
+was raised in Ballangen</a>.  My address is: Nydalen Alle 7, 0484
+Oslo, Norway.  Phone is +47 2271 3393.
 
 <P>I was previously the leader of <A HREF="http://www.td.org.uit.no/">TD</A>,
 a member of <A HREF="http://www.cs.uit.no/~sumatnat/">AU</A>, a member of
@@ -56,16 +56,17 @@ have guessed why.
 <H2>Projects</H2>
 
 <UL>
-      <li><a href="http://www.student.uit.no/~pere/linux/glibc/">Improving
+      <li><a href="gis/openstreetmap/">OpenStreetmap.org</a></li>
+      <li><a href="linux/glibc/">Improving
 	  the locale support in glibc</a></li>
 <LI><A HREF="http://www.skolelinux.no/">Skolelinux</A>
 <LI><A HREF="cs-songbook/">Computer Science Songbook</A>
 <LI><A HREF="robocup/">RoboCup Norway</A>
 <LI><A HREF="http://ciips.ee.uwa.edu.au/~pere/soccer/">CIIPS Glory Robot Soccer team</A>
-<LI><A HREF="/products/japhar/">Japhar</A>
+<LI><!-- A HREF="/products/japhar/" -->Japhar<!-- /A -->  (broken link)
 <LI><A HREF="http://xenu.phys.uit.no/~tom/toslug.html">Tromsø Open Source/Linux User Group</A>
 <LI><A HREF="gigs/">Generic Internet Games Service</A>
-<LI><A HREF="http://www.student.uit.no/~pere/linux/">My Linux and Unix stuff</A>
+<LI><A HREF="linux/">My Linux and Unix stuff</A>
 <LI><A HREF="planeteer.html">Planeteer</A>
 <LI><A HREF="kabeltv.html">IP over Cable Network</A>
 <LI><A HREf="http://www.td.org.uit.no/cgi-bin/tavla">UiTø-tavla</A>
@@ -82,7 +83,7 @@ sparsomme data. "Hvis a s
 
 <HR>
 <UL>
-<LI><A HREF="http://www.unitedmedia.com/comics/dilbert/">Dilbert</A>:
+<LI><A HREF="http://www.dilbert.com/">Dilbert</A>:
 <LI>Dilbert <A HREF="http://www.bergens-tidende.no/dilbert/">(BT norsk)</A> og <A HREF="http://www.vg.no/dilbert/">(VG norsk)</A>
 <LI><A HREF="linux.html">Linux</A>
 <LI><A HREF="reports/">Rapporter og dokumenter</A>