The branch, master has been updated
       via  e60f6415584 manpages:smb.conf: disable roaming profiles with 'logon 
path ='
       via  776b75f7356 manpages:net: use &doc.version;
       via  4c10f3d1522 doc: mention an smbspool / krb5 detail
       via  ddd9f36562f manpages:vfs_shell_snap: format smbconf examples on one 
line
       via  dc33c630d70 manpages: avoid extra blank line at end of 
<programlisting>
       via  1d39baf1e7c samba-tool domain backup: add --no-sysvol option
      from  47ff4223204 python:gp_cert_auto_enrol: fix GUID stringification

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e60f6415584199b7d61b622169d3907558e9e80e
Author: Douglas Bagnall <[email protected]>
Date:   Fri Mar 21 10:28:23 2025 +1300

    manpages:smb.conf: disable roaming profiles with 'logon path ='
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12706
    
    Signed-off-by: Douglas Bagnall <[email protected]>
    Reviewed-by: Jennifer Sutton <[email protected]>
    
    Autobuild-User(master): Douglas Bagnall <[email protected]>
    Autobuild-Date(master): Wed Mar 26 01:51:40 UTC 2025 on atb-devel-224

commit 776b75f73561e4d9ccb7bd02ea2f933560ecaf35
Author: Douglas Bagnall <[email protected]>
Date:   Thu Mar 20 13:23:00 2025 +1300

    manpages:net: use &doc.version;
    
    and we don't claim it is "complete", which *maybe* was true for
    3.0.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=14812
    
    Signed-off-by: Douglas Bagnall <[email protected]>
    Reviewed-by: Jennifer Sutton <[email protected]>

commit 4c10f3d15223a14a5499ba5feffe9aaf850cb1a5
Author: Björn Jacke <[email protected]>
Date:   Wed Aug 28 22:53:17 2013 +0200

    doc: mention an smbspool / krb5 detail
    
    argv[2] (username) is being used for krb5 ticket cache. Thanks to
    Christian Perrier.
    
    REF: https://bugs.debian.org/387266
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=4104
    
    Signed-off-by: Björn Jacke <[email protected]>
    Reviewed-by: Douglas Bagnall <[email protected]>
    Reviewed-by: Jennifer Sutton <[email protected]>

commit ddd9f36562f0139ea44a14a0c77dd10a1d0fcd52
Author: Douglas Bagnall <[email protected]>
Date:   Wed Mar 19 16:20:20 2025 +1300

    manpages:vfs_shell_snap: format smbconf examples on one line
    
    The HTML version has been looking like:
    
        [share]
        vfs objects = shell_snap
        shell_snap:check path command =
           snap_check_path.sh
        shell_snap:create command =
           snap_create.sh
        shell_snap:delete command =
           snap_delete.sh
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12918
    
    Signed-off-by: Douglas Bagnall <[email protected]>
    Reviewed-by: Jennifer Sutton <[email protected]>

commit dc33c630d7028e334fce847713e51aee9f6c8fc0
Author: Douglas Bagnall <[email protected]>
Date:   Wed Mar 19 16:13:46 2025 +1300

    manpages: avoid extra blank line at end of <programlisting>
    
    Any whitespace there makes the program listing an extra line longer in
    HTML put which is probably never intentional.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12918
    
    Signed-off-by: Douglas Bagnall <[email protected]>
    Reviewed-by: Jennifer Sutton <[email protected]>

