From 7e2f6683add0770f8f722ff9a996ec4bbf16a978 Mon Sep 17 00:00:00 2001
From: Doug Goldstein <cardoe@cardoe.com>
Date: Sun, 12 Aug 2012 23:44:49 -0500
Subject: [PATCH] Update paths in man page to reflect libvirtd code

Updated the paths in the man page to reflect what the code in libvirtd
does. In addition broke out the FILES section into two subsections for
files used when run as root and files used when run as non-root.
Provided information about the defaults that libvirtd uses when running
as non-root and when XDG_CONFIG_HOME and XDG_RUNTIME_DIR are not set in
the environment.
---
 daemon/libvirtd.pod.in | 43 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/daemon/libvirtd.pod.in b/daemon/libvirtd.pod.in
index 2b68cab0f4..930b75236e 100644
--- a/daemon/libvirtd.pod.in
+++ b/daemon/libvirtd.pod.in
@@ -75,6 +75,8 @@ On receipt of B<SIGHUP> libvirtd will reload its configuration.
 
 =head1 FILES
 
+=head2 When run as B<root>.
+
 =over
 
 =item F<SYSCONFDIR/libvirtd.conf>
@@ -86,11 +88,7 @@ command line using the B<-f>|B<--config> option.
 
 =item F<LOCALSTATEDIR/run/libvirt/libvirt-sock-ro>
 
-The sockets libvirtd will use when B<run as root>.
-
-=item F<$XDG_RUNTIME_DIR/libvirt/libvirt-sock>
-
-The socket libvirtd will use when run as a B<non-root> user.
+The sockets libvirtd will use.
 
 =item F<SYSCONFDIR/pki/CA/cacert.pem>
 
@@ -110,6 +108,41 @@ The PID file to use, unless overridden by the B<-p>|B<--pid-file> option.
 
 =back
 
+=head2 When run as B<non-root>.
+
+=over
+
+=item F<$XDG_CONFIG_HOME/libvirtd.conf>
+
+The default configuration file used by libvirtd, unless overridden on the
+command line using the B<-f>|B<--config> option.
+
+=item F<$XDG_RUNTIME_DIR/libvirt/libvirt-sock>
+
+The socket libvirtd will use.
+
+=item F<$HOME/.pki/libvirt/cacert.pem>
+
+The TLS B<Certificate Authority> certificate libvirtd will use.
+
+=item F<$HOME/.pki/libvirt/servercert.pem>
+
+The TLS B<Server> certificate libvirtd will use.
+
+=item F<$HOME/.pki/libvirt/serverkey.pem>
+
+The TLS B<Server> private key libvirtd will use.
+
+=item F<$XDG_RUNTIME_DIR/libvirt/libvirtd.pid>
+
+The PID file to use, unless overridden by the B<-p>|B<--pid-file> option.
+
+=item If $XDG_CONFIG_HOME is not set in your environment, libvirtd will use F<$HOME/.config>
+
+=item If $XDG_RUNTIME_DIR is not set in your environment, libvirtd will use F<$HOME/.cache>
+
+=back
+
 =head1 EXAMPLES
 
 To retrieve the version of libvirtd: