PolicyKit: Branch 'master'

[David Zeuthen]

 doc/man/PolicyKit.8.in      |    6 +++---
 doc/man/PolicyKit.conf.5.in |   20 ++++++++------------
 2 files changed, 11 insertions(+), 15 deletions(-)

New commits:
diff-tree f2399d093f968c63b9b572a3f4b27a850d5695c9 (from 829838ea1df46923f9cdfe93af74c44c7e1752b2)
Author: David Zeuthen <davidz at redhat.com>
Date:   Mon Aug 20 21:47:25 2007 -0400

    minor doc cleanups

diff --git a/doc/man/PolicyKit.8.in b/doc/man/PolicyKit.8.in
index 9027288..a426580 100644
--- a/doc/man/PolicyKit.8.in
+++ b/doc/man/PolicyKit.8.in
@@ -22,12 +22,12 @@ on how to subscribe.
 
 .SH SEE ALSO
 .PP
+\&\fIPolicyKit.conf\fR\|(5),
+\&\fIpolkit-list-actions\fR\|(1),
 \&\fIpolkit-check-caller\fR\|(1),
 \&\fIpolkit-check-session\fR\|(1),
 \&\fIpolkit-policy-file-validate\fR\|(1),
-\&\fIdbus-daemon\fR\|(1),
-\&\fIhald\fR\|(8)
-
+\&\fIpolkit-grant\fR\|(1)
 
 .SH AUTHOR
 Written by David Zeuthen <david at fubar.dk> with a lot of help from many
diff --git a/doc/man/PolicyKit.conf.5.in b/doc/man/PolicyKit.conf.5.in
index 1374b29..32d4307 100644
--- a/doc/man/PolicyKit.conf.5.in
+++ b/doc/man/PolicyKit.conf.5.in
@@ -1,4 +1,4 @@
-.\" 
+.\" -*- Nroff -*-
 .\" PolicyKit.conf manual page.
 .\" Copyright (C) 2007 David Zeuthen <david at fubar.dk>
 .\"
@@ -68,15 +68,12 @@ the value part. The following attributes
 .I
 .TP
 .B user
-This matches on the user. Both the UNIX uid (e.g. 500) and the user
-name (e.g. davidz) are tried in the matching process. For example .B
-user="davidz|504" matches the UNIX user with uid 504 and the UNIX user
-with the name "davidz".
+This matches on the user's login name.
 .TP
 .B action
 For matching on the action, for example
-.B action="hal-storage-*"
-will match on all actions whose name begins with the string with "hal-storage-".
+.B action="org.freedesktop.hal.storage.*"
+will match on all actions whose name begins with the string with "org.freedesktop.hal.storage.".
 
 .PP
 
@@ -176,7 +173,7 @@ actions installed on the system.
 
   <config version="0.1">
 .br
-    <match user="davidz|504">
+    <match user="davidz|bateman">
 .br
       <return result="yes"/>
 .br
@@ -185,19 +182,18 @@ actions installed on the system.
   </config>
 .br
 
-The two UNIX users "davidz" and user with UNIX uid 504 will be allowed
-to do any action.
+The two UNIX users "davidz" and "bateman" to do any action.
 
 .I MOUNTING FIXED DRIVES
 
 Suppose the action
-.I hal-storage-mount-fixed
+.I org.freedesktop.hal.storage.mount-fixed
 is used by \&\fIhald\fR\|(8) to determine whether mounting internal
 hard drives are allowed. Then this configuration file
 
   <config version="0.1">
 .br
-    <match action="hal-storage-mount-fixed">
+    <match action="org.freedesktop.hal.storage.mount-fixed">
       <match user="davidz">
 .br
         <return result="yes"/>