commit 1d39baf1e7c128d89bfa204ef83d4c61b30a58d9
Author: Thomas Karlsson <[email protected]>
Date:   Wed Mar 19 14:40:22 2025 +1300

    samba-tool domain backup: add --no-sysvol option
    
    In some circumstances sysvol is not wanted in a backup.
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=15661
    
    Signed-off-by: Thomas Karlsson <[email protected]>
    Reviewed-by: Douglas Bagnall <[email protected]>
    Reviewed-by: Jennifer Sutton <[email protected]>

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/manpages/eventlogadm.8.xml            |  6 +++---
 docs-xml/manpages/idmap_ad.8.xml               |  2 +-
 docs-xml/manpages/idmap_autorid.8.xml          |  8 ++++----
 docs-xml/manpages/idmap_hash.8.xml             |  2 +-
 docs-xml/manpages/idmap_ldap.8.xml             |  4 ++--
 docs-xml/manpages/idmap_nss.8.xml              |  2 +-
 docs-xml/manpages/idmap_rfc2307.8.xml          |  2 +-
 docs-xml/manpages/idmap_rid.8.xml              |  6 +++---
 docs-xml/manpages/idmap_script.8.xml           |  8 ++++----
 docs-xml/manpages/idmap_tdb.8.xml              |  2 +-
 docs-xml/manpages/idmap_tdb2.8.xml             |  8 ++++----
 docs-xml/manpages/log2pcap.1.xml               |  4 ++--
 docs-xml/manpages/mdsearch.1.xml               | 12 ++++++------
 docs-xml/manpages/net.8.xml                    |  4 ++--
 docs-xml/manpages/pam_winbind.8.xml            |  2 +-
 docs-xml/manpages/samba-log-parser.1.xml       |  8 ++++----
 docs-xml/manpages/sharesec.1.xml               |  6 +++---
 docs-xml/manpages/smb.conf.5.xml               |  2 +-
 docs-xml/manpages/smbspool.8.xml               |  4 +++-
 docs-xml/manpages/smbstatus.1.xml              | 12 ++++++------
 docs-xml/manpages/traffic_learner.7.xml        |  2 +-
 docs-xml/manpages/vfs_btrfs.8.xml              |  4 ++--
 docs-xml/manpages/vfs_ceph.8.xml               |  4 ++--
 docs-xml/manpages/vfs_ceph_new.8.xml           |  4 ++--
 docs-xml/manpages/vfs_ceph_snapshots.8.xml     |  4 ++--
 docs-xml/manpages/vfs_expand_msdfs.8.xml       |  2 +-
 docs-xml/manpages/vfs_full_audit.8.xml         |  2 +-
 docs-xml/manpages/vfs_glusterfs.8.xml          |  4 ++--
 docs-xml/manpages/vfs_glusterfs_fuse.8.xml     |  2 +-
 docs-xml/manpages/vfs_nfs4acl_xattr.8.xml      |  2 +-
 docs-xml/manpages/vfs_shadow_copy.8.xml        |  2 +-
 docs-xml/manpages/vfs_shadow_copy2.8.xml       |  2 +-
 docs-xml/manpages/vfs_shell_snap.8.xml         | 13 +++++--------
 docs-xml/manpages/vfs_snapper.8.xml            |  4 ++--
 docs-xml/manpages/winbind_krb5_localauth.8.xml |  2 +-
 docs-xml/manpages/wspsearch.1.xml              |  4 ++--
 docs-xml/smbdotconf/logon/logonpath.xml        | 14 ++++++++++----
 python/samba/netcmd/domain/backup.py           | 22 +++++++++++++---------
 38 files changed, 103 insertions(+), 94 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages/eventlogadm.8.xml 
b/docs-xml/manpages/eventlogadm.8.xml
index f567d928445..a8f685db0b8 100644
--- a/docs-xml/manpages/eventlogadm.8.xml
+++ b/docs-xml/manpages/eventlogadm.8.xml
@@ -257,20 +257,20 @@
        SRN: dmlinux
        STR: (root) CMD ( rm -f /var/spool/cron/lastrun/cron.hourly)
        DAT:
-       </programlisting>
+</programlisting>
 
        <para>Set up an eventlog source, specifying a message file DLL:</para>
        <programlisting>
        eventlogadm -o addsource Application MyApplication | \\
                %SystemRoot%/system32/MyApplication.dll
-       </programlisting>
+</programlisting>
 
        <para>Filter messages from the system log into an event log:</para>
        <programlisting>
        tail -f /var/log/messages | \\
                my_program_to_parse_into_eventlog_records | \\
                eventlogadm SystemLogEvents
-       </programlisting>
+</programlisting>
 
 </refsect1>
 
diff --git a/docs-xml/manpages/idmap_ad.8.xml b/docs-xml/manpages/idmap_ad.8.xml
index c7fcc65d763..dc64c546c61 100644
--- a/docs-xml/manpages/idmap_ad.8.xml
+++ b/docs-xml/manpages/idmap_ad.8.xml
@@ -169,7 +169,7 @@
 
        idmap config CORP : backend  = ad
        idmap config CORP : range = 1000-999999
