From: Daniel Veillard <veillard@redhat.com>
Date: Wed, 6 Aug 2008 11:37:53 +0000 (+0000)
Subject: * docs/formatdomain.html docs/formatdomain.html.in: fix memory unit
X-Git-Tag: LIBVIRT_0_4_6~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed3c9c382451692f7ad850f258e20be372fc11c2;p=thirdparty%2Flibvirt.git

* 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 d20670bad3..c6ad488bfb 100644
--- 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 2efbeb63dd..5e615d5e80 100644
--- a/docs/formatdomain.html
+++ b/docs/formatdomain.html
@@ -321,7 +321,7 @@
 	&lt;vcpu&gt;1&lt;/vcpu&gt;
 	...</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 71779655b2..cc6473fea2 100644
--- 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