Replace GSX Server support with VMware Player support.

[pintos-anon] / doc / intro.texi

diff --git a/doc/intro.texi b/doc/intro.texi
index c4846908c14bbb9db5db6f10d5192d3d66ab8a3c..a74ce8297c91009dad4fa423531a7fee707f613c 100644 (file)
--- a/doc/intro.texi
+++ b/doc/intro.texi
@@ -17,8 +17,7 @@ systems and software can run under it.  In class we will use the
 @uref{http://bochs.sourceforge.net, , Bochs} and 
 @uref{http://fabrice.bellard.free.fr/qemu/, ,
 qemu} simulators.  Pintos has also been tested with
-@uref{http://www.vmware.com/products/server/gsx_features.html, ,
-VMware GSX Server}.
+@uref{http://www.vmware.com/, , VMware Player}.
 
 These projects are hard.  CS 140 has a reputation of taking a lot of
 time, and deservedly so.  We will do what we can to reduce the workload, such
@@ -35,7 +34,7 @@ projects.
 @menu
 * Getting Started::             
 * Grading::                     
-* License::                     
+* Legal and Ethical Issues::    
 * Acknowledgements::            
 * Trivia::                      
 @end menu
@@ -503,12 +502,15 @@ In the end, remember your audience.  Code is written primarily to be
 read by humans.  It has to be acceptable to the compiler too, but the
 compiler doesn't care about how it looks or how well it is written.
 
-@node License
-@section License
+@node Legal and Ethical Issues
+@section Legal and Ethical Issues
 
 Pintos is distributed under a liberal license that allows free use,
 modification, and distribution.  Students and others who work on Pintos
 own the code that they write and may use it for any purpose.
+Pintos comes with NO WARRANTY, not even for MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.
+@xref{License}, for details of the license and lack of warranty.
 
 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
@@ -517,12 +519,6 @@ other operating system kernels, such as Linux or FreeBSD, is allowed,
 but do not copy code from them literally.  Please cite the code that
 inspired your own in your design documentation.
 
-Pintos comes with NO WARRANTY, not even for MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE.
-
-The @file{LICENSE} file at the top level of the Pintos source
-distribution has full details of the license and lack of warranty.
-
 @node Acknowledgements
 @section Acknowledgements