diff --git a/ChangeLog b/ChangeLog index 494aa833aff3367f9c88e5cdf39ada593d9b6b9f..3039139d927a387f00dcd460b2882a3d3fc9169b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu May 22 16:56:12 CEST 2008 Daniel Veillard + + * docs/formatdomain.html docs/formatdomain.html.in: Anton Protopopov + pointed out a few "copy-paste" errors + Wed May 21 17:13:29 EST 2008 Daniel P. Berrange * src/qemu_conf.c: Fix exit status check when using -help arg diff --git a/docs/formatdomain.html b/docs/formatdomain.html index 429d9a98ccca02fa62e56cbcf4ec16fc9af3ad10..80faade33b8ed933f18473a63ff5d8da489d67cf 100644 --- a/docs/formatdomain.html +++ b/docs/formatdomain.html @@ -304,7 +304,7 @@ </os> ...
type
This element has the same semantics as described earlier in the - BIOS boot section
type
This element has the same semantics as described earlier in the + BIOS boot section
loader
This element has the same semantics as described earlier in the BIOS boot section
kernel
The contents of this element specify the fully-qualified path to the kernel image in the host OS.
initrd
The contents of this element specify the fully-qualified path to the (optional) ramdisk image in the host OS.
cmdline
The contents of this element specify arguments to be passed to @@ -344,8 +344,8 @@ <on_crash>restart</on_crash> ...
on_poweroff
The content of this element specifies the action to take when - the guest requests a poweroff.
on_poweroff
The content of this element specifies the action to take when - the guest requests a reboot.
on_poweroff
The content of this element specifies the action to take when + the guest requests a poweroff.
on_reboot
The content of this element specifies the action to take when + the guest requests a reboot.
on_crash
The content of this element specifies the action to take when the guest crashes.

Each of these states allow for the same four possible actions. diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 02ca5096606ec6b80731ca4e4ead23bf4594f6ab..70b9c4ac065947cf8dd509823b3b67fdcf2206cf 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -154,7 +154,7 @@

type
This element has the same semantics as described earlier in the BIOS boot section
-
type
+
loader
This element has the same semantics as described earlier in the BIOS boot section
kernel
@@ -215,10 +215,10 @@
on_poweroff
The content of this element specifies the action to take when the guest requests a poweroff.
-
on_poweroff
+
on_reboot
The content of this element specifies the action to take when the guest requests a reboot.
-
on_poweroff
+
on_crash
The content of this element specifies the action to take when the guest crashes.