diff --git a/ChangeLog b/ChangeLog
index e55d862bbb..ece493c0bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Jan 27 14:28:16 GMT 2009 Daniel P. Berrange
+
+ * docs/index.html.in: Add link to libvirt-qpid & UML driver info
+ * docs/drvopenvz.html.in, docs/drvqemu.html.in, docs/drvtest.html.in,
+ docs/drvuml.html.in docs/drvxen.html.in: Add examples of local and
+ remote URI formats. Also re-generate equiv .html files
+
Tue Jan 27 13:25:16 +0100 2009 Jim Meyering
virterror.c: don't read beyond end of buffer upon OOM
diff --git a/docs/drvopenvz.html b/docs/drvopenvz.html
index aae268974c..6f9170a74b 100644
--- a/docs/drvopenvz.html
+++ b/docs/drvopenvz.html
@@ -142,6 +142,7 @@
openvz:///system (local access)
+ openvz+unix:///system (local access)
openvz://example.com/system (remote access, TLS/x509)
openvz+tcp://example.com/system (remote access, SASl/Kerberos)
openvz+ssh://root@example.com/system (remote access, SSH tunnelled)
diff --git a/docs/drvopenvz.html.in b/docs/drvopenvz.html.in
index e92533676e..b2beadb5bc 100644
--- a/docs/drvopenvz.html.in
+++ b/docs/drvopenvz.html.in
@@ -21,6 +21,7 @@
openvz:///system (local access)
+ openvz+unix:///system (local access)
openvz://example.com/system (remote access, TLS/x509)
openvz+tcp://example.com/system (remote access, SASl/Kerberos)
openvz+ssh://root@example.com/system (remote access, SSH tunnelled)
diff --git a/docs/drvqemu.html b/docs/drvqemu.html
index 9384fef486..ff8f20dfc2 100644
--- a/docs/drvqemu.html
+++ b/docs/drvqemu.html
@@ -149,6 +149,23 @@
node. If both are found, then Xen paravirtualized guests can be run using
the KVM hardware acceleration.
+ Connections to QEMU driver
+
+ The libvirt QEMU driver is a multi-instance driver, providing a single
+ system wide privileged driver (the "system" instance), and per-user
+ unprivileged drivers (the "session" instance). The of the driver protocol
+ is "qemu". Some example conection URIs for the libvirt driver are:
+
+
+ qemu:///session (local access to per-user instance)
+ qemu+unix:///session (local access to per-user instance)
+
+ qemu:///system (local access to system instance)
+ qemu+unix:///system (local access to system instance)
+ qemu://example.com/system (remote access, TLS/x509)
+ qemu+tcp://example.com/system (remote access, SASl/Kerberos)
+ qemu+ssh://root@example.com/system (remote access, SSH tunnelled)
+
diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in
index e6005622e4..9ec050160c 100644
--- a/docs/drvqemu.html.in
+++ b/docs/drvqemu.html.in
@@ -32,6 +32,26 @@
+ Connections to QEMU driver
+
+
+ The libvirt QEMU driver is a multi-instance driver, providing a single
+ system wide privileged driver (the "system" instance), and per-user
+ unprivileged drivers (the "session" instance). The of the driver protocol
+ is "qemu". Some example conection URIs for the libvirt driver are:
+
+
+
+ qemu:///session (local access to per-user instance)
+ qemu+unix:///session (local access to per-user instance)
+
+ qemu:///system (local access to system instance)
+ qemu+unix:///system (local access to system instance)
+ qemu://example.com/system (remote access, TLS/x509)
+ qemu+tcp://example.com/system (remote access, SASl/Kerberos)
+ qemu+ssh://root@example.com/system (remote access, SSH tunnelled)
+
+
QEMU emulated guest on x86_64
diff --git a/docs/drvtest.html b/docs/drvtest.html
index 01edf3368f..e5d0d1c7df 100644
--- a/docs/drvtest.html
+++ b/docs/drvtest.html
@@ -126,6 +126,22 @@
Test "mock" driver
+
Connections to Test driver
+
+ The libvirt Test driver is a per-process fake hypervisor driver,
+ with a driver name of 'test'. The driver maintains all its state
+ in memory. It can start with a pre-configured default config, or
+ be given a path to a alternate config. Some example conection URIs
+ for the libvirt driver are:
+
+
+ test:///default (local access, default config)
+ test:///path/to/driver/config.xml (local access, custom config)
+ test+unix:///default (local access, default config, via daemon)
+ test://example.com/default (remote access, TLS/x509)
+ test+tcp://example.com/default (remote access, SASl/Kerberos)
+ test+ssh://root@example.com/default (remote access, SSH tunnelled)
+
diff --git a/docs/index.html.in b/docs/index.html.in
index aa0aead669..79d85634f1 100644
--- a/docs/index.html.in
+++ b/docs/index.html.in
@@ -25,6 +25,9 @@
A CIM provider for the DMTF virtualization schema
+
+ A QMF agent for the AMQP/QPid messaging system
+
libvirt supports:
@@ -46,6 +49,9 @@
The OpenVZ Linux container system
+
+ The User Mode Linux paravirtualized kernel
+
Storage on IDE/SCSI/USB disks, FibreChannel, LVM, iSCSI, NFS and filesystems
@@ -59,6 +65,7 @@
Local access control using PolicyKit
Zero-conf discovery using Avahi multicast-DNS
Management of virtual machines, virtual networks and storage
+ Portable client API for Linux, Solaris and Windows