From: Douglas Bagnall Date: Wed, 19 Mar 2025 03:13:46 +0000 (+1300) Subject: manpages: avoid extra blank line at end of X-Git-Tag: tevent-0.17.0~509 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc33c630d7028e334fce847713e51aee9f6c8fc0;p=thirdparty%2Fsamba.git manpages: avoid extra blank line at end of 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 Reviewed-by: Jennifer Sutton --- 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: - + Set up an eventlog source, specifying a message file DLL: eventlogadm -o addsource Application MyApplication | \\ %SystemRoot%/system32/MyApplication.dll - + Filter messages from the system log into an event log: tail -f /var/log/messages | \\ my_program_to_parse_into_eventlog_records | \\ eventlogadm SystemLogEvents - + 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 - + 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: ID = REDUCED RID + IDMAP RANGE LOW VALUE + RANGE NUMBER * RANGE SIZE - + 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: RID = (ID - LOW ID) % RANGE SIZE + DOMAIN RANGE INDEX * RANGE SIZE - + Where the DOMAIN RANGE INDEX is retrieved from the database along with the domain sid by the RANGE NUMBER = (ID - LOW ID) / RANGE SIZE . @@ -143,7 +143,7 @@ idmap config * : backend = autorid idmap config * : range = 1000000-1999999 - + 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 - + 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 - + 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 - + 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 - + 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 - + 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 - + 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: ID = RID - BASE_RID + LOW_RANGE_ID. - + Correspondingly, the formula for calculating the RID for a given Unix ID is this: RID = ID + BASE_RID - LOW_RANGE_ID. - + @@ -109,7 +109,7 @@ idmap config TRUSTED : backend = rid idmap config TRUSTED : range = 50000 - 99999 idmap config TRUSTED : base_rid = 500000 - + 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 - + And it should return one of the following responses as a single line of @@ -86,7 +86,7 @@ XID:yyyy SID:ssss ERR:yyyy - + 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 - + This shows a simple script to partially perform the task: @@ -131,7 +131,7 @@ echo "ERR: No idea what to do" exit 1 fi - + 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 - + 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 - + And it should return one of the following responses as a single line of @@ -94,7 +94,7 @@ GID:yyyy SID:yyyy ERR:yyyy - + @@ -108,7 +108,7 @@ [global] idmap config * : backend = tdb2 idmap config * : range = 1000000-2000000 - + 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 - + 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 @@ $ log2pcap < /var/log/* > trace.pcap - + Convert to pcap using text2pcap: $ log2pcap -h samba.log | text2pcap -T 139,139 - trace.pcap - + 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 @@ Search all indexed metadata attributes, exact match: '*=="Samba"' - + Search all indexed metadata attributes, prefix match: '*=="Samba*"' - + Search by filename: 'kMDItemFSName=="Samba*"' - + Search by date: 'kMDItemFSContentChangeDate<$time.iso(2018-10-01T10:00:00Z)' - + Search files's content: 'kMDItemTextContent=="Samba*"' - + Expressions: kMDItemFSName=="Samba*"||kMDItemTextContent=="Tango*"' - + 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 ... - + 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: # samba-log-parser --traceid 1234 --flow /var/log/samba/log.winbind - + Show the full traces for winbind client with PID 999999 @@ -120,7 +120,7 @@ options: # samba-log-parser --pid 999999 --merge-by-timestamp /var/log/samba - + 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: # samba-log-parser --breakdown --merge-by-timestamp /var/log/samba - + 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: # samba-log-parser --merge-by-timestamp /var/log/samba - + 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> - + The revision of the ACL specifies the internal Windows NT ACL revision for the security descriptor. @@ -223,7 +223,7 @@ host:~ # sharesec share -a S-1-5-21-1866488690-1365729215-3963860297-17724:ALLOWED/0/FULL - + List all ACEs for share: @@ -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 - + 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 - + 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 @@ } } } - + If oplocks are used: @@ -268,7 +268,7 @@ "LEASE": false, "text": "LEVEL_II" } - + If leases are used: @@ -281,7 +281,7 @@ "HANDLE": false, "text": "RW" } - + With byte-range locks (-B, --byterange): @@ -309,7 +309,7 @@ } ] } - + With notifies (-N, --notify): @@ -327,7 +327,7 @@ "creation_time": "1970-01-01T01:00:14.326582+01:00" } } - + For profiling (-P, --profile): @@ -396,7 +396,7 @@ ... } } - + 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 }, [...] } - + 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 @@ btrfs no - + To use the experimental snapshot manipulation functionality provided by this module, it must be explicitly enabled, and @@ -113,7 +113,7 @@ btrfs shadow_copy yes - + 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 @@ client acl type = posix_acl fuse default permissions = false - + @@ -75,7 +75,7 @@ ceph /non-mounted/cephfs/path no - + Since vfs_ceph 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 @@ client acl type = posix_acl fuse default permissions = false - + NOTE: @@ -85,7 +85,7 @@ ceph_new /non-mounted/cephfs/path no - + Since vfs_ceph_new 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 @@ ceph_snapshots ceph /non-mounted/cephfs/path no - + vfs_ceph_snapshots can also be used atop a @@ -78,7 +78,7 @@ ceph_snapshots /mnt/cephfs/ - + 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 - + 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: smbd_audit: PREFIX|OPERATION|RESULT|FILE - + The record fields are: 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 @@ /relative/base/path gv0 no - + Note that since vfs_glusterfs does not @@ -182,7 +182,7 @@ The write-behind translator can easily be disabled via calling gluster volume set <volumename> performance.write-behind off - on the commandline. + on the commandline. 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 @@ glusterfs_fuse /absolute/path_of_fusemount - + Note that vfs_glusterfs_fuse 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 @@ nfs4acl_xattr /foo/bar - + 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 @@ 1 command: TZ=GMT date +@GMT-%Y.%m.%d-%H.%M.%S - + 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 @@ 1 command: TZ=GMT date +@GMT-%Y.%m.%d-%H.%M.%S - + 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 snap_delete.sh - + Samba's FSRVP server must be configured in the [global] section: @@ -130,7 +130,7 @@ yes registry - + 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 @@ snapper - + For remote snapshot creation and deletion, Samba's FSRVP @@ -72,7 +72,7 @@ yes registry - + 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 } - + 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 @@ Search using a basic phrase: 'wspsearch -Usomeuser%password //server/share --phrase="cats"' - + Search using an AQS like query for a picture whose name starts with p403 or p404: 'wspsearch -Usomeuser%password //server/share --query="ALL:$<p403 OR ALL:$<p404 AND System.Kind:picture"' - +