-       </programlisting>
+</programlisting>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/idmap_autorid.8.xml 
b/docs-xml/manpages/idmap_autorid.8.xml
index 9fe73d5c473..548d6f712dc 100644
--- a/docs-xml/manpages/idmap_autorid.8.xml
+++ b/docs-xml/manpages/idmap_autorid.8.xml
@@ -110,7 +110,7 @@
                The Unix ID for a RID is calculated this way:
                <programlisting>
                        ID =  REDUCED RID + IDMAP RANGE LOW VALUE + RANGE 
NUMBER * RANGE SIZE
-               </programlisting>
+</programlisting>
                where REDUCED RID = RID % RANGE_SIZE
                and a DOMAIN RANGE INDEX = RID / RANGE_SIZE is used together 
with the
                domain sid to determine the RANGE NUMBER (stored in the 
database).
@@ -120,7 +120,7 @@
                given Unix ID is this:
                <programlisting>
                        RID = (ID - LOW ID) % RANGE SIZE + DOMAIN RANGE INDEX * 
RANGE SIZE
-               </programlisting>
+</programlisting>
                Where the DOMAIN RANGE INDEX is retrieved from the database 
along with the
                domain sid by the RANGE NUMBER = (ID - LOW ID) / RANGE SIZE .
        </para>
@@ -143,7 +143,7 @@
        idmap config * : backend = autorid
        idmap config * : range = 1000000-1999999
 
-       </programlisting>
+</programlisting>
 
        <para>
                This example shows how to configure idmap_autorid as default
@@ -166,7 +166,7 @@
        idmap config TRUSTED : backend  = ad
        idmap config TRUSTED : range    = 50000 - 99999
        idmap config TRUSTED : schema_mode = sfu
-       </programlisting>
+</programlisting>
 
 </refsect1>
 
diff --git a/docs-xml/manpages/idmap_hash.8.xml 
b/docs-xml/manpages/idmap_hash.8.xml
index 03ff02a486b..991861a1122 100644
--- a/docs-xml/manpages/idmap_hash.8.xml
+++ b/docs-xml/manpages/idmap_hash.8.xml
@@ -76,7 +76,7 @@
        winbind nss info = hash
        winbind normalize names = yes
        idmap_hash:name_map = /etc/samba/name_map.cfg
-       </programlisting>
+</programlisting>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/idmap_ldap.8.xml 
b/docs-xml/manpages/idmap_ldap.8.xml
index 80f272d3fa3..c613d83fb7d 100644
--- a/docs-xml/manpages/idmap_ldap.8.xml
+++ b/docs-xml/manpages/idmap_ldap.8.xml
@@ -95,7 +95,7 @@
        idmap config * : ldap_url     = ldap://localhost/
        idmap config * : ldap_base_dn = ou=idmap,dc=example,dc=com
        idmap config * : ldap_user_dn = cn=idmap_admin,dc=example,dc=com
-       </programlisting>
+</programlisting>
 
        <para>
        This example shows how ldap can be used as a readonly backend while
@@ -117,7 +117,7 @@
        idmap config DOM1 : ldap_url = ldap://server/
        idmap config DOM1 : ldap_base_dn = ou=idmap,dc=dom1,dc=example,dc=com
        idmap config DOM1 : ldap_user_dn = 
cn=idmap_admin,dc=dom1,dc=example,dc=com
-       </programlisting>
+</programlisting>
 </refsect1>
 
 <refsynopsisdiv>
diff --git a/docs-xml/manpages/idmap_nss.8.xml 
b/docs-xml/manpages/idmap_nss.8.xml
index a9c6eceedbc..0f27724878f 100644
--- a/docs-xml/manpages/idmap_nss.8.xml
+++ b/docs-xml/manpages/idmap_nss.8.xml
@@ -81,7 +81,7 @@
 
        idmap config SAMBA : backend  = nss
        idmap config SAMBA : range = 1000-999999
-       </programlisting>
+</programlisting>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/idmap_rfc2307.8.xml 
b/docs-xml/manpages/idmap_rfc2307.8.xml
index 1393b04d0ec..f6198d69059 100644
--- a/docs-xml/manpages/idmap_rfc2307.8.xml
+++ b/docs-xml/manpages/idmap_rfc2307.8.xml
@@ -147,7 +147,7 @@
        idmap config DOMAIN : ldap_user_dn = cn=ldapmanager,dc=example,dc=com
        idmap config DOMAIN : bind_path_user = ou=People,dc=example,dc=com
        idmap config DOMAIN : bind_path_group = ou=Group,dc=example,dc=com
