Merging upstream version 256.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 27 insertions, 26 deletions

diff --git a/man/org.freedesktop.resolve1.xml b/man/org.freedesktop.resolve1.xml
index c6b0153..f6b70d6 100644
--- a/man/org.freedesktop.resolve1.xml
+++ b/man/org.freedesktop.resolve1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY % entities SYSTEM "custom-entities.ent" >
 %entities;
 ]>
@@ -103,7 +103,7 @@ node /org/freedesktop/resolve1 {
       SetLinkDNSSECNegativeTrustAnchors(in  i ifindex,
                                         in  as names);
       RevertLink(in  i ifindex);
-      RegisterService(in  s name,
+      RegisterService(in  s id,
                       in  s name_template,
                       in  s type,
                       in  q service_port,
@@ -434,7 +434,7 @@ node /org/freedesktop/resolve1 {
       <para>The <function>RegisterService()</function> method may be used to register a DNS-SD service on the
       host. This functionality is closely related to the functionality provided by
       <citerefentry><refentrytitle>systemd.dnssd</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-      files. It takes a server identifier string as first parameter (this is jus a local identifier, and
+      files. It takes a server identifier string as first parameter (this is just a local identifier, and
       should be chosen so that it neither collides with the basename of <filename>*.dnssd</filename> files
       nor with names chosen by other IPC clients). It also takes a name template string for the DNS-SD
       service name visible on the network. This string is subject to specifier expansation, as documented for
@@ -454,35 +454,36 @@ node /org/freedesktop/resolve1 {
         and recommended. However, the following flags are defined to alter the look-up:</para>
 
         <programlisting>/* Input+Output: Protocol/scope */
-#define SD_RESOLVED_DNS               (UINT64_C(1) &lt;&lt;  0)
-#define SD_RESOLVED_LLMNR_IPV4        (UINT64_C(1) &lt;&lt;  1)
-#define SD_RESOLVED_LLMNR_IPV6        (UINT64_C(1) &lt;&lt;  2)
-#define SD_RESOLVED_MDNS_IPV4         (UINT64_C(1) &lt;&lt;  3)
-#define SD_RESOLVED_MDNS_IPV6         (UINT64_C(1) &lt;&lt;  4)
+#define SD_RESOLVED_DNS                (UINT64_C(1) &lt;&lt;  0)
+#define SD_RESOLVED_LLMNR_IPV4         (UINT64_C(1) &lt;&lt;  1)
+#define SD_RESOLVED_LLMNR_IPV6         (UINT64_C(1) &lt;&lt;  2)
+#define SD_RESOLVED_MDNS_IPV4          (UINT64_C(1) &lt;&lt;  3)
+#define SD_RESOLVED_MDNS_IPV6          (UINT64_C(1) &lt;&lt;  4)
 
 /* Input: Restrictions */
-#define SD_RESOLVED_NO_CNAME          (UINT64_C(1) &lt;&lt;  5)
-#define SD_RESOLVED_NO_TXT            (UINT64_C(1) &lt;&lt;  6)
-#define SD_RESOLVED_NO_ADDRESS        (UINT64_C(1) &lt;&lt;  7)
-#define SD_RESOLVED_NO_SEARCH         (UINT64_C(1) &lt;&lt;  8)
-#define SD_RESOLVED_NO_VALIDATE       (UINT64_C(1) &lt;&lt; 10)
-#define SD_RESOLVED_NO_SYNTHESIZE     (UINT64_C(1) &lt;&lt; 11)
-#define SD_RESOLVED_NO_CACHE          (UINT64_C(1) &lt;&lt; 12)
-#define SD_RESOLVED_NO_ZONE           (UINT64_C(1) &lt;&lt; 13)
-#define SD_RESOLVED_NO_TRUST_ANCHOR   (UINT64_C(1) &lt;&lt; 14)
-#define SD_RESOLVED_NO_NETWORK        (UINT64_C(1) &lt;&lt; 15)
-#define SD_RESOLVED_NO_STALE          (UINT64_C(1) &lt;&lt; 24)
+#define SD_RESOLVED_NO_CNAME           (UINT64_C(1) &lt;&lt;  5)
+#define SD_RESOLVED_NO_TXT             (UINT64_C(1) &lt;&lt;  6)
+#define SD_RESOLVED_NO_ADDRESS         (UINT64_C(1) &lt;&lt;  7)
+#define SD_RESOLVED_NO_SEARCH          (UINT64_C(1) &lt;&lt;  8)
+#define SD_RESOLVED_NO_VALIDATE        (UINT64_C(1) &lt;&lt; 10)
+#define SD_RESOLVED_NO_SYNTHESIZE      (UINT64_C(1) &lt;&lt; 11)
+#define SD_RESOLVED_NO_CACHE           (UINT64_C(1) &lt;&lt; 12)
+#define SD_RESOLVED_NO_ZONE            (UINT64_C(1) &lt;&lt; 13)
+#define SD_RESOLVED_NO_TRUST_ANCHOR    (UINT64_C(1) &lt;&lt; 14)
+#define SD_RESOLVED_NO_NETWORK         (UINT64_C(1) &lt;&lt; 15)
+#define SD_RESOLVED_NO_STALE           (UINT64_C(1) &lt;&lt; 24)
+#define SD_RESOLVED_RELAX_SINGLE_LABEL (UINT64_C(1) &lt;&lt; 25)
 
 /* Output: Security */
-#define SD_RESOLVED_AUTHENTICATED     (UINT64_C(1) &lt;&lt;  9)
-#define SD_RESOLVED_CONFIDENTIAL      (UINT64_C(1) &lt;&lt; 18)
+#define SD_RESOLVED_AUTHENTICATED      (UINT64_C(1) &lt;&lt;  9)
+#define SD_RESOLVED_CONFIDENTIAL       (UINT64_C(1) &lt;&lt; 18)
 
 /* Output: Origin */
-#define SD_RESOLVED_SYNTHETIC         (UINT64_C(1) &lt;&lt; 19)
-#define SD_RESOLVED_FROM_CACHE        (UINT64_C(1) &lt;&lt; 20)
-#define SD_RESOLVED_FROM_ZONE         (UINT64_C(1) &lt;&lt; 21)
-#define SD_RESOLVED_FROM_TRUST_ANCHOR (UINT64_C(1) &lt;&lt; 22)
-#define SD_RESOLVED_FROM_NETWORK      (UINT64_C(1) &lt;&lt; 23)
+#define SD_RESOLVED_SYNTHETIC          (UINT64_C(1) &lt;&lt; 19)
+#define SD_RESOLVED_FROM_CACHE         (UINT64_C(1) &lt;&lt; 20)
+#define SD_RESOLVED_FROM_ZONE          (UINT64_C(1) &lt;&lt; 21)
+#define SD_RESOLVED_FROM_TRUST_ANCHOR  (UINT64_C(1) &lt;&lt; 22)
+#define SD_RESOLVED_FROM_NETWORK       (UINT64_C(1) &lt;&lt; 23)
 </programlisting>
 
         <para>On input, the first five flags control the protocols to use for the look-up. They refer to