[Nm-templates-discuss] templates nm_pp1.txt,1.1,1.2

Update of /cvsroot/nm-templates/templates
In directory haydn:/tmp/cvs-serv4681

Modified Files:
	nm_pp1.txt 
Log Message:
Dropped pine, modified the main/contrib/non-free question.


Index: nm_pp1.txt
===================================================================
RCS file: /cvsroot/nm-templates/templates/nm_pp1.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2

--- nm_pp1.txt	6 Jan 2005 22:16:06 -0000	1.1
+++ nm_pp1.txt	15 Jan 2005 16:16:19 -0000	1.2
@@ -33,14 +33,11 @@
  3. Do you know (and can you explain) the difference between free speech
     and free beer?  Is Debian mainly about free speech or free beer?
 
- 4. The e-mail client pine is in non-free.  Can you tell me the
-    difference between main, contrib and non-free?  Do you know what's
-    wrong with Pine's current license in regard to the DFSG? (You can
-    read the license here:
-    http://www.washington.edu/pine/overview/legal.html)
+ 4. What are the sections of Debian software and the differences between
+    them?  How would you decide where to put a new package?
 
  5. At http://people.debian.org/~joerg/bad.licenses.tar.bz2 you can
-    find a tarball of bad licenses. Please compare the graphviz and two
+    find a tarball of bad licenses. Please compare the graphviz and three
     other (your choice) licenses with the first nine points of the DFSG
     and show what changes would be needed to make them DFSG-free.
 	There's no need to compare word for word (which would be impossible



