The Samba-Bugzilla – Attachment 18615 Details for
Bug 12918
Unadequate format in programlisting
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patches for the worst problems
bug12918-manpages.patch (text/plain), 27.64 KB, created by
Douglas Bagnall
on 2025-03-19 03:36:45 UTC
(
hide
)
Description:
patches for the worst problems
Filename:
MIME Type:
Creator:
Douglas Bagnall
Created:
2025-03-19 03:36:45 UTC
Size:
27.64 KB
patch
obsolete
>From 09d06d23c1110013ce5ecaf12fb103dc396e8464 Mon Sep 17 00:00:00 2001 >From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> >Date: Wed, 19 Mar 2025 16:13:46 +1300 >Subject: [PATCH 1/2] manpages: avoid extra blank line at end of > <programlisting> > >BUG:https://bugzilla.samba.org/show_bug.cgi?id=12918 > >Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> >--- > 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/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/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 | 4 ++-- > docs-xml/manpages/vfs_snapper.8.xml | 4 ++-- > docs-xml/manpages/winbind_krb5_localauth.8.xml | 2 +- > docs-xml/manpages/wspsearch.1.xml | 4 ++-- > 34 files changed, 72 insertions(+), 72 deletions(-) > >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 < /var/log/* > 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<$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/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:<sid or name> > GROUP:<sid or name> > ACL:<sid or name>:<type>/<flags>/<mask> >- </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/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> >+</programlisting> </para> > > <para> For profiling (-P, --profile): > <programlisting> >@@ -396,7 +396,7 @@ > ... > } > } >- </programlisting> </para> >+</programlisting> </para> > </listitem> > </varlistentry> > >diff --git a/docs-xml/manpages/traffic_learner.7.xml b/docs-xml/manpages/traffic_learner.7.xml >index b921035e4bd..30682a7fa36 100644 >--- a/docs-xml/manpages/traffic_learner.7.xml >+++ b/docs-xml/manpages/traffic_learner.7.xml >@@ -136,7 +136,7 @@ > "-": 1 > }, <lineannotation>[...]</lineannotation> > } >- </programlisting> >+</programlisting> > <para> This counts the observed continuations after an ldap > packet with opcode 0 (a bind) followed by a dcerpc packet with > opcode 11 (also a bind). The most common next packet is >diff --git a/docs-xml/manpages/vfs_btrfs.8.xml b/docs-xml/manpages/vfs_btrfs.8.xml >index c617a276e5b..163a1445a2f 100644 >--- a/docs-xml/manpages/vfs_btrfs.8.xml >+++ b/docs-xml/manpages/vfs_btrfs.8.xml >@@ -93,7 +93,7 @@ > <smbconfsection name="[share]"/> > <smbconfoption name="vfs objects">btrfs</smbconfoption> > <smbconfoption name="btrfs: manipulate snapshots">no</smbconfoption> >- </programlisting> >+</programlisting> > <para> > To use the experimental snapshot manipulation functionality > provided by this module, it must be explicitly enabled, and >@@ -113,7 +113,7 @@ > <smbconfsection name="[share]"/> > <smbconfoption name="vfs objects">btrfs shadow_copy</smbconfoption> > <smbconfoption name="btrfs: manipulate snapshots">yes</smbconfoption> >- </programlisting> >+</programlisting> > </refsect1> > > <refsect1> >diff --git a/docs-xml/manpages/vfs_ceph.8.xml b/docs-xml/manpages/vfs_ceph.8.xml >index 47b5523b9a1..a2b0d0ba1f8 100644 >--- a/docs-xml/manpages/vfs_ceph.8.xml >+++ b/docs-xml/manpages/vfs_ceph.8.xml >@@ -59,7 +59,7 @@ > <programlisting> > <command>client acl type = posix_acl</command> > <command>fuse default permissions = false</command> >- </programlisting> >+</programlisting> > </refsect1> > > <refsect1> >@@ -75,7 +75,7 @@ > <smbconfoption name="vfs objects">ceph</smbconfoption> > <smbconfoption name="path">/non-mounted/cephfs/path</smbconfoption> > <smbconfoption name="kernel share modes">no</smbconfoption> >- </programlisting> >+</programlisting> > > <para> > Since <command>vfs_ceph</command> does not require a filesystem >diff --git a/docs-xml/manpages/vfs_ceph_new.8.xml b/docs-xml/manpages/vfs_ceph_new.8.xml >index eaf5b66cceb..4c05f9ddd4b 100644 >--- a/docs-xml/manpages/vfs_ceph_new.8.xml >+++ b/docs-xml/manpages/vfs_ceph_new.8.xml >@@ -59,7 +59,7 @@ > <programlisting> > <command>client acl type = posix_acl</command> > <command>fuse default permissions = false</command> >- </programlisting> >+</programlisting> > > <para> > <emphasis role="strong">NOTE</emphasis>: >@@ -85,7 +85,7 @@ > <smbconfoption name="vfs objects">ceph_new</smbconfoption> > <smbconfoption name="path">/non-mounted/cephfs/path</smbconfoption> > <smbconfoption name="kernel share modes">no</smbconfoption> >- </programlisting> >+</programlisting> > > <para> > Since <command>vfs_ceph_new</command> does not require a >diff --git a/docs-xml/manpages/vfs_ceph_snapshots.8.xml b/docs-xml/manpages/vfs_ceph_snapshots.8.xml >index 872b5237b84..389159987b3 100644 >--- a/docs-xml/manpages/vfs_ceph_snapshots.8.xml >+++ b/docs-xml/manpages/vfs_ceph_snapshots.8.xml >@@ -65,7 +65,7 @@ > <smbconfoption name="vfs objects">ceph_snapshots ceph</smbconfoption> > <smbconfoption name="path">/non-mounted/cephfs/path</smbconfoption> > <smbconfoption name="kernel share modes">no</smbconfoption> >- </programlisting> >+</programlisting> > > <para> > <command>vfs_ceph_snapshots</command> can also be used atop a >@@ -78,7 +78,7 @@ > <smbconfsection name="[share]"/> > <smbconfoption name="vfs objects">ceph_snapshots</smbconfoption> > <smbconfoption name="path">/mnt/cephfs/</smbconfoption> >- </programlisting> >+</programlisting> > </refsect1> > > <refsect1> >diff --git a/docs-xml/manpages/vfs_expand_msdfs.8.xml b/docs-xml/manpages/vfs_expand_msdfs.8.xml >index 34f92c69788..824ef8d5494 100644 >--- a/docs-xml/manpages/vfs_expand_msdfs.8.xml >+++ b/docs-xml/manpages/vfs_expand_msdfs.8.xml >@@ -41,7 +41,7 @@ > 192.168.234 local.samba.org > 192.168 remote.samba.org > default.samba.org >- </programlisting> >+</programlisting> > > <para>With this, clients from network 192.168.234/24 are > redirected to host local.samba.org, clients from 192.168/16 >diff --git a/docs-xml/manpages/vfs_full_audit.8.xml b/docs-xml/manpages/vfs_full_audit.8.xml >index 9a9f1efc33b..a7bc95be0a8 100644 >--- a/docs-xml/manpages/vfs_full_audit.8.xml >+++ b/docs-xml/manpages/vfs_full_audit.8.xml >@@ -162,7 +162,7 @@ > format is: </para> > <programlisting> > smbd_audit: PREFIX|OPERATION|RESULT|FILE >- </programlisting> >+</programlisting> > > <para>The record fields are:</para> > >diff --git a/docs-xml/manpages/vfs_glusterfs.8.xml b/docs-xml/manpages/vfs_glusterfs.8.xml >index d25135e14ac..3aeb14592c5 100644 >--- a/docs-xml/manpages/vfs_glusterfs.8.xml >+++ b/docs-xml/manpages/vfs_glusterfs.8.xml >@@ -71,7 +71,7 @@ > <smbconfoption name="path">/relative/base/path</smbconfoption> > <smbconfoption name="glusterfs:volume">gv0</smbconfoption> > <smbconfoption name="kernel share modes">no</smbconfoption> >- </programlisting> >+</programlisting> > > <para> > Note that since <command>vfs_glusterfs</command> does not >@@ -182,7 +182,7 @@ > The write-behind translator can easily be disabled via calling > <programlisting> > gluster volume set <volumename> performance.write-behind off >- </programlisting> on the commandline. >+</programlisting> on the commandline. > </para> > <para> > With GlusterFS versions >= 9, we silently bypass write-behind >diff --git a/docs-xml/manpages/vfs_glusterfs_fuse.8.xml b/docs-xml/manpages/vfs_glusterfs_fuse.8.xml >index c1365442ff5..d005a295770 100644 >--- a/docs-xml/manpages/vfs_glusterfs_fuse.8.xml >+++ b/docs-xml/manpages/vfs_glusterfs_fuse.8.xml >@@ -75,7 +75,7 @@ > <smbconfsection name="[share]"/> > <smbconfoption name="vfs objects">glusterfs_fuse</smbconfoption> > <smbconfoption name="path">/absolute/path_of_fusemount</smbconfoption> >- </programlisting> >+</programlisting> > > <para> > Note that <command>vfs_glusterfs_fuse</command> requires a Gluster mount. For accessing glusterfs directly >diff --git a/docs-xml/manpages/vfs_nfs4acl_xattr.8.xml b/docs-xml/manpages/vfs_nfs4acl_xattr.8.xml >index 83f62b20190..3f9d401ecd7 100644 >--- a/docs-xml/manpages/vfs_nfs4acl_xattr.8.xml >+++ b/docs-xml/manpages/vfs_nfs4acl_xattr.8.xml >@@ -156,7 +156,7 @@ > <smbconfsection name="[samba_gpfs_share]"/> > <smbconfoption name="vfs objects">nfs4acl_xattr</smbconfoption> > <smbconfoption name="path">/foo/bar</smbconfoption> >- </programlisting> >+</programlisting> > </refsect1> > > <refsect1> >diff --git a/docs-xml/manpages/vfs_shadow_copy.8.xml b/docs-xml/manpages/vfs_shadow_copy.8.xml >index 5699a5dc5e7..6906f02c491 100644 >--- a/docs-xml/manpages/vfs_shadow_copy.8.xml >+++ b/docs-xml/manpages/vfs_shadow_copy.8.xml >@@ -69,7 +69,7 @@ > <manvolnum>1</manvolnum></citerefentry> command: > <programlisting> > TZ=GMT date +@GMT-%Y.%m.%d-%H.%M.%S >- </programlisting></para> >+</programlisting></para> > > </refsect1> > >diff --git a/docs-xml/manpages/vfs_shadow_copy2.8.xml b/docs-xml/manpages/vfs_shadow_copy2.8.xml >index fe37145d411..cdb7b6d1ee8 100644 >--- a/docs-xml/manpages/vfs_shadow_copy2.8.xml >+++ b/docs-xml/manpages/vfs_shadow_copy2.8.xml >@@ -124,7 +124,7 @@ > <manvolnum>1</manvolnum></citerefentry> command: > <programlisting> > TZ=GMT date +@GMT-%Y.%m.%d-%H.%M.%S >- </programlisting></para> >+</programlisting></para> > > </refsect1> > >diff --git a/docs-xml/manpages/vfs_shell_snap.8.xml b/docs-xml/manpages/vfs_shell_snap.8.xml >index 319d825cfaf..8a680bfa19d 100644 >--- a/docs-xml/manpages/vfs_shell_snap.8.xml >+++ b/docs-xml/manpages/vfs_shell_snap.8.xml >@@ -120,7 +120,7 @@ > snap_create.sh</smbconfoption> > <smbconfoption name="shell_snap:delete command"> > snap_delete.sh</smbconfoption> >- </programlisting> >+</programlisting> > > <para> > Samba's FSRVP server must be configured in the [global] section: >@@ -130,7 +130,7 @@ > <smbconfsection name="[global]"/> > <smbconfoption name="registry shares">yes</smbconfoption> > <smbconfoption name="include">registry</smbconfoption> >- </programlisting> >+</programlisting> > </refsect1> > > <refsect1> >diff --git a/docs-xml/manpages/vfs_snapper.8.xml b/docs-xml/manpages/vfs_snapper.8.xml >index 9663ece0b0c..672ace40eba 100644 >--- a/docs-xml/manpages/vfs_snapper.8.xml >+++ b/docs-xml/manpages/vfs_snapper.8.xml >@@ -61,7 +61,7 @@ > <programlisting> > <smbconfsection name="[share]"/> > <smbconfoption name="vfs objects">snapper</smbconfoption> >- </programlisting> >+</programlisting> > > <para> > For remote snapshot creation and deletion, Samba's FSRVP >@@ -72,7 +72,7 @@ > <smbconfsection name="[global]"/> > <smbconfoption name="registry shares">yes</smbconfoption> > <smbconfoption name="include">registry</smbconfoption> >- </programlisting> >+</programlisting> > </refsect1> > > <refsect1> >diff --git a/docs-xml/manpages/winbind_krb5_localauth.8.xml b/docs-xml/manpages/winbind_krb5_localauth.8.xml >index a382e71ead3..8fa7d053dd3 100644 >--- a/docs-xml/manpages/winbind_krb5_localauth.8.xml >+++ b/docs-xml/manpages/winbind_krb5_localauth.8.xml >@@ -54,7 +54,7 @@ > module = winbind:/usr/lib64/samba/krb5/winbind_krb5_localauth.so > enable_only = winbind > } >- </programlisting> >+</programlisting> > </para> > </refsect1> > >diff --git a/docs-xml/manpages/wspsearch.1.xml b/docs-xml/manpages/wspsearch.1.xml >index 06878d65404..ee9dd93f16e 100644 >--- a/docs-xml/manpages/wspsearch.1.xml >+++ b/docs-xml/manpages/wspsearch.1.xml >@@ -155,12 +155,12 @@ > <para>Search using a basic phrase:</para> > <programlisting> > 'wspsearch -Usomeuser%password //server/share --phrase="cats"' >- </programlisting> >+</programlisting> > > <para>Search using an AQS like query for a picture whose name starts with p403 or p404:</para> > <programlisting> > 'wspsearch -Usomeuser%password //server/share --query="ALL:$<p403 OR ALL:$<p404 AND System.Kind:picture"' >- </programlisting> >+</programlisting> > > </refsect1> > >-- >2.43.0 > > >From 2da385c9cd09b13bb53a19e5fb29a06be0a4fcd5 Mon Sep 17 00:00:00 2001 >From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> >Date: Wed, 19 Mar 2025 16:20:20 +1300 >Subject: [PATCH 2/2] 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 <douglas.bagnall@catalyst.net.nz> >--- > docs-xml/manpages/vfs_shell_snap.8.xml | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > >diff --git a/docs-xml/manpages/vfs_shell_snap.8.xml b/docs-xml/manpages/vfs_shell_snap.8.xml >index 8a680bfa19d..f8c7e7a7a06 100644 >--- a/docs-xml/manpages/vfs_shell_snap.8.xml >+++ b/docs-xml/manpages/vfs_shell_snap.8.xml >@@ -114,12 +114,9 @@ > <programlisting> > <smbconfsection name="[share]"/> > <smbconfoption name="vfs objects">shell_snap</smbconfoption> >- <smbconfoption name="shell_snap:check path command"> >- snap_check_path.sh</smbconfoption> >- <smbconfoption name="shell_snap:create command"> >- snap_create.sh</smbconfoption> >- <smbconfoption name="shell_snap:delete command"> >- snap_delete.sh</smbconfoption> >+ <smbconfoption name="shell_snap:check path command">snap_check_path.sh</smbconfoption> >+ <smbconfoption name="shell_snap:create command">snap_create.sh</smbconfoption> >+ <smbconfoption name="shell_snap:delete command">snap_delete.sh</smbconfoption> > </programlisting> > > <para> >-- >2.43.0 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=18615">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 12918
:
13405
| 18615