-       </programlisting>
+</programlisting>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/idmap_rid.8.xml 
b/docs-xml/manpages/idmap_rid.8.xml
index de2f89d6ca2..654730ffe7a 100644
--- a/docs-xml/manpages/idmap_rid.8.xml
+++ b/docs-xml/manpages/idmap_rid.8.xml
@@ -75,14 +75,14 @@
                The Unix ID for a RID is calculated this way:
                <programlisting>
                        ID = RID - BASE_RID + LOW_RANGE_ID.
-               </programlisting>
+</programlisting>
        </para>
        <para>
                Correspondingly, the formula for calculating the RID for a
                given Unix ID is this:
                <programlisting>
                        RID = ID + BASE_RID - LOW_RANGE_ID.
-               </programlisting>
+</programlisting>
        </para>
 </refsect1>
 
@@ -109,7 +109,7 @@
        idmap config TRUSTED : backend  = rid
        idmap config TRUSTED : range    = 50000 - 99999
        idmap config TRUSTED : base_rid = 500000
-       </programlisting>
+</programlisting>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/idmap_script.8.xml 
b/docs-xml/manpages/idmap_script.8.xml
index 332eb902c24..04b48c78561 100644
--- a/docs-xml/manpages/idmap_script.8.xml
+++ b/docs-xml/manpages/idmap_script.8.xml
@@ -73,7 +73,7 @@
        IDTOSID UID xxxx
        IDTOSID GID xxxx
        IDTOSID XID xxxx
-       </programlisting>
+</programlisting>
 
        <para>
        And it should return one of the following responses as a single line of
@@ -86,7 +86,7 @@
        XID:yyyy
        SID:ssss
        ERR:yyyy
-       </programlisting>
+</programlisting>
 
        <para>
        XID indicates that the ID returned should be both a UID and a GID.
@@ -109,7 +109,7 @@
        idmap config * : backend = script
        idmap config * : range = 1000000-2000000
        idmap config * : script = /usr/local/samba/bin/idmap_script.sh
-       </programlisting>
+</programlisting>
 
        <para>
        This shows a simple script to partially perform the task:
@@ -131,7 +131,7 @@
                echo "ERR: No idea what to do"
                exit 1
        fi
-       </programlisting>
+</programlisting>
 
        <para>
        Clearly, this script is not enough, as it should probably use wbinfo
diff --git a/docs-xml/manpages/idmap_tdb.8.xml 
b/docs-xml/manpages/idmap_tdb.8.xml
index a99830d6d9e..26ad88be051 100644
--- a/docs-xml/manpages/idmap_tdb.8.xml
+++ b/docs-xml/manpages/idmap_tdb.8.xml
@@ -58,7 +58,7 @@
        # "backend = tdb" is redundant here since it is the default
        idmap config * : backend = tdb
        idmap config * : range = 1000000-2000000
-       </programlisting>
+</programlisting>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/idmap_tdb2.8.xml 
b/docs-xml/manpages/idmap_tdb2.8.xml
index ee253ce8925..4ccbae4c673 100644
--- a/docs-xml/manpages/idmap_tdb2.8.xml
+++ b/docs-xml/manpages/idmap_tdb2.8.xml
@@ -82,7 +82,7 @@
        SIDTOID S-1-xxxx
        IDTOSID UID xxxx
        IDTOSID GID xxxx
-       </programlisting>
+</programlisting>
 
        <para>
        And it should return one of the following responses as a single line of
@@ -94,7 +94,7 @@
        GID:yyyy
        SID:yyyy
        ERR:yyyy
-       </programlisting>
+</programlisting>
 </refsect1>
 
 <refsect1>
@@ -108,7 +108,7 @@
        [global]
        idmap config * : backend = tdb2
        idmap config * : range = 1000000-2000000
-       </programlisting>
+</programlisting>
 
        <para>
        This example shows how tdb2 is used as the default idmap backend
@@ -120,7 +120,7 @@
        idmap config * : backend = tdb2
        idmap config * : range = 1000000-2000000
        idmap config * : script = /usr/local/samba/bin/idmap_script.sh
