Imported Upstream version 0.4.6upstream/0.4.6upstream

6 files changed, 406 insertions, 294 deletions

diff --git a/doc/Makefile.in b/doc/Makefile.in
index a167936..3ade5f4 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,7 +78,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -44,26 +88,58 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -114,7 +190,6 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
@@ -195,6 +270,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TOOLS_CFLAGS = @TOOLS_CFLAGS@
 TOOLS_LIBS = @TOOLS_LIBS@
+UDEVDIR = @UDEVDIR@
+UDEV_ACL_CFLAGS = @UDEV_ACL_CFLAGS@
+UDEV_ACL_LIBS = @UDEV_ACL_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
@@ -298,22 +376,25 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -328,57 +409,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -394,12 +430,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -411,15 +442,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -428,6 +455,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -464,13 +506,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -505,10 +544,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -586,22 +630,20 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/doc/dbus/ConsoleKit.xml b/doc/dbus/ConsoleKit.xml
index 8762cd6..7ed639f 100644
--- a/doc/dbus/ConsoleKit.xml
+++ b/doc/dbus/ConsoleKit.xml
@@ -10,8 +10,8 @@
 
 <book id="index">
   <bookinfo>
-    <title>ConsoleKit 0.4.5 Documentation</title>
-    <releaseinfo>Version 0.4.5</releaseinfo>
+    <title>ConsoleKit 0.4.6 Documentation</title>
+    <releaseinfo>Version 0.4.6</releaseinfo>
     <authorgroup>
       <author>
         <firstname>William Jon</firstname>
diff --git a/doc/dbus/Makefile.in b/doc/dbus/Makefile.in
index b8a08d0..d99ae73 100644
--- a/doc/dbus/Makefile.in
+++ b/doc/dbus/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -35,8 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc/dbus
-DIST_COMMON = $(srcdir)/ConsoleKit.xml.in $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(srcdir)/ConsoleKit.xml.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
 	$(top_srcdir)/configure.ac
@@ -46,14 +90,25 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = ConsoleKit.xml
 CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo "  GEN   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,8 +130,15 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(htmldocdir)"
 DATA = $(htmldoc_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -99,7 +161,6 @@ CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
-DBUS_CFLAGS = @DBUS_CFLAGS@
 DBUS_SYS_DIR = @DBUS_SYS_DIR@
 DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
@@ -180,6 +241,9 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TOOLS_CFLAGS = @TOOLS_CFLAGS@
 TOOLS_LIBS = @TOOLS_LIBS@
+UDEVDIR = @UDEVDIR@
+UDEV_ACL_CFLAGS = @UDEV_ACL_CFLAGS@
+UDEV_ACL_LIBS = @UDEV_ACL_LIBS@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 WARN_CFLAGS = @WARN_CFLAGS@
@@ -310,8 +374,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-htmldocDATA: $(htmldoc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(htmldocdir)" || $(MKDIR_P) "$(DESTDIR)$(htmldocdir)"
 	@list='$(htmldoc_DATA)'; test -n "$(htmldocdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldocdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldocdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -325,14 +392,12 @@ uninstall-htmldocDATA:
 	@$(NORMAL_UNINSTALL)
 	@list='$(htmldoc_DATA)'; test -n "$(htmldocdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(htmldocdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(htmldocdir)" && rm -f $$files
-tags: TAGS
-TAGS:
+	dir='$(DESTDIR)$(htmldocdir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -383,10 +448,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -468,17 +538,17 @@ uninstall-am: uninstall-htmldocDATA
 .MAKE: check-am install-am install-strip
 
 .PHONY: all all-am check check-am check-local clean clean-generic \
-	clean-libtool clean-local distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-htmldocDATA install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-htmldocDATA
+	clean-libtool clean-local cscopelist-am ctags-am distclean \
+	distclean-generic distclean-libtool distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am \
+	install-htmldocDATA install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am uninstall-htmldocDATA
 
 
 @DOCBOOK_DOCS_ENABLED_TRUE@ConsoleKit.html : $(SPEC_XML_FILES)
diff --git a/doc/dbus/org.freedesktop.ConsoleKit.Manager.ref.xml b/doc/dbus/org.freedesktop.ConsoleKit.Manager.ref.xml
index 64237a8..a5ea7ee 100644
--- a/doc/dbus/org.freedesktop.ConsoleKit.Manager.ref.xml
+++ b/doc/dbus/org.freedesktop.ConsoleKit.Manager.ref.xml
@@ -8,35 +8,35 @@
   </refnamediv>
   <refsynopsisdiv role="synopsis">
     <title role="synopsis.title">Methods</title>
-    <synopsis><link linkend="Manager.Restart">Restart</link>                   ()
-<link linkend="Manager.CanRestart">CanRestart</link>                (out 'b'     can_restart)
-<link linkend="Manager.Stop">Stop</link>                      ()
-<link linkend="Manager.CanStop">CanStop</link>                   (out 'b'     can_stop)
-<link linkend="Manager.OpenSession">OpenSession</link>               (out 's'     cookie)
-<link linkend="Manager.OpenSessionWithParameters">OpenSessionWithParameters</link> (in  'a(sv)' parameters,
-                           out 's'     cookie)
-<link linkend="Manager.CloseSession">CloseSession</link>              (in  's'     cookie,
-                           out 'b'     result)
-<link linkend="Manager.GetSeats">GetSeats</link>                  (out 'ao'    seats)
-<link linkend="Manager.GetSessions">GetSessions</link>               (out 'ao'    sessions)
-<link linkend="Manager.GetSessionForCookie">GetSessionForCookie</link>       (in  's'     cookie,
-                           out 'o'     ssid)
-<link linkend="Manager.GetSessionForUnixProcess">GetSessionForUnixProcess</link>  (in  'u'     pid,
-                           out 'o'     ssid)
-<link linkend="Manager.GetCurrentSession">GetCurrentSession</link>         (out 'o'     ssid)
-<link linkend="Manager.GetSessionsForUnixUser">GetSessionsForUnixUser</link>    (in  'u'     uid,
-                           out 'ao'    sessions)
-<link linkend="Manager.GetSessionsForUser">GetSessionsForUser</link>        (in  'u'     uid,
-                           out 'ao'    sessions)
-<link linkend="Manager.GetSystemIdleHint">GetSystemIdleHint</link>         (out 'b'     idle_hint)
-<link linkend="Manager.GetSystemIdleSinceHint">GetSystemIdleSinceHint</link>    (out 's'     iso8601_datetime)
+    <synopsis><link linkend="Manager.Restart">Restart</link>()
+<link linkend="Manager.CanRestart">CanRestart</link>(out'b'can_restart)
+<link linkend="Manager.Stop">Stop</link>()
+<link linkend="Manager.CanStop">CanStop</link>(out'b'can_stop)
+<link linkend="Manager.OpenSession">OpenSession</link>(out's'cookie)
+<link linkend="Manager.OpenSessionWithParameters">OpenSessionWithParameters</link>(in'a(sv)'parameters,
+out's'cookie)
+<link linkend="Manager.CloseSession">CloseSession</link>(in's'cookie,
+out'b'result)
+<link linkend="Manager.GetSeats">GetSeats</link>(out'ao'seats)
+<link linkend="Manager.GetSessions">GetSessions</link>(out'ao'sessions)
+<link linkend="Manager.GetSessionForCookie">GetSessionForCookie</link>(in's'cookie,
+out'o'ssid)
+<link linkend="Manager.GetSessionForUnixProcess">GetSessionForUnixProcess</link>(in'u'pid,
+out'o'ssid)
+<link linkend="Manager.GetCurrentSession">GetCurrentSession</link>(out'o'ssid)
+<link linkend="Manager.GetSessionsForUnixUser">GetSessionsForUnixUser</link>(in'u'uid,
+out'ao'sessions)
+<link linkend="Manager.GetSessionsForUser">GetSessionsForUser</link>(in'u'uid,
+out'ao'sessions)
+<link linkend="Manager.GetSystemIdleHint">GetSystemIdleHint</link>(out'b'idle_hint)
+<link linkend="Manager.GetSystemIdleSinceHint">GetSystemIdleSinceHint</link>(out's'iso8601_datetime)
 </synopsis>
   </refsynopsisdiv>
   <refsect1 role="signal_proto">
     <title role="signal_proto.title">Signals</title>
-    <synopsis><link linkend="Manager::SeatAdded">SeatAdded</link>             ('o' sid)
-<link linkend="Manager::SeatRemoved">SeatRemoved</link>           ('o' sid)
-<link linkend="Manager::SystemIdleHintChanged">SystemIdleHintChanged</link> ('b' hint)
+    <synopsis><link linkend="Manager::SeatAdded">SeatAdded</link>('o'sid)
+<link linkend="Manager::SeatRemoved">SeatRemoved</link>('o'sid)
+<link linkend="Manager::SystemIdleHintChanged">SystemIdleHintChanged</link>('b'hint)
 </synopsis>
   </refsect1>
   <refsect1 role="impl_interfaces">
@@ -62,7 +62,7 @@
         <primary>CanRestart</primary>
         <secondary>Manager</secondary>
       </indexterm>
-      <programlisting>CanRestart (out 'b' can_restart)</programlisting>
+      <programlisting>CanRestart (out'b'can_restart)</programlisting>
       <variablelist role="params">
         <varlistentry>
           <term><parameter>can_restart</parameter>:</term>
@@ -81,7 +81,7 @@
         <primary>CanStop</primary>
         <secondary>Manager</secondary>
       </indexterm>
-      <programlisting>CanStop (out 'b' can_stop)</programlisting>
+      <programlisting>CanStop (out'b'can_stop)</programlisting>
       <variablelist role="params">
         <varlistentry>
           <term><parameter>can_stop</parameter>:</term>
@@ -91,7 +91,7 @@
         </varlistentry>
       </variablelist>
     </refsect2>
-    <refsect2><title><anchor role="function" id="Manager.OpenSession"/>OpenSession ()</title><indexterm><primary>OpenSession</primary><secondary>Manager</secondary></indexterm><programlisting>OpenSession (out 's' cookie)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.OpenSession"/>OpenSession ()</title><indexterm><primary>OpenSession</primary><secondary>Manager</secondary></indexterm><programlisting>OpenSession (out's'cookie)</programlisting>
           <para>This method requests that a new <link linkend="Session">Session</link>
           be created for the calling process.  The properties of this new Session are set automatically
           from information collected about the calling process.
@@ -139,8 +139,8 @@
         <variablelist role="params"><varlistentry><term><parameter>cookie</parameter>:</term><listitem><simpara>The secret cookie that is used to identify the new session</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Manager.OpenSessionWithParameters"><function>OpenSessionWithParameters()</function></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.OpenSessionWithParameters"/>OpenSessionWithParameters ()</title><indexterm><primary>OpenSessionWithParameters</primary><secondary>Manager</secondary></indexterm><programlisting>OpenSessionWithParameters (in  'a(sv)' parameters,
-                           out 's'     cookie)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.OpenSessionWithParameters"/>OpenSessionWithParameters ()</title><indexterm><primary>OpenSessionWithParameters</primary><secondary>Manager</secondary></indexterm><programlisting>OpenSessionWithParameters (in'a(sv)'parameters,
+out's'cookie)</programlisting>
           <para>This method requests that a new <link linkend="Session">Session</link>
           be created for the calling process.  The properties of this new Session are from the
           parameters provided.
@@ -157,14 +157,14 @@ See also:
         <variablelist role="params"><varlistentry><term><parameter>parameters</parameter>:</term><listitem><simpara>An array of sets of property names and values</simpara></listitem></varlistentry><varlistentry><term><parameter>cookie</parameter>:</term><listitem><simpara>The secret cookie that is used to identify the new session</simpara></listitem></varlistentry></variablelist><note><title>Permissions</title><para role="permission">This method is restricted to privileged users by D-Bus policy.</para></note><para>
 See also:
 <link linkend="Session">org.freedesktop.ConsoleKit.Session</link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.CloseSession"/>CloseSession ()</title><indexterm><primary>CloseSession</primary><secondary>Manager</secondary></indexterm><programlisting>CloseSession (in  's' cookie,
-              out 'b' result)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.CloseSession"/>CloseSession ()</title><indexterm><primary>CloseSession</primary><secondary>Manager</secondary></indexterm><programlisting>CloseSession (in's'cookie,
+out'b'result)</programlisting>
           <para>This method is used to close the session identified by the supplied cookie.
           </para>
           <para>The session can only be closed by the same process that opened the session.
           </para>
         <variablelist role="params"><varlistentry><term><parameter>cookie</parameter>:</term><listitem><simpara>The secret cookie that is used to identify the session</simpara></listitem></varlistentry><varlistentry><term><parameter>result</parameter>:</term><listitem><simpara>Whether the session was successfully closed</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.GetSeats"/>GetSeats ()</title><indexterm><primary>GetSeats</primary><secondary>Manager</secondary></indexterm><programlisting>GetSeats (out 'ao' seats)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.GetSeats"/>GetSeats ()</title><indexterm><primary>GetSeats</primary><secondary>Manager</secondary></indexterm><programlisting>GetSeats (out'ao'seats)</programlisting>
           <para>This gets a list of all the <link linkend="Seat">Seats</link>
           that are currently present on the system.</para>
           <para>Each Seat ID is an D-Bus object path for the object that implements the
@@ -172,7 +172,7 @@ See also:
         <variablelist role="params"><varlistentry><term><parameter>seats</parameter>:</term><listitem><simpara>an array of Seat IDs</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Seat">org.freedesktop.ConsoleKit.Seat</link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.GetSessions"/>GetSessions ()</title><indexterm><primary>GetSessions</primary><secondary>Manager</secondary></indexterm><programlisting>GetSessions (out 'ao' sessions)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.GetSessions"/>GetSessions ()</title><indexterm><primary>GetSessions</primary><secondary>Manager</secondary></indexterm><programlisting>GetSessions (out'ao'sessions)</programlisting>
           <para>This gets a list of all the <link linkend="Session">Sessions</link>
           that are currently present on the system.</para>
           <para>Each Session ID is an D-Bus object path for the object that implements the
@@ -180,18 +180,18 @@ See also:
         <variablelist role="params"><varlistentry><term><parameter>sessions</parameter>:</term><listitem><simpara>an array of Session IDs</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Session">org.freedesktop.ConsoleKit.Session</link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.GetSessionForCookie"/>GetSessionForCookie ()</title><indexterm><primary>GetSessionForCookie</primary><secondary>Manager</secondary></indexterm><programlisting>GetSessionForCookie (in  's' cookie,
-                     out 'o' ssid)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.GetSessionForCookie"/>GetSessionForCookie ()</title><indexterm><primary>GetSessionForCookie</primary><secondary>Manager</secondary></indexterm><programlisting>GetSessionForCookie (in's'cookie,
+out'o'ssid)</programlisting>
           <para>Returns the session ID that is associated with the specified cookie.
           </para>
         <variablelist role="params"><varlistentry><term><parameter>cookie</parameter>:</term><listitem><simpara>The secret cookie that is used to identify the session</simpara></listitem></varlistentry><varlistentry><term><parameter>ssid</parameter>:</term><listitem><simpara>The object identifier for the current session</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.GetSessionForUnixProcess"/>GetSessionForUnixProcess ()</title><indexterm><primary>GetSessionForUnixProcess</primary><secondary>Manager</secondary></indexterm><programlisting>GetSessionForUnixProcess (in  'u' pid,
-                          out 'o' ssid)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.GetSessionForUnixProcess"/>GetSessionForUnixProcess ()</title><indexterm><primary>GetSessionForUnixProcess</primary><secondary>Manager</secondary></indexterm><programlisting>GetSessionForUnixProcess (in'u'pid,
+out'o'ssid)</programlisting>
           <para>Attempts to determine the session ID for the specified
           POSIX process ID (pid).
           </para>
         <variablelist role="params"><varlistentry><term><parameter>pid</parameter>:</term><listitem><simpara>The POSIX process ID</simpara></listitem></varlistentry><varlistentry><term><parameter>ssid</parameter>:</term><listitem><simpara>The object identifier for the current session</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.GetCurrentSession"/>GetCurrentSession ()</title><indexterm><primary>GetCurrentSession</primary><secondary>Manager</secondary></indexterm><programlisting>GetCurrentSession (out 'o' ssid)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.GetCurrentSession"/>GetCurrentSession ()</title><indexterm><primary>GetCurrentSession</primary><secondary>Manager</secondary></indexterm><programlisting>GetCurrentSession (out'o'ssid)</programlisting>
           <para>Attempts to determine the session ID that the caller belongs to.
           </para>
           <para>See this example of using dbus-send:
@@ -202,15 +202,15 @@ See also:
   org.freedesktop.ConsoleKit.Manager.GetCurrentSession
           </programlisting></informalexample></para>
         <variablelist role="params"><varlistentry><term><parameter>ssid</parameter>:</term><listitem><simpara>The object identifier for the current session</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.GetSessionsForUnixUser"/>GetSessionsForUnixUser ()</title><indexterm><primary>GetSessionsForUnixUser</primary><secondary>Manager</secondary></indexterm><programlisting>GetSessionsForUnixUser (in  'u'  uid,
-                        out 'ao' sessions)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.GetSessionsForUnixUser"/>GetSessionsForUnixUser ()</title><indexterm><primary>GetSessionsForUnixUser</primary><secondary>Manager</secondary></indexterm><programlisting>GetSessionsForUnixUser (in'u'uid,
+out'ao'sessions)</programlisting>
           <para>This gets a list of all the <link linkend="Session">Sessions</link>
           that are currently open for the specified user.</para>
           <para>Each Session ID is an D-Bus object path for the object that implements the
           <link linkend="Session">Session</link> interface.</para>
         <variablelist role="params"><varlistentry><term><parameter>uid</parameter>:</term><listitem><simpara>POSIX User identification</simpara></listitem></varlistentry><varlistentry><term><parameter>sessions</parameter>:</term><listitem><simpara>an array of Session IDs</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.GetSessionsForUser"/>GetSessionsForUser ()</title><indexterm><primary>GetSessionsForUser</primary><secondary>Manager</secondary></indexterm><programlisting>GetSessionsForUser (in  'u'  uid,
-                    out 'ao' sessions)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.GetSessionsForUser"/>GetSessionsForUser ()</title><indexterm><primary>GetSessionsForUser</primary><secondary>Manager</secondary></indexterm><programlisting>GetSessionsForUser (in'u'uid,
+out'ao'sessions)</programlisting>
           <para>This gets a list of all the <link linkend="Session">Sessions</link>
           that are currently open for the specified user.</para>
           <para>Each Session ID is an D-Bus object path for the object that implements the
@@ -219,12 +219,12 @@ See also:
 
   <link linkend="Manager.GetSessionsForUnixUser"><function>GetSessionsForUnixUser</function></link>
 instead.</para></warning></para></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.GetSystemIdleHint"/>GetSystemIdleHint ()</title><indexterm><primary>GetSystemIdleHint</primary><secondary>Manager</secondary></indexterm><programlisting>GetSystemIdleHint (out 'b' idle_hint)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.GetSystemIdleHint"/>GetSystemIdleHint ()</title><indexterm><primary>GetSystemIdleHint</primary><secondary>Manager</secondary></indexterm><programlisting>GetSystemIdleHint (out'b'idle_hint)</programlisting>
           <para>Returns TRUE if the <link linkend="Session:idle-hint"><literal>idle-hint</literal></link>
           property of every open session is TRUE or if there are no open sessions.
           </para>
         <variablelist role="params"><varlistentry><term><parameter>idle_hint</parameter>:</term><listitem><simpara>The value of the system-idle-hint</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Manager.GetSystemIdleSinceHint"/>GetSystemIdleSinceHint ()</title><indexterm><primary>GetSystemIdleSinceHint</primary><secondary>Manager</secondary></indexterm><programlisting>GetSystemIdleSinceHint (out 's' iso8601_datetime)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager.GetSystemIdleSinceHint"/>GetSystemIdleSinceHint ()</title><indexterm><primary>GetSystemIdleSinceHint</primary><secondary>Manager</secondary></indexterm><programlisting>GetSystemIdleSinceHint (out's'iso8601_datetime)</programlisting>
           <para>Returns an ISO 8601 date-time string that corresponds to
           the time of the last change of the system-idle-hint.
           </para>
@@ -232,15 +232,15 @@ instead.</para></warning></para></refsect2>
   </refsect1>
   <refsect1 role="signals">
     <title role="signals.title">Signal Details</title>
-    <refsect2><title><anchor role="function" id="Manager::SeatAdded"/>The SeatAdded signal</title><indexterm><primary>SeatAdded</primary><secondary>Manager</secondary></indexterm><programlisting>SeatAdded ('o' sid)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager::SeatAdded"/>The SeatAdded signal</title><indexterm><primary>SeatAdded</primary><secondary>Manager</secondary></indexterm><programlisting>SeatAdded ('o'sid)</programlisting>
           <para>Emitted when a Seat has been added to the system.
           </para>
         <variablelist role="params"><varlistentry><term><parameter>sid</parameter>:</term><listitem><simpara>The Seat ID for the added seat</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Manager::SeatRemoved"/>The SeatRemoved signal</title><indexterm><primary>SeatRemoved</primary><secondary>Manager</secondary></indexterm><programlisting>SeatRemoved ('o' sid)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager::SeatRemoved"/>The SeatRemoved signal</title><indexterm><primary>SeatRemoved</primary><secondary>Manager</secondary></indexterm><programlisting>SeatRemoved ('o'sid)</programlisting>
           <para>Emitted when a Seat has been removed from the system.
           </para>
         <variablelist role="params"><varlistentry><term><parameter>sid</parameter>:</term><listitem><simpara>The Seat ID for the removed seat</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Manager::SystemIdleHintChanged"/>The SystemIdleHintChanged signal</title><indexterm><primary>SystemIdleHintChanged</primary><secondary>Manager</secondary></indexterm><programlisting>SystemIdleHintChanged ('b' hint)</programlisting>
+    <refsect2><title><anchor role="function" id="Manager::SystemIdleHintChanged"/>The SystemIdleHintChanged signal</title><indexterm><primary>SystemIdleHintChanged</primary><secondary>Manager</secondary></indexterm><programlisting>SystemIdleHintChanged ('b'hint)</programlisting>
           <para>Emitted when the value of the system-idle-hint has changed.
           </para>
         <variablelist role="params"><varlistentry><term><parameter>hint</parameter>:</term><listitem><simpara>The value of the system-idle-hint</simpara></listitem></varlistentry></variablelist></refsect2>
diff --git a/doc/dbus/org.freedesktop.ConsoleKit.Seat.ref.xml b/doc/dbus/org.freedesktop.ConsoleKit.Seat.ref.xml
index 39ce3c6..41aefcb 100644
--- a/doc/dbus/org.freedesktop.ConsoleKit.Seat.ref.xml
+++ b/doc/dbus/org.freedesktop.ConsoleKit.Seat.ref.xml
@@ -8,21 +8,21 @@
   </refnamediv>
   <refsynopsisdiv role="synopsis">
     <title role="synopsis.title">Methods</title>
-    <synopsis><link linkend="Seat.GetId">GetId</link>               (out 'o'     sid)
-<link linkend="Seat.GetSessions">GetSessions</link>         (out 'ao'    sessions)
-<link linkend="Seat.GetDevices">GetDevices</link>          (out 'a(ss)' devices)
-<link linkend="Seat.GetActiveSession">GetActiveSession</link>    (out 'o'     ssid)
-<link linkend="Seat.CanActivateSessions">CanActivateSessions</link> (out 'b'     can_activate)
-<link linkend="Seat.ActivateSession">ActivateSession</link>     (in  'o'     ssid)
+    <synopsis><link linkend="Seat.GetId">GetId</link>(out'o'sid)
+<link linkend="Seat.GetSessions">GetSessions</link>(out'ao'sessions)
+<link linkend="Seat.GetDevices">GetDevices</link>(out'a(ss)'devices)
+<link linkend="Seat.GetActiveSession">GetActiveSession</link>(out'o'ssid)
+<link linkend="Seat.CanActivateSessions">CanActivateSessions</link>(out'b'can_activate)
+<link linkend="Seat.ActivateSession">ActivateSession</link>(in'o'ssid)
 </synopsis>
   </refsynopsisdiv>
   <refsect1 role="signal_proto">
     <title role="signal_proto.title">Signals</title>
-    <synopsis><link linkend="Seat::ActiveSessionChanged">ActiveSessionChanged</link> ('o'    ssid)
-<link linkend="Seat::SessionAdded">SessionAdded</link>         ('o'    ssid)
-<link linkend="Seat::SessionRemoved">SessionRemoved</link>       ('o'    ssid)
-<link linkend="Seat::DeviceAdded">DeviceAdded</link>          ('(ss)' device)
-<link linkend="Seat::DeviceRemoved">DeviceRemoved</link>        ('(ss)' device)
+    <synopsis><link linkend="Seat::ActiveSessionChanged">ActiveSessionChanged</link>('o'ssid)
+<link linkend="Seat::SessionAdded">SessionAdded</link>('o'ssid)
+<link linkend="Seat::SessionRemoved">SessionRemoved</link>('o'ssid)
+<link linkend="Seat::DeviceAdded">DeviceAdded</link>('(ss)'device)
+<link linkend="Seat::DeviceRemoved">DeviceRemoved</link>('(ss)'device)
 </synopsis>
   </refsect1>
   <refsect1 role="impl_interfaces">
@@ -42,29 +42,29 @@ seat at a time.</para>
     </refsect1>
   <refsect1 role="details">
     <title role="details.title">Details</title>
-    <refsect2><title><anchor role="function" id="Seat.GetId"/>GetId ()</title><indexterm><primary>GetId</primary><secondary>Seat</secondary></indexterm><programlisting>GetId (out 'o' sid)</programlisting>
+    <refsect2><title><anchor role="function" id="Seat.GetId"/>GetId ()</title><indexterm><primary>GetId</primary><secondary>Seat</secondary></indexterm><programlisting>GetId (out'o'sid)</programlisting>
           <para>Returns the ID for Seat.</para>
         <variablelist role="params"><varlistentry><term><parameter>sid</parameter>:</term><listitem><simpara>Seat ID</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Seat.GetSessions"/>GetSessions ()</title><indexterm><primary>GetSessions</primary><secondary>Seat</secondary></indexterm><programlisting>GetSessions (out 'ao' sessions)</programlisting>
+    <refsect2><title><anchor role="function" id="Seat.GetSessions"/>GetSessions ()</title><indexterm><primary>GetSessions</primary><secondary>Seat</secondary></indexterm><programlisting>GetSessions (out'ao'sessions)</programlisting>
           <para>This gets a list of all the <link linkend="Session">Sessions</link>
           that are currently attached to this seat.</para>
           <para>Each Session ID is an D-Bus object path for the object that implements the
           <link linkend="Session">Session</link> interface.</para>
         <variablelist role="params"><varlistentry><term><parameter>sessions</parameter>:</term><listitem><simpara>an array of Session IDs</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Seat.GetDevices"/>GetDevices ()</title><indexterm><primary>GetDevices</primary><secondary>Seat</secondary></indexterm><programlisting>GetDevices (out 'a(ss)' devices)</programlisting>
+    <refsect2><title><anchor role="function" id="Seat.GetDevices"/>GetDevices ()</title><indexterm><primary>GetDevices</primary><secondary>Seat</secondary></indexterm><programlisting>GetDevices (out'a(ss)'devices)</programlisting>
           <para>This gets a list of all the devices
           that are currently associated with this seat.</para>
           <para>Each device is an D-Bus structure that represents
           the device type and the device id.
           </para>
         <variablelist role="params"><varlistentry><term><parameter>devices</parameter>:</term><listitem><simpara>an array of devices</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Seat.GetActiveSession"/>GetActiveSession ()</title><indexterm><primary>GetActiveSession</primary><secondary>Seat</secondary></indexterm><programlisting>GetActiveSession (out 'o' ssid)</programlisting>
+    <refsect2><title><anchor role="function" id="Seat.GetActiveSession"/>GetActiveSession ()</title><indexterm><primary>GetActiveSession</primary><secondary>Seat</secondary></indexterm><programlisting>GetActiveSession (out'o'ssid)</programlisting>
           <para>Gets the Session ID that is currently active on this Seat.</para>
           <para>Returns NULL if there is no active session.</para>
         <variablelist role="params"><varlistentry><term><parameter>ssid</parameter>:</term><listitem><simpara>Session ID</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Seat.CanActivateSessions"/>CanActivateSessions ()</title><indexterm><primary>CanActivateSessions</primary><secondary>Seat</secondary></indexterm><programlisting>CanActivateSessions (out 'b' can_activate)</programlisting><para>Used to determine whether the seat supports session activation.</para>
+    <refsect2><title><anchor role="function" id="Seat.CanActivateSessions"/>CanActivateSessions ()</title><indexterm><primary>CanActivateSessions</primary><secondary>Seat</secondary></indexterm><programlisting>CanActivateSessions (out'b'can_activate)</programlisting><para>Used to determine whether the seat supports session activation.</para>
         <variablelist role="params"><varlistentry><term><parameter>can_activate</parameter>:</term><listitem><simpara>TRUE if seat supports session activation</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Seat.ActivateSession"/>ActivateSession ()</title><indexterm><primary>ActivateSession</primary><secondary>Seat</secondary></indexterm><programlisting>ActivateSession (in  'o' ssid)</programlisting>
+    <refsect2><title><anchor role="function" id="Seat.ActivateSession"/>ActivateSession ()</title><indexterm><primary>ActivateSession</primary><secondary>Seat</secondary></indexterm><programlisting>ActivateSession (in'o'ssid)</programlisting>
           <para>Attempt to activate the specified session.  In most
           cases, if successful, this will cause the session to
           become visible and take control of the hardware that is
@@ -75,19 +75,19 @@ See also:
   </refsect1>
   <refsect1 role="signals">
     <title role="signals.title">Signal Details</title>
-    <refsect2><title><anchor role="function" id="Seat::ActiveSessionChanged"/>The ActiveSessionChanged signal</title><indexterm><primary>ActiveSessionChanged</primary><secondary>Seat</secondary></indexterm><programlisting>ActiveSessionChanged ('o' ssid)</programlisting>
+    <refsect2><title><anchor role="function" id="Seat::ActiveSessionChanged"/>The ActiveSessionChanged signal</title><indexterm><primary>ActiveSessionChanged</primary><secondary>Seat</secondary></indexterm><programlisting>ActiveSessionChanged ('o'ssid)</programlisting>
           <para>Emitted when the active session has changed.</para>
         <variablelist role="params"><varlistentry><term><parameter>ssid</parameter>:</term><listitem><simpara>Session ID</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Seat::SessionAdded"/>The SessionAdded signal</title><indexterm><primary>SessionAdded</primary><secondary>Seat</secondary></indexterm><programlisting>SessionAdded ('o' ssid)</programlisting>
+    <refsect2><title><anchor role="function" id="Seat::SessionAdded"/>The SessionAdded signal</title><indexterm><primary>SessionAdded</primary><secondary>Seat</secondary></indexterm><programlisting>SessionAdded ('o'ssid)</programlisting>
           <para>Emitted when a session has been added to the seat.</para>
         <variablelist role="params"><varlistentry><term><parameter>ssid</parameter>:</term><listitem><simpara>Session ID</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Seat::SessionRemoved"/>The SessionRemoved signal</title><indexterm><primary>SessionRemoved</primary><secondary>Seat</secondary></indexterm><programlisting>SessionRemoved ('o' ssid)</programlisting>
+    <refsect2><title><anchor role="function" id="Seat::SessionRemoved"/>The SessionRemoved signal</title><indexterm><primary>SessionRemoved</primary><secondary>Seat</secondary></indexterm><programlisting>SessionRemoved ('o'ssid)</programlisting>
           <para>Emitted when a session has been removed from the seat.</para>
         <variablelist role="params"><varlistentry><term><parameter>ssid</parameter>:</term><listitem><simpara>Session ID</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Seat::DeviceAdded"/>The DeviceAdded signal</title><indexterm><primary>DeviceAdded</primary><secondary>Seat</secondary></indexterm><programlisting>DeviceAdded ('(ss)' device)</programlisting>
+    <refsect2><title><anchor role="function" id="Seat::DeviceAdded"/>The DeviceAdded signal</title><indexterm><primary>DeviceAdded</primary><secondary>Seat</secondary></indexterm><programlisting>DeviceAdded ('(ss)'device)</programlisting>
           <para>Emitted when a device has been associated with the seat.</para>
         <variablelist role="params"><varlistentry><term><parameter>device</parameter>:</term><listitem><simpara>Device structure</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Seat::DeviceRemoved"/>The DeviceRemoved signal</title><indexterm><primary>DeviceRemoved</primary><secondary>Seat</secondary></indexterm><programlisting>DeviceRemoved ('(ss)' device)</programlisting>
+    <refsect2><title><anchor role="function" id="Seat::DeviceRemoved"/>The DeviceRemoved signal</title><indexterm><primary>DeviceRemoved</primary><secondary>Seat</secondary></indexterm><programlisting>DeviceRemoved ('(ss)'device)</programlisting>
           <para>Emitted when a device has been dissociated from the seat.</para>
         <variablelist role="params"><varlistentry><term><parameter>device</parameter>:</term><listitem><simpara>Device structure</simpara></listitem></varlistentry></variablelist></refsect2>
   </refsect1>
diff --git a/doc/dbus/org.freedesktop.ConsoleKit.Session.ref.xml b/doc/dbus/org.freedesktop.ConsoleKit.Session.ref.xml
index 59f3c17..8b578f7 100644
--- a/doc/dbus/org.freedesktop.ConsoleKit.Session.ref.xml
+++ b/doc/dbus/org.freedesktop.ConsoleKit.Session.ref.xml
@@ -8,33 +8,33 @@
   </refnamediv>
   <refsynopsisdiv role="synopsis">
     <title role="synopsis.title">Methods</title>
-    <synopsis><link linkend="Session.GetId">GetId</link>               (out 'o' ssid)
-<link linkend="Session.GetSeatId">GetSeatId</link>           (out 'o' sid)
-<link linkend="Session.GetSessionType">GetSessionType</link>      (out 's' type)
-<link linkend="Session.GetUser">GetUser</link>             (out 'u' uid)
-<link linkend="Session.GetUnixUser">GetUnixUser</link>         (out 'u' uid)
-<link linkend="Session.GetX11Display">GetX11Display</link>       (out 's' display)
-<link linkend="Session.GetX11DisplayDevice">GetX11DisplayDevice</link> (out 's' x11_display_device)
-<link linkend="Session.GetDisplayDevice">GetDisplayDevice</link>    (out 's' display_device)
-<link linkend="Session.GetRemoteHostName">GetRemoteHostName</link>   (out 's' remote_host_name)
-<link linkend="Session.GetLoginSessionId">GetLoginSessionId</link>   (out 's' login_session_id)
-<link linkend="Session.IsActive">IsActive</link>            (out 'b' active)
-<link linkend="Session.IsLocal">IsLocal</link>             (out 'b' local)
-<link linkend="Session.GetCreationTime">GetCreationTime</link>     (out 's' iso8601_datetime)
-<link linkend="Session.Activate">Activate</link>            ()
-<link linkend="Session.Lock">Lock</link>                ()
-<link linkend="Session.Unlock">Unlock</link>              ()
-<link linkend="Session.GetIdleHint">GetIdleHint</link>         (out 'b' idle_hint)
-<link linkend="Session.GetIdleSinceHint">GetIdleSinceHint</link>    (out 's' iso8601_datetime)
-<link linkend="Session.SetIdleHint">SetIdleHint</link>         (in  'b' idle_hint)
+    <synopsis><link linkend="Session.GetId">GetId</link>(out'o'ssid)
+<link linkend="Session.GetSeatId">GetSeatId</link>(out'o'sid)
+<link linkend="Session.GetSessionType">GetSessionType</link>(out's'type)
+<link linkend="Session.GetUser">GetUser</link>(out'u'uid)
+<link linkend="Session.GetUnixUser">GetUnixUser</link>(out'u'uid)
+<link linkend="Session.GetX11Display">GetX11Display</link>(out's'display)
+<link linkend="Session.GetX11DisplayDevice">GetX11DisplayDevice</link>(out's'x11_display_device)
+<link linkend="Session.GetDisplayDevice">GetDisplayDevice</link>(out's'display_device)
+<link linkend="Session.GetRemoteHostName">GetRemoteHostName</link>(out's'remote_host_name)
+<link linkend="Session.GetLoginSessionId">GetLoginSessionId</link>(out's'login_session_id)
+<link linkend="Session.IsActive">IsActive</link>(out'b'active)
+<link linkend="Session.IsLocal">IsLocal</link>(out'b'local)
+<link linkend="Session.GetCreationTime">GetCreationTime</link>(out's'iso8601_datetime)
+<link linkend="Session.Activate">Activate</link>()
+<link linkend="Session.Lock">Lock</link>()
+<link linkend="Session.Unlock">Unlock</link>()
+<link linkend="Session.GetIdleHint">GetIdleHint</link>(out'b'idle_hint)
+<link linkend="Session.GetIdleSinceHint">GetIdleSinceHint</link>(out's'iso8601_datetime)
+<link linkend="Session.SetIdleHint">SetIdleHint</link>(in'b'idle_hint)
 </synopsis>
   </refsynopsisdiv>
   <refsect1 role="signal_proto">
     <title role="signal_proto.title">Signals</title>
-    <synopsis><link linkend="Session::ActiveChanged">ActiveChanged</link>   ('b' is_active)
-<link linkend="Session::IdleHintChanged">IdleHintChanged</link> ('b' hint)
-<link linkend="Session::Lock">Lock</link>            ()
-<link linkend="Session::Unlock">Unlock</link>          ()
+    <synopsis><link linkend="Session::ActiveChanged">ActiveChanged</link>('b'is_active)
+<link linkend="Session::IdleHintChanged">IdleHintChanged</link>('b'hint)
+<link linkend="Session::Lock">Lock</link>()
+<link linkend="Session::Unlock">Unlock</link>()
 </synopsis>
   </refsect1>
   <refsect1 role="impl_interfaces">
