Git commit b4f3e1e56a45c2994131d02082aee0715a2480dd by Alexander Reinholdt. Committed on 15/05/2021 at 15:25. Pushed by areinholdt into branch '3.1'.
Reflect last minute changes made to Smb4K also in the handbook. M +6 -5 doc/index.docbook https://invent.kde.org/network/smb4k/commit/b4f3e1e56a45c2994131d02082aee0715a2480dd diff --git a/doc/index.docbook b/doc/index.docbook index 3315fd36..e31657f9 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -481,7 +481,7 @@ <sect3 id="network_neighborhood_browser_defining_custom_options_samba"> <title>Browse Settings</title> - <para>You can define the minimal and maximal SMB protocol versions as well as the SMB port to be used. In addition, you can decide if Kerberos should be used for authentication. For detailed information on these settings, please see <link linkend="configuration_page_network">the network configuration page</link>.</para> + <para>You can define the minimal and maximal SMB protocol versions (if Samba's client library supports it) as well as the SMB port to be used. In addition, you can decide if Kerberos should be used for authentication. For detailed information on these settings, please see <link linkend="configuration_page_network">the network configuration page</link>.</para> </sect3> <sect3 id="network_neighborhood_browser_defining_custom_options_wol"> @@ -1660,7 +1660,7 @@ ntlm auth = yes <menuchoice><guibutton>Use Web Services Dynamic Discovery (WS-Discovery) for browsing</guibutton></menuchoice> </term> <listitem> - <para>The Web Services Dynamic Discovery (WS-Discovery) protocol is used to browse the local network and discover workgroups, domains and hosts. This is useful if your network neighborhood is dominated by servers with modern &Windows; versions. If you use this option, there should be no need to force &Samba;'s client library to use the SMB protocol version 1.0 to search for workgroups and domains.</para> + <para>Web Services Dynamic Discovery (WS-Discovery) is used to browse the local network and discover workgroups, domains and hosts. This is useful if your network neighborhood is dominated by servers with modern &Windows; versions. If you use this option, there should be no need to force &Samba;'s client library to use the SMB protocol version 1.0 to search for workgroups and domains.</para> <note><para>This setting is optional, and only appears if you compiled &smb4k; with WS-Discovery support.</para></note> <para>Default: selected</para> </listitem> @@ -1670,7 +1670,7 @@ ntlm auth = yes <menuchoice><guibutton>Use DNS Service Discovery (DNS-SD) for browsing</guibutton></menuchoice> </term> <listitem> - <para>The DNS Service Discovery (DNS-SD) interface is used to browse the local network and discover servers that provide shared SMB resources. The discovered domains correspond to the local DNS domains (⪚, named LOCAL) and most likely not the ones defined in the network neighborhood. However, this does not influence the browsing. If you use this option, there is no need to force &Samba;'s client library to use the SMB protocol version 1.0 when searching for workgroups and domains.</para> + <para>DNS Service Discovery (DNS-SD) is used to browse the local network and discover servers that provide shared SMB resources. The discovered domains correspond to the local DNS domains (⪚, named LOCAL) and most likely not the ones defined in the network neighborhood. However, this does not influence the browsing. If you use this option, there is no need to force &Samba;'s client library to use the SMB protocol version 1.0 when searching for workgroups and domains.</para> <para>Default: selected</para> </listitem> </varlistentry> @@ -1680,6 +1680,7 @@ ntlm auth = yes </term> <listitem> <para>Select this option as a last resort, because the SMB protocol version 1.0 is unsafe and has been disabled in newer &Samba; and &Windows; versions. However, if you have trouble discovering workgroups and domains in your network neighborhood, you might want to consider switching this setting on. If you are using DNS Service Discovery (DNS-SD) or Web Services Dynamic Discovery (WS-Discovery), and those are working for you, you do not need version 1.0.</para> + <para>This option is only available, if Samba's client library supports setting the protocol versions.</para> <para>Default: not selected</para> </listitem> </varlistentry> @@ -1689,8 +1690,8 @@ ntlm auth = yes </term> <listitem> <para>Set the minimal and maximal SMB protocol version that is used by &Samba;'s client library to browse the network neighborhood. This will override the settings in the smb.conf file. Normally, you do not need to use this option, because the right protocol versions should be negotiated between the client and the server while establishing a connection. Please note that this setting might not be appropriate to make the discovery of workgroups and domains work while keeping undisturbed connectivity to servers. Use DNS Service Discovery (DNS-SD) or Web Services Dynamic Discovery (WS-Discovery) for domain and workgroup lookups instead.</para> - <para>The settings below for the minimal and maximal SMB protocol version are enabled by checking this checkbox.</para> - <para>The maximal SMB protocol version must be equal to or greater than the minimal SMB protocol version.</para> + <para>The settings below for the minimal and maximal SMB protocol version are enabled by checking this checkbox. The maximal SMB protocol version must be equal to or greater than the minimal SMB protocol version.</para> + <para>These options are only available, if Samba's client library supports setting the protocol versions.</para> <para>Default: not selected</para> <variablelist> <varlistentry>
