From 84fbd64d42faf6ff96cc9285dc28adf025cec1c0 Mon Sep 17 00:00:00 2001
From: Petter Reinholdtsen <pere@hungry.com>
Date: Tue, 26 Apr 2005 16:10:09 +0000
Subject: [PATCH] Noe mer.

---
 mypapers/free-sw-devel/free-sw-devel.html | 30 ++++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/mypapers/free-sw-devel/free-sw-devel.html b/mypapers/free-sw-devel/free-sw-devel.html
index 5bf544682a..defe1fe5db 100644
--- a/mypapers/free-sw-devel/free-sw-devel.html
+++ b/mypapers/free-sw-devel/free-sw-devel.html
@@ -13,7 +13,7 @@
     <p>An introduction to free software development, for those
       interested in participating.</p>
 
-    <p><tt><a href="free-sw-devel.html">http://www.hungry.com/~pere/.../free-sw-devel.html</a></tt></p>
+    <p><tt><a href="free-sw-devel.html">http://www.hungry.com/~pere/mypapers/free-sw-devel/free-sw-devel.html</a></tt></p>
 
     <div class="presenter">Petter Reinholdtsen
       <br>pere@hungry.com
@@ -35,28 +35,36 @@
 
       <li>initiater and current tech coordinator in skolelinux</li>
 
+      <li>currently employed at USIT, UiO</li>
+
     </ul>
 
-    <h2>What is free software</h2>
+    <h2>Free Software - user freedom</h2>
+
+    <ul>
 
-    - user freedom
-     - freedom to use
-     - freedom to modify
-     - freedom to distribute
+      <li>freedom to run the program as you wish for any purpose</li>
+      <li>freedom to study and change the source code as you wish</li>
+      <li>freedom to make and redistribute copies</li>
+      <li>freedom to publish modified versions</li>
+
+    </ul>
 
-      freedom to run the program as you wish for any purpose, freedom
-to study and change the source code as you wish, freedom to make and
-redistribute copies, and freedom to publish modified versions.
+    <p><em>Richard M. Stallmann, FSF</em></p>
+	
 
     <h2>Getting involved and helping out</h2>
 
     - use mailing lists
+    - irc, wiki
+
+    <h2>Reporting bugs</h2>
 
     <h2>Joining a free software project</h2>
 
     - painful
 
-    <h2>Making your own project</h2>
+    <h2>Starting a free software project</h2>
 
     <ul>
 
@@ -68,9 +76,7 @@ redistribute copies, and freedom to publish modified versions.
       possible.
 
 
-    <h2>Reporting bugs</h2>
 
-    <h2>Starting a free software project</h2>
 
  - public review (anonymous CVS, commit emails)
  - bug tracking systems
-- 
2.47.2