* docs/formatdomain.html docs/formatdomain.html.in: fix memory unit

  as pointed out by matthew chan it's kilobytes
Daniel

diff --git a/ChangeLog b/ChangeLog
index d20670bad3d95041bcb63d5438644e8766130419..c6ad488bfb74dc30a88a11aa1bf7df7e54c7753a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,24 +1,29 @@
+Wed Aug  6 13:36:29 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+       * docs/formatdomain.html docs/formatdomain.html.in: fix memory unit
+         as pointed out by matthew chan it's kilobytes
+
 Wed Aug  6 13:24:00 CEST 2008 Chris Lalancette <clalance@redhat.com>
        * src/xend_internal.c: Oops.  My bug fix from yesterday broke the
          regressions suite.  We do actually need "(device" on the front of
          the sexpr, but only if we are first creating the domain, not when
          we are attaching a new disk.  This patch fixes it by adding a flag
          that we check, and allows the regression suite to pass.
-       
+
 Tue Aug  5 18:43:00 CEST 2008 Chris Lalancette <clalance@redhat.com>
-       * src/xend_internal.c: Fix three bugs related to virsh attach-disk: 
+       * src/xend_internal.c: Fix three bugs related to virsh attach-disk:
          a) make sure to break in the xenDaemonAttachDevice() in the switch
          b) convert a stray fprintf to a virXendError()
          c) remove an additional "(device" on the front of the sexpr
          expression passed to xend.  This actually fixes virsh attach-disk
          and virsh attach-interface work with Xen again
-         
+
 Tue Aug  5 18:36:00 CEST 2008 Chris Lalancette <clalance@redhat.com>
        * src/stats_linux.c tests/statstest.c: Update the parsing of disks for
          xen block statistics.  In particular, add support for > 16 xvd devices
          recently put into upstream Xen, and fix up the test suite to fix some
          wrong tests and add a couple more.
-       
+
 Tue Aug  5 12:51:11 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
        * src/openvz_conf.c src/openvz_conf.h src/openvz_driver.c: patch

diff --git a/docs/formatdomain.html b/docs/formatdomain.html
index 2efbeb63dd2bb72d9a71a238992d6529e0bd1a2a..5e615d5e80f0eae0b8fdd1608ee416cd208fe4c4 100644 (file)
--- a/docs/formatdomain.html
+++ b/docs/formatdomain.html
@@ -321,7 +321,7 @@
        <vcpu>1</vcpu>
        ...</pre>
         <dl><dt><code>memory</code></dt><dd>The maximum allocation of memory for the guest at boot time.
-       The units for this value are bytes</dd><dt><code>currentMemory</code></dt><dd>The actual allocation of memory for the guest. This value
+       The units for this value are kilobytes (i.e. blocks of 1024 bytes)</dd><dt><code>currentMemory</code></dt><dd>The actual allocation of memory for the guest. This value
        be less than the maximum allocation, to allow for ballooning
        up the guests memory on the fly. If this is omitted, it defaults
        to the same value as the <code>memory<code> element</code></code></dd><dt><code>vcpu</code></dt><dd>The content of this element defines the number of virtual

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 71779655b2fab7e7b5e6db95bf61ba494117ddbf..cc6473fea2bfaf8eea122a03849a9f90df161ecb 100644 (file)
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -182,7 +182,7 @@
     <dl>
       <dt><code>memory</code></dt>
       <dd>The maximum allocation of memory for the guest at boot time.
-       The units for this value are bytes</dd>
+       The units for this value are kilobytes (i.e. blocks of 1024 bytes)</dd>
       <dt><code>currentMemory</code></dt>
       <dd>The actual allocation of memory for the guest. This value
        be less than the maximum allocation, to allow for ballooning