A few more minor changes. Also add a section on WINSUPPORT to the

defs-example file.

defs-example

@@ -160,6 +160,19 @@ DHCPD_DYNRANGE="155.98.36.200 155.98.36.249"
 #
 NAMED_FORWARDERS="1.1.1.1 1.1.2.1"
 
+#
+# Windows support. Turn this on if you think you might want to use windows
+# XP images on your experimental nodes. Note though, that Utah cannot
+# provide those images to you (because of obvious licensing issues), so it
+# will be up to you to generate an XP image yourself and install the
+# Emulab client side that enables XP to work inside your testbed. Turning
+# Windows support will install and enable Samba on your ops node, so there 
+# are firewall issues to be aware of (you want to block the appropriate ports
+# so that your ops samba server can be accessed from *only* your control
+# subnet!).
+#
+WINSUPPORT=0
+
 #
 # You shouldn't have to change anything below this point
 #
@@ -172,7 +185,6 @@ SFSSUPPORT=0
 DISABLE_NSE=1
 FRISEBEEMCASTADDR="234.5.6"
 FRISEBEEMCASTPORT=3564
-WINSUPPORT=0
 
 # Sometimes the main page is down in a directory on WWWHOST
 # No trailing '/'!

doc/setup-ops.txt

@@ -92,13 +92,15 @@ install any packages yourself.
 
 ##### Step 2 - Unpacking and running configure
 
-At this point, you'll need to make a 'defs' file - see setup.txt for
-instructions for doing so. You'll use the same defs file on boss and ops.
-You will use the --with-TBDEFS option to configure to give it the path to
-your defs file.
+At this point, you'll need to make a 'defs' file - You will use the same
+defs file on boss and ops. See defs-example in the top level directory
+as a starting point. You want to make sure each of the variables has a
+definition that makes sense in your environment. Feel free to ask Utah if
+something is not clear.
 
 Unpack the testbed source, and run it's configure script. A good place to
-unpack the source code is /usr/testbed/src/testbed:
+unpack the source code is /usr/testbed/src/testbed. You will use the
+--with-TBDEFS option to configure to give it the path to your defs file:
 
 	mkdir -p /usr/testbed/src/testbed
 	mkdir -p /usr/testbed/obj/testbed

doc/setup.txt

@@ -116,7 +116,9 @@ template. It contains comments explaining the important variables to set.
 
 ##### Step 3 - Configuring an object tree
 
-This works the same as it did on ops:
+This works the same as it did on ops. Remember, you have to use the same
+defs file on boss that you used on ops!
+
 
 	cd /usr/testbed/obj/testbed
 	/usr/testbed/src/testbed/configure \