docs_xml: use the nfs4 parameter include file in gpfs man page

Signed-off-by: Bjoern Jacke <bjacke@samba.org>
Reviewed-by: Christof Schmitt <cs@samba.org>

diff --git a/docs-xml/manpages/vfs_gpfs.8.xml b/docs-xml/manpages/vfs_gpfs.8.xml
index eb0cc72f8f08ce0508c4d2b1ff70624d3b414509..a7168e43b46d4f911a1398a81908c3c573a0110f 100644 (file)
--- a/docs-xml/manpages/vfs_gpfs.8.xml
+++ b/docs-xml/manpages/vfs_gpfs.8.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<ns:Root xmlns:xi="http://www.w3.org/2003/XInclude"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xmlns:ns="urn:TestNamespace">
 <refentry id="vfs_gpfs.8">
 
+
 <refmeta>
        <refentrytitle>vfs_gpfs</refentrytitle>
        <manvolnum>8</manvolnum>
@@ -68,6 +72,8 @@
 <refsect1>
        <title>OPTIONS</title>
 
+       <xi:include href="nfs4.xml.include" xpointer="xpointer(*/*)" />
+
        <variablelist>
 
                <varlistentry>
@@ -339,62 +345,6 @@
                </itemizedlist>
                </listitem>
 
-               </varlistentry>
-               <varlistentry>
-
-               <term>nfs4:mode = [ simple | special ]</term>
-               <listitem>
-               <para>
-               Controls substitution of special IDs (OWNER@ and GROUP@) on GPFS.
-                The use of mode simple is recommended.
-                In this mode only non inheriting ACL entries for the file owner
-                and group are mapped to special IDs.
-               </para>
-
-               <para>The following MODEs are understood by the module:</para>
-               <itemizedlist>
-               <listitem><para><command>simple(default)</command> - use OWNER@ and GROUP@ special IDs for non inheriting ACEs only.</para></listitem>
-               <listitem><para><command>special(deprecated)</command> - use OWNER@ and GROUP@ special IDs in ACEs for all file owner and group ACEs.</para></listitem>
-               </itemizedlist>
-               </listitem>
-
-               </varlistentry>
-
-
-               <varlistentry>
-               <term>nfs4:acedup = [dontcare|reject|ignore|merge]</term>
-               <listitem>
-               <para>
-               This parameter configures how Samba handles duplicate ACEs encountered in GPFS ACLs.
-               GPFS allows/creates duplicate ACE for different bits for same ID.
-               </para>
-
-               <para>Following is the behaviour of Samba for different values :</para>
-               <itemizedlist>
-               <listitem><para><command>dontcare</command> - copy the ACEs as they come</para></listitem>
-               <listitem><para><command>reject (deprecated)</command> - stop operation and exit with error on ACL set op</para></listitem>
-               <listitem><para><command>ignore (deprecated)</command> - don't include the second matching ACE</para></listitem>
-               <listitem><para><command>merge (default)</command> - bitwise OR the 2 ace.flag fields and 2 ace.mask fields of the 2 duplicate ACEs into 1 ACE</para></listitem>
-               </itemizedlist>
-               </listitem>
-               </varlistentry>
-
-
-               <varlistentry>
-               <term>nfs4:chown = [yes|no]</term>
-               <listitem>
-               <para>This parameter allows enabling or disabling the chown supported
-               by the underlying filesystem. This parameter should be enabled with
-               care as it might leave your system insecure.</para>
-               <para>Some filesystems allow chown as a) giving b) stealing. It is the latter
-               that is considered a risk.</para>
-
-               <para>Following is the behaviour of Samba for different values : </para>
-               <itemizedlist>
-               <listitem><para><command>yes</command> - Enable chown if as supported by the under filesystem</para></listitem>
-               <listitem><para><command>no (default)</command> - Disable chown</para></listitem>
-               </itemizedlist>
-               </listitem>
                </varlistentry>
 
                <varlistentry>
@@ -418,6 +368,7 @@
                </varlistentry>
 
        </variablelist>
+
 </refsect1>
 
 <refsect1>
@@ -475,3 +426,4 @@
 </refsect1>
 
 </refentry>
+</ns:Root>