-       </programlisting>
+</programlisting>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/log2pcap.1.xml b/docs-xml/manpages/log2pcap.1.xml
index fafe6de98eb..8eee3330a19 100644
--- a/docs-xml/manpages/log2pcap.1.xml
+++ b/docs-xml/manpages/log2pcap.1.xml
@@ -91,13 +91,13 @@
 
        <para><programlisting>
                        <prompt>$</prompt> log2pcap &lt; /var/log/* &gt; 
trace.pcap
-       </programlisting></para>
+</programlisting></para>
 
        <para>Convert to pcap using text2pcap:</para>
 
        <para><programlisting>
        <prompt>$</prompt> log2pcap -h samba.log | text2pcap -T 139,139 - 
trace.pcap
-       </programlisting></para>
+</programlisting></para>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/mdsearch.1.xml b/docs-xml/manpages/mdsearch.1.xml
index e5b443f4a75..c86c3ca6cb1 100644
--- a/docs-xml/manpages/mdsearch.1.xml
+++ b/docs-xml/manpages/mdsearch.1.xml
@@ -124,32 +124,32 @@
     <para>Search all indexed metadata attributes, exact match:</para>
     <programlisting>
       '*=="Samba"'
-    </programlisting>
+</programlisting>
 
     <para>Search all indexed metadata attributes, prefix match:</para>
     <programlisting>
       '*=="Samba*"'
-    </programlisting>
+</programlisting>
 
     <para>Search by filename:</para>
     <programlisting>
       'kMDItemFSName=="Samba*"'
-    </programlisting>
+</programlisting>
 
     <para>Search by date:</para>
     <programlisting>
       'kMDItemFSContentChangeDate&lt;$time.iso(2018-10-01T10:00:00Z)'
-    </programlisting>
+</programlisting>
 
     <para>Search files's content:</para>
     <programlisting>
       'kMDItemTextContent=="Samba*"'
-    </programlisting>
+</programlisting>
 
     <para>Expressions:</para>
     <programlisting>
       kMDItemFSName=="Samba*"||kMDItemTextContent=="Tango*"'
-    </programlisting>
+</programlisting>
   </refsect1>
 
   <refsect1>
diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml
index 05191236ecc..01b704c8841 100644
--- a/docs-xml/manpages/net.8.xml
+++ b/docs-xml/manpages/net.8.xml
@@ -3757,8 +3757,8 @@ net witness force-response   Force an AsyncNotify 
response based on json input (
 <refsect1>
        <title>VERSION</title>
 
-       <para>This man page is complete for version 3 of the Samba
-       suite.</para>
+       <para>This man page is part of version &doc.version;
+       of the Samba suite.</para>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/pam_winbind.8.xml 
b/docs-xml/manpages/pam_winbind.8.xml
index 171bb408757..4ec5bde7ab3 100644
--- a/docs-xml/manpages/pam_winbind.8.xml
+++ b/docs-xml/manpages/pam_winbind.8.xml
@@ -46,7 +46,7 @@
                            session   required        pam_unix2.so
                        +++ session   required        pam_winbind.so
                            ...
-               </programlisting>
+</programlisting>
 
                Make sure that pam_winbind is one of the first modules in the 
session part. It may retrieve
                kerberos tickets which are needed by other modules.
diff --git a/docs-xml/manpages/samba-log-parser.1.xml 
b/docs-xml/manpages/samba-log-parser.1.xml
index 7a62cd10a47..f40477a3ec6 100644
--- a/docs-xml/manpages/samba-log-parser.1.xml
+++ b/docs-xml/manpages/samba-log-parser.1.xml
@@ -111,7 +111,7 @@ options:
        </para>
        <programlisting>
        # samba-log-parser --traceid 1234 --flow /var/log/samba/log.winbind
-       </programlisting>
+</programlisting>
 
        <para>Show the full traces for winbind client with PID
        <parameter>999999</parameter>
@@ -120,7 +120,7 @@ options:
 
        <programlisting>
        # samba-log-parser --pid 999999 --merge-by-timestamp /var/log/samba
-       </programlisting>
+</programlisting>
 
        <para>Break down the traces into separate files according to traceid 
sorted
        using the timestamp for log files found in the samba log directory:
@@ -128,7 +128,7 @@ options:
 
        <programlisting>
        # samba-log-parser --breakdown --merge-by-timestamp /var/log/samba
-       </programlisting>
+</programlisting>
 
        <para>Sort traces using the timestamp for log files found in the samba 
log
        directory. Traces do not need to contain the traceid header field.
@@ -136,7 +136,7 @@ options:
 
        <programlisting>
        # samba-log-parser --merge-by-timestamp /var/log/samba
-       </programlisting>
+</programlisting>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/sharesec.1.xml b/docs-xml/manpages/sharesec.1.xml
index 897adbc74d5..6703afb2d8c 100644
--- a/docs-xml/manpages/sharesec.1.xml
+++ b/docs-xml/manpages/sharesec.1.xml
@@ -152,7 +152,7 @@
        OWNER:&lt;sid or name&gt;
        GROUP:&lt;sid or name&gt;
        ACL:&lt;sid or name&gt;:&lt;type&gt;/&lt;flags&gt;/&lt;mask&gt;
-       </programlisting></para>
+</programlisting></para>
 
        <para>The revision of the ACL specifies the internal Windows
        NT ACL revision for the security descriptor.
@@ -223,7 +223,7 @@
 
        <programlisting>
        host:~ # sharesec share -a 
S-1-5-21-1866488690-1365729215-3963860297-17724:ALLOWED/0/FULL
-       </programlisting>
+</programlisting>
 
        <para>List all ACEs for <parameter>share</parameter>:
        </para>
@@ -236,7 +236,7 @@
        GROUP:
        ACL:S-1-1-0:ALLOWED/0x0/FULL
        ACL:S-1-5-21-1866488690-1365729215-3963860297-17724:ALLOWED/0x0/FULL
-       </programlisting>
+</programlisting>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml
index e760ff6b431..3a5a73dc959 100644
--- a/docs-xml/manpages/smb.conf.5.xml
+++ b/docs-xml/manpages/smb.conf.5.xml
@@ -851,7 +851,7 @@ chmod 1770 /usr/local/samba/lib/usershares
 
        idmap config TRUSTED : backend  = rid
        idmap config TRUSTED : range    = 6000000-6999999
-       </programlisting>
+</programlisting>
 </refsect1>
 
 <refsect1>
diff --git a/docs-xml/manpages/smbspool.8.xml b/docs-xml/manpages/smbspool.8.xml
index fba8ca3c288..e2373318be7 100644
--- a/docs-xml/manpages/smbspool.8.xml
+++ b/docs-xml/manpages/smbspool.8.xml
@@ -73,7 +73,9 @@
                </para></listitem>
 
                <listitem><para>The user argument (argv[2]) contains the 
-               print user's name and is presently not used by smbspool.
+               print user's name and is presently not used by smbspool
+               except in Kerberos environments to access the user's
+               ticket cache.
                </para></listitem>
 
                <listitem><para>The title argument (argv[3]) contains the 
diff --git a/docs-xml/manpages/smbstatus.1.xml 
b/docs-xml/manpages/smbstatus.1.xml
index 63ae4641bf1..bbfdd3ba61c 100644
--- a/docs-xml/manpages/smbstatus.1.xml
+++ b/docs-xml/manpages/smbstatus.1.xml
@@ -257,7 +257,7 @@
     }
   }
 }
-                               </programlisting> </para>
+</programlisting> </para>
 
                        <para>If oplocks are used:
                                <programlisting>
@@ -268,7 +268,7 @@
             "LEASE": false,
             "text": "LEVEL_II"
           }
-                               </programlisting> </para>
+</programlisting> </para>
 
                        <para>If leases are used:
 
@@ -281,7 +281,7 @@
             "HANDLE": false,
             "text": "RW"
           }
-                       </programlisting> </para>
+</programlisting> </para>
 
                        <para>With byte-range locks (-B, --byterange):
                                <programlisting>
@@ -309,7 +309,7 @@
         }
       ]
     }
-                       </programlisting> </para>
+</programlisting> </para>
 
                        <para> With notifies (-N, --notify):
                                <programlisting>
@@ -327,7 +327,7 @@
       "creation_time": "1970-01-01T01:00:14.326582+01:00"
     }
   }
-                       </programlisting> </para>


-- 
Samba Shared Repository

Reply via email to