X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsd_bus_request_name.xml;h=7393fdd90e403c039555c45e34baabcff46f6f0f;hp=6e61a88737a3fda177acf7748618d3314e5e804a;hb=057d9ab8f016edfe692b7b3e84fdf6e0e000bacd;hpb=e7176abbe818c75c6acd90227a7a84c3e05fee31

diff --git a/man/sd_bus_request_name.xml b/man/sd_bus_request_name.xml
index 6e61a8873..7393fdd90 100644
--- a/man/sd_bus_request_name.xml
+++ b/man/sd_bus_request_name.xml
@@ -56,7 +56,7 @@
                                 <funcdef>int <function>sd_bus_request_name</function></funcdef>
                                 <paramdef>sd_bus* <parameter>bus</parameter></paramdef>
                                 <paramdef>const char *<parameter>name</parameter></paramdef>
-                                <paramdef>unsigned <parameter>flags</parameter></paramdef>
+                                <paramdef>uint64_t <parameter>flags</parameter></paramdef>
                         </funcprototype>
 
                         <funcprototype>
@@ -64,8 +64,6 @@
                                 <paramdef>sd_bus* <parameter>bus</parameter></paramdef>
                                 <paramdef>const char *<parameter>name</parameter></paramdef>
                         </funcprototype>
-
-
                 </funcsynopsis>
         </refsynopsisdiv>
 
@@ -83,13 +81,13 @@
                                 <term><varname>SD_BUS_NAME_ALLOW_REPLACEMENT</varname></term>
 
                                 <listitem><para>After acquiring the
-                                name successuflly, permit other peers
+                                name successfully, permit other peers
                                 to take over the name when they try to
                                 acquire it with the
                                 <varname>SD_BUS_NAME_REPLACE_EXISTING</varname>
                                 flag set. If
                                 <varname>SD_BUS_NAME_ALLOW_REPLACEMENT</varname>
-                                is not set on the original request
+                                is not set on the original request,
                                 such a request by other peers will be
                                 denied.</para></listitem>
                         </varlistentry>
@@ -97,19 +95,19 @@
                         <varlistentry>
                                 <term><varname>SD_BUS_NAME_REPLACE_EXISTING</varname></term>
 
-                                <listitem><para>Take over a the name
-                                if it is already acquired by a another
-                                peer, and that other peer permitted
-                                taking it over by setting
+                                <listitem><para>Take over the name
+                                if it is already acquired by another
+                                peer, and that other peer has permitted
+                                takeover by setting
                                 <varname>SD_BUS_NAME_ALLOW_REPLACEMENT</varname>
                                 while acquiring it.</para></listitem>
                         </varlistentry>
 
                         <varlistentry>
-                                <term><varname>SD_BUS_NAME_DO_NOT_QUEUE</varname></term>
+                                <term><varname>SD_BUS_NAME_QUEUE</varname></term>
 
-                                <listitem><para>Do not queue name
-                                acquisition when the name is already
+                                <listitem><para>Queue the acquisition
+                                of the name when the name is already
                                 taken.</para></listitem>
                         </varlistentry>
                 </variablelist>
@@ -126,16 +124,15 @@
                 integer. On failure, these calls return a negative
                 errno-style error code.</para>
 
-                <para><function>sd_bus_request_name()</function> will
-                return 0 when the name is already taken by another
-                peer and the client has been added to the queue for
-                the name, unless
-                <varname>SD_BUS_NAME_DO_NOT_QUEUE</varname> has been
-                set. The caller can subscribe to
-                <literal>NameOwnerChanged</literal> signals to be
-                notified when the name is successfully
-                acquired. <function>sd_bus_request_name()</function> returns
-                &gt; 0 when the name has been
+                <para>If <varname>SD_BUS_NAME_QUEUE</varname> is
+                specified, <function>sd_bus_request_name()</function>
+                will return 0 when the name is already taken by
+                another peer and the client has been added to the
+                queue for the name. In that case, the caller can
+                subscribe to <literal>NameOwnerChanged</literal>
+                signals to be notified when the name is successfully
+                acquired. <function>sd_bus_request_name()</function>
+                returns &gt; 0 when the name has immediately been
                 acquired successfully.</para>
         </refsect1>
 
@@ -165,6 +162,24 @@
                                 name.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><varname>-ESRCH</varname></term>
+
+                                <listitem><para>It was attempted to
+                                release a name that is currently not
+                                registered on the
+                                bus.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><varname>-EADDRINUSE</varname></term>
+
+                                <listitem><para>It was attempted to
+                                release a name that is owned by a
+                                different peer on the
+                                bus.</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><varname>-EINVAL</varname></term>
 
@@ -184,7 +199,7 @@
 
                                 <listitem><para>The bus connection has
                                 been created in a different process
-                                than the current.</para></listitem>
+                                than the current one.</para></listitem>
                         </varlistentry>
                 </variablelist>
         </refsect1>
@@ -193,8 +208,8 @@
                 <title>Notes</title>
 
                 <para>The <function>sd_bus_acquire_name()</function>
-                and <function>sd_bus_release_bame()</function>
-                interfaces are available as shared library, which can
+                and <function>sd_bus_release_name()</function>
+                interfaces 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>
                 file.</para>