@@ -47,16 +47,16 @@
   </refsect1>
   <refsect1 role="properties">
     <title role="properties.title">Properties</title>
-    <synopsis><link linkend="Session:unix-user">'unix-user'</link>          readwrite 'u'
-<link linkend="Session:user">'user'</link>               readwrite 'u'
-<link linkend="Session:session-type">'session-type'</link>       readwrite 's'
-<link linkend="Session:remote-host-name">'remote-host-name'</link>   readwrite 's'
-<link linkend="Session:display-device">'display-device'</link>     readwrite 's'
-<link linkend="Session:x11-display">'x11-display'</link>        readwrite 's'
-<link linkend="Session:x11-display-device">'x11-display-device'</link> readwrite 's'
-<link linkend="Session:active">'active'</link>             readwrite 'b'
-<link linkend="Session:is-local">'is-local'</link>           readwrite 'b'
-<link linkend="Session:idle-hint">'idle-hint'</link>          readwrite 'b'
+    <synopsis><link linkend="Session:unix-user">'unix-user'</link>readwrite'u'
+<link linkend="Session:user">'user'</link>readwrite'u'
+<link linkend="Session:session-type">'session-type'</link>readwrite's'
+<link linkend="Session:remote-host-name">'remote-host-name'</link>readwrite's'
+<link linkend="Session:display-device">'display-device'</link>readwrite's'
+<link linkend="Session:x11-display">'x11-display'</link>readwrite's'
+<link linkend="Session:x11-display-device">'x11-display-device'</link>readwrite's'
+<link linkend="Session:active">'active'</link>readwrite'b'
+<link linkend="Session:is-local">'is-local'</link>readwrite'b'
+<link linkend="Session:idle-hint">'idle-hint'</link>readwrite'b'
 </synopsis>
   </refsect1>
   <refsect1 role="desc"><title role="desc.title">Description</title>
@@ -71,14 +71,14 @@
     </refsect1>
   <refsect1 role="details">
     <title role="details.title">Details</title>
-    <refsect2><title><anchor role="function" id="Session.GetId"/>GetId ()</title><indexterm><primary>GetId</primary><secondary>Session</secondary></indexterm><programlisting>GetId (out 'o' ssid)</programlisting><para>Returns the ID for Session.</para>
+    <refsect2><title><anchor role="function" id="Session.GetId"/>GetId ()</title><indexterm><primary>GetId</primary><secondary>Session</secondary></indexterm><programlisting>GetId (out'o'ssid)</programlisting><para>Returns the ID for Session.</para>
         <variablelist role="params"><varlistentry><term><parameter>ssid</parameter>:</term><listitem><simpara>Session ID</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetSeatId"/>GetSeatId ()</title><indexterm><primary>GetSeatId</primary><secondary>Session</secondary></indexterm><programlisting>GetSeatId (out 'o' sid)</programlisting><para>Returns the ID for the Seat the Session is
+    <refsect2><title><anchor role="function" id="Session.GetSeatId"/>GetSeatId ()</title><indexterm><primary>GetSeatId</primary><secondary>Session</secondary></indexterm><programlisting>GetSeatId (out'o'sid)</programlisting><para>Returns the ID for the Seat the Session is
         attached to.</para>
         <variablelist role="params"><varlistentry><term><parameter>sid</parameter>:</term><listitem><simpara>Seat ID</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Seat">org.freedesktop.ConsoleKit.Seat</link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetSessionType"/>GetSessionType ()</title><indexterm><primary>GetSessionType</primary><secondary>Session</secondary></indexterm><programlisting>GetSessionType (out 's' type)</programlisting>
+    <refsect2><title><anchor role="function" id="Session.GetSessionType"/>GetSessionType ()</title><indexterm><primary>GetSessionType</primary><secondary>Session</secondary></indexterm><programlisting>GetSessionType (out's'type)</programlisting>
           <para>Returns the type of the session.</para>
           <para>Warning: we haven't yet defined the allowed values for this property.
           It is probably best to avoid this until we do.
@@ -86,50 +86,50 @@ See also:
         <variablelist role="params"><varlistentry><term><parameter>type</parameter>:</term><listitem><simpara>Session type</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Session:session-type"><literal>session-type</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetUser"/>GetUser ()</title><indexterm><primary>GetUser</primary><secondary>Session</secondary></indexterm><programlisting>GetUser (out 'u' uid)</programlisting><para>Returns the user that the session belongs to.</para>
+    <refsect2><title><anchor role="function" id="Session.GetUser"/>GetUser ()</title><indexterm><primary>GetUser</primary><secondary>Session</secondary></indexterm><programlisting>GetUser (out'u'uid)</programlisting><para>Returns the user that the session belongs to.</para>
         <variablelist role="params"><varlistentry><term><parameter>uid</parameter>:</term><listitem><simpara>User ID</simpara></listitem></varlistentry></variablelist><para role="deprecated"><warning><para><literal>GetUser</literal> is deprecated since version 0.1.3 and should not be used in newly-written code. Use
 
   <link linkend="Session.GetUnixUser"><function>GetUnixUser</function></link>
 instead.</para></warning></para><para>
 See also:
 <link linkend="Session:user"><literal>user</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetUnixUser"/>GetUnixUser ()</title><indexterm><primary>GetUnixUser</primary><secondary>Session</secondary></indexterm><programlisting>GetUnixUser (out 'u' uid)</programlisting><para>Returns the POSIX user ID that the session belongs to.</para>
+    <refsect2><title><anchor role="function" id="Session.GetUnixUser"/>GetUnixUser ()</title><indexterm><primary>GetUnixUser</primary><secondary>Session</secondary></indexterm><programlisting>GetUnixUser (out'u'uid)</programlisting><para>Returns the POSIX user ID that the session belongs to.</para>
         <variablelist role="params"><varlistentry><term><parameter>uid</parameter>:</term><listitem><simpara>POSIX User ID</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Session:unix-user"><literal>unix-user</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetX11Display"/>GetX11Display ()</title><indexterm><primary>GetX11Display</primary><secondary>Session</secondary></indexterm><programlisting>GetX11Display (out 's' display)</programlisting><para>Returns the value of the X11 DISPLAY for this session
+    <refsect2><title><anchor role="function" id="Session.GetX11Display"/>GetX11Display ()</title><indexterm><primary>GetX11Display</primary><secondary>Session</secondary></indexterm><programlisting>GetX11Display (out's'display)</programlisting><para>Returns the value of the X11 DISPLAY for this session
         if one is present.</para>
         <variablelist role="params"><varlistentry><term><parameter>display</parameter>:</term><listitem><simpara>The value of the X11 display</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Session:x11-display"><literal>x11-display</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetX11DisplayDevice"/>GetX11DisplayDevice ()</title><indexterm><primary>GetX11DisplayDevice</primary><secondary>Session</secondary></indexterm><programlisting>GetX11DisplayDevice (out 's' x11_display_device)</programlisting><para>Returns the value of the display device (aka TTY) that the
+    <refsect2><title><anchor role="function" id="Session.GetX11DisplayDevice"/>GetX11DisplayDevice ()</title><indexterm><primary>GetX11DisplayDevice</primary><secondary>Session</secondary></indexterm><programlisting>GetX11DisplayDevice (out's'x11_display_device)</programlisting><para>Returns the value of the display device (aka TTY) that the
         X11 display for the session is connected to.  If there is no x11-display set then this value
         is undefined.</para>
         <variablelist role="params"><varlistentry><term><parameter>x11_display_device</parameter>:</term><listitem><simpara>The value of the X11 display device</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Session:x11-display-device"><literal>x11-display-device</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetDisplayDevice"/>GetDisplayDevice ()</title><indexterm><primary>GetDisplayDevice</primary><secondary>Session</secondary></indexterm><programlisting>GetDisplayDevice (out 's' display_device)</programlisting><para>Returns the value of the display device (aka TTY) that the
+    <refsect2><title><anchor role="function" id="Session.GetDisplayDevice"/>GetDisplayDevice ()</title><indexterm><primary>GetDisplayDevice</primary><secondary>Session</secondary></indexterm><programlisting>GetDisplayDevice (out's'display_device)</programlisting><para>Returns the value of the display device (aka TTY) that the
         session is connected to.</para>
         <variablelist role="params"><varlistentry><term><parameter>display_device</parameter>:</term><listitem><simpara>The value of the display device</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Session:display-device"><literal>display-device</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetRemoteHostName"/>GetRemoteHostName ()</title><indexterm><primary>GetRemoteHostName</primary><secondary>Session</secondary></indexterm><programlisting>GetRemoteHostName (out 's' remote_host_name)</programlisting><para>Returns the value of the remote host name for the session.
+    <refsect2><title><anchor role="function" id="Session.GetRemoteHostName"/>GetRemoteHostName ()</title><indexterm><primary>GetRemoteHostName</primary><secondary>Session</secondary></indexterm><programlisting>GetRemoteHostName (out's'remote_host_name)</programlisting><para>Returns the value of the remote host name for the session.
         </para>
         <variablelist role="params"><varlistentry><term><parameter>remote_host_name</parameter>:</term><listitem><simpara>The remote host name</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Session:remote-host-name"><literal>remote-host-name</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetLoginSessionId"/>GetLoginSessionId ()</title><indexterm><primary>GetLoginSessionId</primary><secondary>Session</secondary></indexterm><programlisting>GetLoginSessionId (out 's' login_session_id)</programlisting><para>Returns the value of the login session ID that the
+    <refsect2><title><anchor role="function" id="Session.GetLoginSessionId"/>GetLoginSessionId ()</title><indexterm><primary>GetLoginSessionId</primary><secondary>Session</secondary></indexterm><programlisting>GetLoginSessionId (out's'login_session_id)</programlisting><para>Returns the value of the login session ID that the
         underlying system uses to enforce session boundaries.  If there is no login session ID
         set then this value is an empty string.</para>
         <variablelist role="params"><varlistentry><term><parameter>login_session_id</parameter>:</term><listitem><simpara>The value of the native system login session ID</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Session.IsActive"/>IsActive ()</title><indexterm><primary>IsActive</primary><secondary>Session</secondary></indexterm><programlisting>IsActive (out 'b' active)</programlisting><para>Returns whether the session is active on the Seat that
+    <refsect2><title><anchor role="function" id="Session.IsActive"/>IsActive ()</title><indexterm><primary>IsActive</primary><secondary>Session</secondary></indexterm><programlisting>IsActive (out'b'active)</programlisting><para>Returns whether the session is active on the Seat that
         it is attached to.</para>
         <para>If the session is not attached to a seat this value is undefined.
         </para>
         <variablelist role="params"><varlistentry><term><parameter>active</parameter>:</term><listitem><simpara>TRUE if the session is active, otherwise FALSE</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Session:active"><literal>active</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.IsLocal"/>IsLocal ()</title><indexterm><primary>IsLocal</primary><secondary>Session</secondary></indexterm><programlisting>IsLocal (out 'b' local)</programlisting><para>Returns whether the session is local</para>
+    <refsect2><title><anchor role="function" id="Session.IsLocal"/>IsLocal ()</title><indexterm><primary>IsLocal</primary><secondary>Session</secondary></indexterm><programlisting>IsLocal (out'b'local)</programlisting><para>Returns whether the session is local</para>
         <para>FIXME: we need to come up with a concrete definition for this value.
         It was originally used as a way to identify XDMCP sessions that originate
         from a remote system.
@@ -137,7 +137,7 @@ See also:
         <variablelist role="params"><varlistentry><term><parameter>local</parameter>:</term><listitem><simpara>TRUE if the session is local, otherwise FALSE</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Session:is-local"><literal>is-local</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetCreationTime"/>GetCreationTime ()</title><indexterm><primary>GetCreationTime</primary><secondary>Session</secondary></indexterm><programlisting>GetCreationTime (out 's' iso8601_datetime)</programlisting>
+    <refsect2><title><anchor role="function" id="Session.GetCreationTime"/>GetCreationTime ()</title><indexterm><primary>GetCreationTime</primary><secondary>Session</secondary></indexterm><programlisting>GetCreationTime (out's'iso8601_datetime)</programlisting>
           <para>Returns an ISO 8601 date-time string that corresponds to
           the time that the session was opened.
           </para>
@@ -167,19 +167,19 @@ See also:
         <note><title>Permissions</title><para role="permission">This method is restricted to privileged users by D-Bus policy.</para></note><para>
 See also:
 <link linkend="Session::Unlock"><literal>Unlock signal</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetIdleHint"/>GetIdleHint ()</title><indexterm><primary>GetIdleHint</primary><secondary>Session</secondary></indexterm><programlisting>GetIdleHint (out 'b' idle_hint)</programlisting>
+    <refsect2><title><anchor role="function" id="Session.GetIdleHint"/>GetIdleHint ()</title><indexterm><primary>GetIdleHint</primary><secondary>Session</secondary></indexterm><programlisting>GetIdleHint (out'b'idle_hint)</programlisting>
           <para>Gets the value of the <link linkend="Session:idle-hint"><literal>idle-hint</literal></link>
           property.
           </para>
         <variablelist role="params"><varlistentry><term><parameter>idle_hint</parameter>:</term><listitem><simpara>The value of the idle-hint</simpara></listitem></varlistentry></variablelist><para>
 See also:
 <link linkend="Session:idle-hint"><literal>idle-hint</literal></link></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session.GetIdleSinceHint"/>GetIdleSinceHint ()</title><indexterm><primary>GetIdleSinceHint</primary><secondary>Session</secondary></indexterm><programlisting>GetIdleSinceHint (out 's' iso8601_datetime)</programlisting>
+    <refsect2><title><anchor role="function" id="Session.GetIdleSinceHint"/>GetIdleSinceHint ()</title><indexterm><primary>GetIdleSinceHint</primary><secondary>Session</secondary></indexterm><programlisting>GetIdleSinceHint (out's'iso8601_datetime)</programlisting>
           <para>Returns an ISO 8601 date-time string that corresponds to
           the time of the last change of the idle-hint.
           </para>
         <variablelist role="params"><varlistentry><term><parameter>iso8601_datetime</parameter>:</term><listitem><simpara>An ISO 8601 format date-type string</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Session.SetIdleHint"/>SetIdleHint ()</title><indexterm><primary>SetIdleHint</primary><secondary>Session</secondary></indexterm><programlisting>SetIdleHint (in  'b' idle_hint)</programlisting>
+    <refsect2><title><anchor role="function" id="Session.SetIdleHint"/>SetIdleHint ()</title><indexterm><primary>SetIdleHint</primary><secondary>Session</secondary></indexterm><programlisting>SetIdleHint (in'b'idle_hint)</programlisting>
           <para>This may be used by the session to indicate that
           it is idle.
           </para>
@@ -189,10 +189,10 @@ See also:
   </refsect1>
   <refsect1 role="signals">
     <title role="signals.title">Signal Details</title>
-    <refsect2><title><anchor role="function" id="Session::ActiveChanged"/>The ActiveChanged signal</title><indexterm><primary>ActiveChanged</primary><secondary>Session</secondary></indexterm><programlisting>ActiveChanged ('b' is_active)</programlisting>
+    <refsect2><title><anchor role="function" id="Session::ActiveChanged"/>The ActiveChanged signal</title><indexterm><primary>ActiveChanged</primary><secondary>Session</secondary></indexterm><programlisting>ActiveChanged ('b'is_active)</programlisting>
           <para>Emitted when the active property has changed.</para>
         <variablelist role="params"><varlistentry><term><parameter>is_active</parameter>:</term><listitem><simpara>TRUE if the session is active, otherwise FALSE</simpara></listitem></varlistentry></variablelist></refsect2>
