--- projects/cms/documentation/specification/expected_data.txt	2000/11/28 11:48:48	1.2
+++ projects/cms/documentation/specification/expected_data.txt	2000/11/28 12:11:03	1.5
@@ -126,8 +126,7 @@ specified: -
     load *
     memory *
     swap *
-    disk_free *
-    disk_total *
+    disk *
     users (attribute)
 
 * - These parameters are specified with tags of the same
@@ -169,7 +168,7 @@ the 'essential' and 'expected' data: -
     <load>
         <load1><load1>
         <load5><load5>
-        <load10><load10>
+        <load15><load15>
     </load>
     <memory>
         <free></free>
@@ -179,16 +178,20 @@ the 'essential' and 'expected' data: -
         <free></free>
         <total></total>
     </swap>
-    <disk_free>
-        <p1></p1>
-        <p2></p2>
-        <p3></p3>
-    </disk_free>
-    <disk_total>
-        <p1></p1>
-        <p2></p2>
-        <p3></p3>
-    </disk_total>
+    <disk>
+        <p0>
+            <free></free>
+            <total></total>
+            <mounted></mounted>
+            <label></label>
+        </p0>
+        <p1>
+            <free></free>
+            <total></total>
+            <mount></mount>
+            <label></label>
+        </p1>
+    </disk>
 </packet>
 
 Note that linefeeds and spaces would normally not be present.
@@ -205,8 +208,8 @@ Note that this numbering starts from zero.
 
 The <load> tag begins a list of system load information.
 The load tag is only expected to contain 3 subtags, named
-"load1", "load5" and "load10".  These represent the average
-load 1 minutes ago, 5 minutes ago and 10 minutes ago
+"load1", "load5" and "load15".  These represent the average
+load 1 minute ago, 5 minutes ago and 15 minutes ago
 respectively.
 
 The <memory> tag begins a list of system memory information.
@@ -217,12 +220,16 @@ has in total.
 
 The <swap> tag is identical in nature to the <memory> tag.
 
-The <disk_free> tag begins a list of free disk space
-information.  Each subtag must be of the form px, where
-x is the number of the disk partition that is unique for
-that particular system.  The value represents how much
-space is free on that partition.  Note that px numbering
-starts from zero.
+The <disk> tag begins a list of partition information.
+Each subtag must be of the form px, where x is the number
+of the disk partition that is unique for that particular
+system.  Note that the numbering of px is expected to
+start from zero.  Each <px> tag contains the following
+subtags: -
+    <free> - the free partition space in bytes.
+    <total> - the total partition size in bytes.
+    <mount> - the mount point, eg, "/var".
+    <label> - the label of the physical disk.
 
 The <disk_total> tag begins a list of total disk space,
 similar in implementation to the <disk_free> tag.