summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorRichard Hughes <richard@hughsie.com>2010-01-21 14:47:21 +0000
committerRichard Hughes <richard@hughsie.com>2010-01-21 14:47:21 +0000
commitfaeb7ffabc78c117bb02119d512a64bcc051c3b2 (patch)
tree753de7542ac1814b31938e5306d241315993daa2 /doc
parentadcb737767d42059ea7ad6d1fbd7184fea1b425e (diff)
Rename the man pages and rename the main daemon binary name
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.am12
-rw-r--r--doc/devkit-power-docs.xml2
-rw-r--r--doc/man/Makefile.am17
-rw-r--r--doc/man/UPower.xml (renamed from doc/man/DeviceKit-power.xml)22
-rw-r--r--doc/man/upower.xml (renamed from doc/man/devkit-power.xml)24
-rw-r--r--doc/man/upowerd.xml (renamed from doc/man/devkit-power-daemon.xml)20
6 files changed, 45 insertions, 52 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5c31452..1f0bbaa 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -49,12 +49,12 @@ MKTMPL_OPTIONS=
# Non-autogenerated SGML files to be included in $(DOC_MAIN_SGML_FILE)
content_files = \
version.xml \
- man/devkit-power.xml \
- man/devkit-power-daemon.xml \
- man/DeviceKit-power.xml \
- dbus/org.freedesktop.UPower.ref.xml \
- dbus/org.freedesktop.UPower.Device.ref.xml \
- dbus/org.freedesktop.UPower.QoS.ref.xml \
+ man/upower.xml \
+ man/upowerd.xml \
+ man/UPower.xml \
+ dbus/org.freedesktop.UPower.ref.xml \
+ dbus/org.freedesktop.UPower.Device.ref.xml \
+ dbus/org.freedesktop.UPower.QoS.ref.xml \
$(NULL)
# Images to copy into HTML directory
diff --git a/doc/devkit-power-docs.xml b/doc/devkit-power-docs.xml
index 6a4193b..51b67f2 100644
--- a/doc/devkit-power-docs.xml
+++ b/doc/devkit-power-docs.xml
@@ -77,7 +77,7 @@
</para>
</partintro>
<xi:include href="man/DeviceKit-power.xml"/>
- <xi:include href="man/devkit-power-daemon.xml"/>
+ <xi:include href="man/upowerd.xml"/>
<xi:include href="man/devkit-power.xml"/>
</reference>
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index f49dde9..6a7489f 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,13 +1,9 @@
-
-NULL =
-
if MAN_PAGES_ENABLED
man_MANS = \
- devkit-power.1 \
- devkit-power-daemon.8 \
- DeviceKit-power.7 \
- $(NULL)
+ upower.1 \
+ upowerd.8 \
+ UPower.7
%.1 %.7 %.8 : %.xml
$(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
@@ -15,10 +11,9 @@ man_MANS = \
endif # MAN_PAGES_ENABLED
EXTRA_DIST= \
- devkit-power.xml \
- devkit-power-daemon.xml \
- DeviceKit-power.xml \
- $(NULL)
+ upower.xml \
+ upowerd.xml \
+ UPower.xml
clean-local:
rm -f *~ *.[178]
diff --git a/doc/man/DeviceKit-power.xml b/doc/man/UPower.xml
index 808faf9..2d4c14d 100644
--- a/doc/man/DeviceKit-power.xml
+++ b/doc/man/UPower.xml
@@ -1,24 +1,24 @@
-<refentry id="DeviceKit-power.7">
+<refentry id="UPower.7">
<refentryinfo>
- <title>DeviceKit-power</title>
+ <title>UPower</title>
<date>March 2008</date>
- <productname>DeviceKit-power</productname>
+ <productname>UPower</productname>
</refentryinfo>
<refmeta>
- <refentrytitle>DeviceKit-power</refentrytitle>
+ <refentrytitle>UPower</refentrytitle>
<manvolnum>7</manvolnum>
<refmiscinfo class="version"></refmiscinfo>
</refmeta>
<refnamediv>
- <refname>DeviceKit-power</refname>
+ <refname>UPower</refname>
<refpurpose>System-wide Power Management</refpurpose>
</refnamediv>
<refsect1><title>DESCRIPTION</title>
<para>
- DeviceKit-power provides an interface to enumerate power sources
+ UPower provides an interface to enumerate power sources
on the system and control system-wide power management. Any
application can access
the <emphasis>org.freedesktop.UPower</emphasis> service
@@ -29,7 +29,8 @@
<refsect1><title>AUTHOR</title>
<para>
- Written by David Zeuthen <email>davidz@redhat.com</email> with
+ Written by David Zeuthen <email>davidz@redhat.com</email>,
+ Richard Hughes <email>richard@hughsie.com</email> and with
a lot of help from many others.
</para>
</refsect1>
@@ -48,16 +49,13 @@
<title>SEE ALSO</title>
<para>
<citerefentry>
- <refentrytitle>DeviceKit</refentrytitle><manvolnum>7</manvolnum>
- </citerefentry>,
- <citerefentry>
<refentrytitle>PolicyKit</refentrytitle><manvolnum>8</manvolnum>
</citerefentry>,
<citerefentry>
- <refentrytitle>devkit-power-daemon</refentrytitle><manvolnum>8</manvolnum>
+ <refentrytitle>upowerd</refentrytitle><manvolnum>8</manvolnum>
</citerefentry>,
<citerefentry>
- <refentrytitle>devkit-power</refentrytitle><manvolnum>1</manvolnum>
+ <refentrytitle>upower</refentrytitle><manvolnum>1</manvolnum>
</citerefentry>
</para>
</refsect1>
diff --git a/doc/man/devkit-power.xml b/doc/man/upower.xml
index 938d06c..7b11641 100644
--- a/doc/man/devkit-power.xml
+++ b/doc/man/upower.xml
@@ -1,24 +1,24 @@
-<refentry id="devkit-power.1">
+<refentry id="upower.1">
<refentryinfo>
- <title>devkit-power</title>
+ <title>upower</title>
<date>April 2008</date>
- <productname>devkit-power</productname>
+ <productname>upower</productname>
</refentryinfo>
<refmeta>
- <refentrytitle>devkit-power</refentrytitle>
+ <refentrytitle>upower</refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo class="version"></refmiscinfo>
</refmeta>
<refnamediv>
- <refname>devkit-power</refname>
- <refpurpose>DeviceKit-power command line tool</refpurpose>
+ <refname>upower</refname>
+ <refpurpose>UPower command line tool</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
- <command>devkit-power</command>
+ <command>upower</command>
<arg><option>--enumerate</option></arg>
<arg><option>--monitor</option></arg>
<arg><option>--monitor-detail</option></arg>
@@ -29,9 +29,9 @@
<refsect1><title>DESCRIPTION</title>
<para>
- <emphasis><refentrytitle>devkit-power</refentrytitle></emphasis> is a
+ <emphasis><refentrytitle>upower</refentrytitle></emphasis> is a
simple command line client for the
- <citerefentry><refentrytitle>DeviceKit-power</refentrytitle><manvolnum>7</manvolnum></citerefentry>
+ <citerefentry><refentrytitle>UPower</refentrytitle><manvolnum>7</manvolnum></citerefentry>
daemon. TODO: not fully documented.
</para>
</refsect1>
@@ -43,7 +43,7 @@
<term><option>--monitor</option></term>
<listitem>
<para>
- Connect to the DeviceKit-power daemon and print a line
+ Connect to the UPower daemon and print a line
every time a power source is added, removed or changed.
</para>
</listitem>
@@ -89,10 +89,10 @@
<title>SEE ALSO</title>
<para>
<citerefentry>
- <refentrytitle>devkit-power-daemon</refentrytitle><manvolnum>8</manvolnum>
+ <refentrytitle>upowerd</refentrytitle><manvolnum>8</manvolnum>
</citerefentry>,
<citerefentry>
- <refentrytitle>DeviceKit-power</refentrytitle><manvolnum>7</manvolnum>
+ <refentrytitle>UPower</refentrytitle><manvolnum>7</manvolnum>
</citerefentry>,
</para>
</refsect1>
diff --git a/doc/man/devkit-power-daemon.xml b/doc/man/upowerd.xml
index d672348..511fe16 100644
--- a/doc/man/devkit-power-daemon.xml
+++ b/doc/man/upowerd.xml
@@ -1,24 +1,24 @@
-<refentry id="devkit-power-daemon.8">
+<refentry id="upowerd.8">
<refentryinfo>
- <title>devkit-power-daemon</title>
+ <title>upowerd</title>
<date>April 2008</date>
- <productname>devkit-power-daemon</productname>
+ <productname>upowerd</productname>
</refentryinfo>
<refmeta>
- <refentrytitle>devkit-power-daemon</refentrytitle>
+ <refentrytitle>upowerd</refentrytitle>
<manvolnum>8</manvolnum>
<refmiscinfo class="version"></refmiscinfo>
</refmeta>
<refnamediv>
- <refname>devkit-power-daemon</refname>
- <refpurpose>DeviceKit-power Daemon</refpurpose>
+ <refname>upowerd</refname>
+ <refpurpose>UPower Daemon</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
- <command>devkit-power-daemon</command>
+ <command>upowerd</command>
<arg><option>--help</option></arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -26,7 +26,7 @@
<refsect1><title>DESCRIPTION</title>
<para>
- <emphasis><refentrytitle>devkit-power-daemon</refentrytitle></emphasis> provides
+ <emphasis><refentrytitle>upowerd</refentrytitle></emphasis> provides
the <emphasis>org.freedesktop.UPower</emphasis> service on the
system message bus. Users or administrators should never need to
start this daemon as it will be automatically started by
@@ -71,10 +71,10 @@
<title>SEE ALSO</title>
<para>
<citerefentry>
- <refentrytitle>DeviceKit-power</refentrytitle><manvolnum>7</manvolnum>
+ <refentrytitle>UPower</refentrytitle><manvolnum>7</manvolnum>
</citerefentry>,
<citerefentry>
- <refentrytitle>devkit-power</refentrytitle><manvolnum>1</manvolnum>
+ <refentrytitle>upower</refentrytitle><manvolnum>1</manvolnum>
</citerefentry>,
<citerefentry>
<refentrytitle>dbus-daemon</refentrytitle><manvolnum>1</manvolnum>