X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsd_bus_error.xml;h=9be474764b9d1566903a81b55e4261c1bbd4712c;hp=38bc30311b1d8c56b7f07c30c5f4ab91f57dc8b0;hb=f27e2d8c0c0c18d5a1be62c87ea89fcd4894fffa;hpb=71365a7754db5ff8e07941501063b1da2a4b4bd5

diff --git a/man/sd_bus_error.xml b/man/sd_bus_error.xml
index 38bc30311..9be474764 100644
--- a/man/sd_bus_error.xml
+++ b/man/sd_bus_error.xml
@@ -21,7 +21,7 @@ You should have received a copy of the GNU Lesser General Public License
 along with systemd; If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<refentry id="sd_bus_error">
+<refentry id="sd_bus_error" conditional="ENABLE_KDBUS">
 
   <refentryinfo>
     <title>sd_bus_error</title>
@@ -54,7 +54,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     <refname>sd_bus_error_is_set</refname>
     <refname>sd_bus_error_has_name</refname>
 
-    <refpurpose>libsystemd-bus error handling</refpurpose>
+    <refpurpose>sd-bus error handling</refpurpose>
   </refnamediv>
 
   <refsynopsisdiv>
@@ -231,10 +231,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
   <refsect1>
     <title>Description</title>
 
-    <para><structname>sd_bus_error</structname> structure carries
-    information for a <filename>libsystemd-bus</filename> error.
-    Functions described below can be used to set and query fields in
-    this structure. Field <structfield>name</structfield> contains a
+    <para>The <structname>sd_bus_error</structname> structure carries
+    information for a <filename>sd-bus</filename> error. The
+    functions described below can be used to set and query fields in
+    this structure. The <structfield>name</structfield> field contains a
     short identifier of an error. It should follow the rules for error
     names described in the D-Bus specification, subsection <ulink
     url="http://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names">Valid
@@ -251,16 +251,16 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     and the remaining ones to <constant>-ENXIO</constant>. Well-known
     D-Bus error names are available as constants
     <constant>SD_BUS_ERROR_FAILED</constant>, etc., listed above. If
-    <parameter>name</parameter> is <constant>NULL</constant>, it is is
+    <parameter>name</parameter> is <constant>NULL</constant>, it is
     assumed that no error occured, and 0 is returned. This means that
     this function may be conveniently used in a
     <function>return</function> statement.</para>
 
     <para>If <parameter>e</parameter> is not
     <constant>NULL</constant>, <structfield>name</structfield> and
-    <structfield>message</structfield> will be filled-in in the
+    <structfield>message</structfield> in the
     <structname>sd_bus_error</structname> structure
-    <parameter>e</parameter> points at. As described above,
+    <parameter>e</parameter> points at will be filled in. As described above,
     <parameter>name</parameter> may be <constant>NULL</constant>,
     which is treated as no error. Parameter
     <parameter>message</parameter> may also be
@@ -297,16 +297,17 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     <parameter>format</parameter> and the arguments.</para>
 
     <para><function>sd_bus_error_get_errno</function> is will convert
-    <structname>e->name</structname> to an errno-like value
-    using the same rules as <function>sd_bus_error_set</function>.
-    </para>
+    <structname>e-&gt;name</structname> to an errno-like value using the
+    same rules as <function>sd_bus_error_set</function>.  If
+    <parameter>e</parameter> is <constant>NULL</constant>, 0 will be
+    returned.</para>
 
     <para><function>sd_bus_error_copy</function> will initialize
     <parameter>dst</parameter> using the values in
     <parameter>e</parameter>. If the strings in
     <parameter>e</parameter> were set using
     <function>sd_bus_set_error_const</function>, they will be shared.
-    Otherwie they wil be copied.</para>
+    Otherwise, they will be copied.</para>
 
     <para><function>sd_bus_error_is_set</function> will return
     <constant>true</constant> if <parameter>e</parameter> is
@@ -342,7 +343,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     <para><function>sd_bus_error_get_errno</function> returns
     <constant>false</constant> when <parameter>e</parameter> is
     <constant>NULL</constant>, and a positive errno value mapped from
-    <parameter>e->name</parameter> otherwise.</para>
+    <parameter>e-&gt;name</parameter> otherwise.</para>
 
     <para><function>sd_bus_error_copy</function> returns 0 or a
     positive integer on success, and one of the negative error values
@@ -350,12 +351,12 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
     <para><function>sd_bus_error_is_set</function> returns
     <constant>true</constant> when <parameter>e</parameter> and
-    <parameter>e->name</parameter> are non-<constant>NULL</constant>,
+    <parameter>e-&gt;name</parameter> are non-<constant>NULL</constant>,
     <constant>false</constant> otherwise.</para>
 
     <para><function>sd_bus_error_has_name</function> returns
     <constant>true</constant> when <parameter>e</parameter> is
-    non-<constant>NULL</constant> and <parameter>e->name</parameter>
+    non-<constant>NULL</constant> and <parameter>e-&gt;name</parameter>
     is equal to <parameter>name</parameter>,
     <constant>false</constant> otherwise.</para>
   </refsect1>
@@ -396,7 +397,7 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>.
     <para><function>sd_bus_set_error()</function> and other functions
     described here are available as a shared library, which can be
     compiled and linked to with the
-    <constant>libsystemd-bus</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
+    <constant>libsystemd</constant> <citerefentry><refentrytitle>pkg-config</refentrytitle><manvolnum>1</manvolnum></citerefentry>
     file.</para>
   </refsect1>