Index: xen-4.2.0-testing/docs/man/xmdomain.cfg.pod.5
===================================================================
--- xen-4.2.0-testing.orig/docs/man/xmdomain.cfg.pod.5
+++ xen-4.2.0-testing/docs/man/xmdomain.cfg.pod.5
@@ -333,16 +333,10 @@ at hda1, which is the root filesystem.
 
 =item I<NFS Root>
 
-FIXME: write me
-
 =item I<LVM Root>
 
-FIXME: write me
-
 =item I<Two Networks>
 
-FIXME: write me
-
 =back
 
 =head1 SEE ALSO
Index: xen-4.2.0-testing/docs/man/xm.pod.1
===================================================================
--- xen-4.2.0-testing.orig/docs/man/xm.pod.1
+++ xen-4.2.0-testing/docs/man/xm.pod.1
@@ -299,7 +299,8 @@ scheduling by the Xen hypervisor.
 
 =item B<s - shutdown>
 
-FIXME: Why would you ever see this state?
+The guest has requested to be shutdown, rebooted or suspended, and the
+domain is in the process of being destroyed in response.
 
 =item B<c - crashed>
 
@@ -312,8 +313,6 @@ restart on crash.  See L<xmdomain.cfg> f
 The domain is in process of dying, but hasn't completely shutdown or
 crashed.
 
-FIXME: Is this right?
-
 =back
 
 B<NOTES>
@@ -737,8 +736,6 @@ Xen ships with a number of domain schedu
 time with the B<sched=> parameter on the Xen command line.  By
 default B<credit> is used for scheduling.
 
-FIXME: we really need a scheduler expert to write up this section.
-
 =over 4
 
 =item B<sched-credit> [ B<-d> I<domain-id> [ B<-w>[B<=>I<WEIGHT>] | B<-c>[B<=>I<CAP>] ] ]
@@ -788,8 +785,6 @@ The normal EDF scheduling usage in nanos
 
 The normal EDF scheduling usage in nanoseconds
 
-FIXME: these are lame, should explain more.
-
 =item I<latency-hint>
 
 Scaled period if domain is doing heavy I/O.
@@ -939,9 +934,6 @@ the default setting in xend-config.sxp f
 
 Passes the specified IP Address to the adapter on creation.  
 
-FIXME: this currently appears to be B<broken>.  I'm not sure under what
-circumstances this should actually work.
-
 =item B<mac=>I<macaddr>
 
 The MAC address that the domain will see on its Ethernet device.  If
@@ -967,9 +959,6 @@ Removes the network device from the doma
 I<devid> is the virtual interface device number within the domain
 (i.e. the 3 in vif22.3).
 
-FIXME: this is currently B<broken>.  Network devices aren't completely
-removed from domain 0.
-
 =item B<network-list> [B<-l>|B<--long>]> I<domain-id>
 
 List virtual network interfaces for a domain.  The returned output is