Adding upstream version 256.upstream/256

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

1 files changed, 20 insertions, 3 deletions

diff --git a/man/org.freedesktop.network1.xml b/man/org.freedesktop.network1.xml
index 02013c5..1d8ce0d 100644
--- a/man/org.freedesktop.network1.xml
+++ b/man/org.freedesktop.network1.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;
 ]>
@@ -87,6 +87,8 @@ node /org/freedesktop/network1 {
       readonly s OnlineState = '...';
       @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
       readonly t NamespaceId = ...;
+      @org.freedesktop.DBus.Property.EmitsChangedSignal("false")
+      readonly u NamespaceNSID = ...;
   };
   interface org.freedesktop.DBus.Peer { ... };
   interface org.freedesktop.DBus.Introspectable { ... };
@@ -148,8 +150,6 @@ node /org/freedesktop/network1 {
 
     <!--property OnlineState is not documented!-->
 
-    <!--property NamespaceId is not documented!-->
-
     <!--Autogenerated cross-references for systemd.directives, do not edit-->
 
     <variablelist class="dbus-interface" generated="True" extra-ref="org.freedesktop.network1.Manager"/>
@@ -212,11 +212,24 @@ node /org/freedesktop/network1 {
 
     <variablelist class="dbus-property" generated="True" extra-ref="NamespaceId"/>
 
+    <variablelist class="dbus-property" generated="True" extra-ref="NamespaceNSID"/>
+
     <!--End of Autogenerated section-->
 
     <para>
       Provides information about the manager.
     </para>
+
+    <refsect2>
+      <title>Properties</title>
+
+      <para><varname>NamespaceId</varname> contains the inode number of the network namespace that the
+      network service runs in. A client may compare this with the inode number of its own network namespace
+      to verify whether the service manages the same network namespace.</para>
+
+      <para><varname>NamespaceNSID</varname> contains the "nsid" identifier the kernel maintains for the
+      network namespace, if there's one assigned.</para>
+    </refsect2>
   </refsect1>
 
   <refsect1>
@@ -584,5 +597,9 @@ $ gdbus introspect --system \
       <title>DHCPv6 Client Object</title>
       <para><varname>State</varname> was added in version 255.</para>
     </refsect2>
+    <refsect2>
+      <title>Manager Object</title>
+      <para><varname>NamespaceNSID</varname> was added in version 256.</para>
+    </refsect2>
   </refsect1>
 </refentry>