From: Daniel Veillard <veillard@redhat.com>
Date: Thu, 15 Nov 2007 17:07:28 +0000 (+0000)
Subject: * docs/libvir.html docs/uri.html: update docs about the libvirt
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9ae4f3d27ede1adde358acb0e5d430bed95f6a24;p=libvirt.git

* docs/libvir.html docs/uri.html: update docs about the libvirt
  daemon startup when using QEmu/KVM.
Daniel
---

diff --git a/ChangeLog b/ChangeLog
index aef4bbd473..34b88492c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 15 18:06:15 CET 2007 Daniel Veillard <veillard@redhat.com>
+
+	* docs/libvir.html docs/uri.html: update docs about the libvirt
+	  daemon startup when using QEmu/KVM.
+
 Thu Nov 15 14:00:04 CET 2007 Jim Meyering <meyering@redhat.com>
 
 	Make "make distcheck" work.
diff --git a/docs/libvir.html b/docs/libvir.html
index a33f518e13..8960c2b0f3 100644
--- a/docs/libvir.html
+++ b/docs/libvir.html
@@ -2571,15 +2571,11 @@ daemon is to manage qemu instances.
 </p>
 
 <p>
-The <code>libvirtd</code> daemon can be run in two ways.  It may
-be started by init scripts when the machine boots and run in "system
-mode" (<code>libvirtd --system</code>), in which case it manages
-qemu instances on behalf of all users of the machine.  It may be also
-be started by the local user in what is known as "session mode"
-(<code>libvirtd --session</code>), to manage qemu instances for
-just the current user.  If no <code>libvirtd</code> is running at
-all, then the qemu driver starts one running in session mode.
-</p>
+The <code>libvirtd</code> daemon should be started by the 
+init scripts when the machine boots. It should appear as
+a process <code>libvirtd --daemon</code> running as root
+in the background and will handle qemu instances on behalf
+of all users of the machine (among other things). </p>
 
 <p>
 So to connect to the daemon, one of two different URIs is used:
diff --git a/docs/uri.html b/docs/uri.html
index 9b4b23bb1c..4d3ef35244 100644
--- a/docs/uri.html
+++ b/docs/uri.html
@@ -51,15 +51,11 @@ To use QEMU support in libvirt you must be running the
 in releases prior to 0.3.0).  The purpose of this
 daemon is to manage qemu instances.
 </p><p>
-The <code>libvirtd</code> daemon can be run in two ways.  It may
-be started by init scripts when the machine boots and run in "system
-mode" (<code>libvirtd --system</code>), in which case it manages
-qemu instances on behalf of all users of the machine.  It may be also
-be started by the local user in what is known as "session mode"
-(<code>libvirtd --session</code>), to manage qemu instances for
-just the current user.  If no <code>libvirtd</code> is running at
-all, then the qemu driver starts one running in session mode.
-</p><p>
+The <code>libvirtd</code> daemon should be started by the 
+init scripts when the machine boots. It should appear as
+a process <code>libvirtd --daemon</code> running as root
+in the background and will handle qemu instances on behalf
+of all users of the machine (among other things). </p><p>
 So to connect to the daemon, one of two different URIs is used:
 </p><ul><li> <code>qemu:///system</code> connects to a system mode daemon. </li>
 <li> <code>qemu:///session</code> connects to a session mode daemon. </li>