Talk about license in intro to docs.

diff --git a/TODO b/TODO
index 609063502e19a832027b2dea13e10f2d9633914b..0d109c989b00a8711575876e46061e96eff8fd3c 100644 (file)
--- a/TODO
+++ b/TODO
@@ -9,9 +9,6 @@
 
   - How about `diff' and `cmp' programs?
 
-* Make it clear that the students own their code, because there was some
-  confusion on that point.
-
 * Threads:
 
   - join-invalid doesn't compile if tid_t is not scalar type.

diff --git a/doc/intro.texi b/doc/intro.texi
index 7bdd7e51b0531ed545869034cf7b8566c0cdccc6..2897a3ab3ae9e5fa216f80f78715e95b0292c3f0 100644 (file)
--- a/doc/intro.texi
+++ b/doc/intro.texi
@@ -36,6 +36,7 @@ projects.
 
 @menu
 * Getting Started::             
+* Pintos License::              
 * Pintos Trivia::               
 @end menu
 
@@ -241,6 +242,23 @@ options.  These options must be specified @emph{after} the
 but you can see a list of them using the @option{-u} option, e.g.@:
 @code{pintos run -u}.
 
+@node Pintos License
+@section Pintos License
+
+Pintos is distributed under a liberal license that allows it to be
+freely used, modified, and distributed.  Students and others own their
+own code and may use it for any purpose.  In the context of Stanford's
+CS 140 course, please respect the spirit and the letter of the honor
+code by refraining from reading any homework solutions available
+online or elsewhere.  (Source code for other operating system kernels,
+such as Linux or FreeBSD, is of course fair game.)
+
+Please refer to the @file{LICENSE} file at the top level of the Pintos
+source distribution for license details.
+
+There is NO WARRANTY for Pintos, not even for MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.
+
 @node Pintos Trivia
 @section Pintos Trivia