-    <refsect2><title><anchor role="function" id="Session::IdleHintChanged"/>The IdleHintChanged signal</title><indexterm><primary>IdleHintChanged</primary><secondary>Session</secondary></indexterm><programlisting>IdleHintChanged ('b' hint)</programlisting>
+    <refsect2><title><anchor role="function" id="Session::IdleHintChanged"/>The IdleHintChanged signal</title><indexterm><primary>IdleHintChanged</primary><secondary>Session</secondary></indexterm><programlisting>IdleHintChanged ('b'hint)</programlisting>
           <para>Emitted when the idle-hint property has changed.</para>
         <variablelist role="params"><varlistentry><term><parameter>hint</parameter>:</term><listitem><simpara>the new value of idle-hint</simpara></listitem></varlistentry></variablelist></refsect2>
     <refsect2><title><anchor role="function" id="Session::Lock"/>The Lock signal</title><indexterm><primary>Lock</primary><secondary>Session</secondary></indexterm><programlisting>Lock ()</programlisting>
@@ -206,25 +206,25 @@ See also:
   </refsect1>
   <refsect1 role="property_details">
     <title role="property_details.title">Property Details</title>
-    <refsect2><title><anchor role="function" id="Session:unix-user"/>The "unix-user" property</title><indexterm><primary>unix-user</primary><secondary>Session</secondary></indexterm><programlisting>'unix-user'  readwrite 'u'
+    <refsect2><title><anchor role="function" id="Session:unix-user"/>The "unix-user" property</title><indexterm><primary>unix-user</primary><secondary>Session</secondary></indexterm><programlisting>'unix-user'readwrite'u'
 </programlisting>
           <para>The user assigned to the session.</para>
         </refsect2>
-    <refsect2><title><anchor role="function" id="Session:user"/>The "user" property</title><indexterm><primary>user</primary><secondary>Session</secondary></indexterm><programlisting>'user'  readwrite 'u'
+    <refsect2><title><anchor role="function" id="Session:user"/>The "user" property</title><indexterm><primary>user</primary><secondary>Session</secondary></indexterm><programlisting>'user'readwrite'u'
 </programlisting>
           <para>The user assigned to the session.</para>
         <para role="deprecated"><warning><para><literal>user</literal> is deprecated since version 0.1.3 and should not be used in newly-written code. Use
 
   <link linkend="Session:unix-user"><literal>unix-user</literal></link>
 instead.</para></warning></para></refsect2>
-    <refsect2><title><anchor role="function" id="Session:session-type"/>The "session-type" property</title><indexterm><primary>session-type</primary><secondary>Session</secondary></indexterm><programlisting>'session-type'  readwrite 's'
+    <refsect2><title><anchor role="function" id="Session:session-type"/>The "session-type" property</title><indexterm><primary>session-type</primary><secondary>Session</secondary></indexterm><programlisting>'session-type'readwrite's'
 </programlisting>
           <para>The type of the session.</para>
           <para>Warning: we haven't yet defined the allowed values for this property.
           It is probably best to avoid this until we do.
           </para>
         </refsect2>
-    <refsect2><title><anchor role="function" id="Session:remote-host-name"/>The "remote-host-name" property</title><indexterm><primary>remote-host-name</primary><secondary>Session</secondary></indexterm><programlisting>'remote-host-name'  readwrite 's'
+    <refsect2><title><anchor role="function" id="Session:remote-host-name"/>The "remote-host-name" property</title><indexterm><primary>remote-host-name</primary><secondary>Session</secondary></indexterm><programlisting>'remote-host-name'readwrite's'
 </programlisting>
           <para>The remote host name for the session.
           </para>
@@ -235,19 +235,19 @@ instead.</para></warning></para></refsect2>
           session is created from an SSH or XDMCP connection.
           </para>
         </refsect2>
-    <refsect2><title><anchor role="function" id="Session:display-device"/>The "display-device" property</title><indexterm><primary>display-device</primary><secondary>Session</secondary></indexterm><programlisting>'display-device'  readwrite 's'
+    <refsect2><title><anchor role="function" id="Session:display-device"/>The "display-device" property</title><indexterm><primary>display-device</primary><secondary>Session</secondary></indexterm><programlisting>'display-device'readwrite's'
 </programlisting>
           <para>The display device (aka TTY) that the
           session is connected to.
           </para>
         </refsect2>
-    <refsect2><title><anchor role="function" id="Session:x11-display"/>The "x11-display" property</title><indexterm><primary>x11-display</primary><secondary>Session</secondary></indexterm><programlisting>'x11-display'  readwrite 's'
+    <refsect2><title><anchor role="function" id="Session:x11-display"/>The "x11-display" property</title><indexterm><primary>x11-display</primary><secondary>Session</secondary></indexterm><programlisting>'x11-display'readwrite's'
 </programlisting>
           <para>Value of the X11 DISPLAY for this session
           if one is present.
           </para>
         </refsect2>
-    <refsect2><title><anchor role="function" id="Session:x11-display-device"/>The "x11-display-device" property</title><indexterm><primary>x11-display-device</primary><secondary>Session</secondary></indexterm><programlisting>'x11-display-device'  readwrite 's'
+    <refsect2><title><anchor role="function" id="Session:x11-display-device"/>The "x11-display-device" property</title><indexterm><primary>x11-display-device</primary><secondary>Session</secondary></indexterm><programlisting>'x11-display-device'readwrite's'
 </programlisting>
           <para>
           The display device (aka TTY) that the X11 display for the
@@ -255,7 +255,7 @@ instead.</para></warning></para></refsect2>
           this value is undefined.
           </para>
         </refsect2>
-    <refsect2><title><anchor role="function" id="Session:active"/>The "active" property</title><indexterm><primary>active</primary><secondary>Session</secondary></indexterm><programlisting>'active'  readwrite 'b'
+    <refsect2><title><anchor role="function" id="Session:active"/>The "active" property</title><indexterm><primary>active</primary><secondary>Session</secondary></indexterm><programlisting>'active'readwrite'b'
 </programlisting>
           <para>
           Whether the session is active on the Seat that
@@ -263,7 +263,7 @@ instead.</para></warning></para></refsect2>
           <para>If the session is not attached to a seat this value is undefined.
           </para>
         </refsect2>
-    <refsect2><title><anchor role="function" id="Session:is-local"/>The "is-local" property</title><indexterm><primary>is-local</primary><secondary>Session</secondary></indexterm><programlisting>'is-local'  readwrite 'b'
+    <refsect2><title><anchor role="function" id="Session:is-local"/>The "is-local" property</title><indexterm><primary>is-local</primary><secondary>Session</secondary></indexterm><programlisting>'is-local'readwrite'b'
 </programlisting>
           <para>
           Whether the session is local</para>
@@ -272,7 +272,7 @@ instead.</para></warning></para></refsect2>
           from a remote system.
           </para>
         </refsect2>
-    <refsect2><title><anchor role="function" id="Session:idle-hint"/>The "idle-hint" property</title><indexterm><primary>idle-hint</primary><secondary>Session</secondary></indexterm><programlisting>'idle-hint'  readwrite 'b'
+    <refsect2><title><anchor role="function" id="Session:idle-hint"/>The "idle-hint" property</title><indexterm><primary>idle-hint</primary><secondary>Session</secondary></indexterm><programlisting>'idle-hint'readwrite'b'
 </programlisting>
           <para>
           This is a hint used to indicate that the session may be idle.