Merge from 2.2

(This used to be commit c6a01f0a67148a234175439bdfe439ae011d397d)

diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 3ee2a3b8bd14492cce56f8226c2c2097cd5db84f..b3be01677b8df89ad18e1439f921479447c12bf3 100644 (file)
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -7963,7 +7963,7 @@
                enumeration may cause some programs to behave oddly.
                </para>
 
-               <para>Default: <command>winbind enum groups = no </command>
+               <para>Default: <command>winbind enum groups = yes </command>
                </para></listitem>
                </varlistentry>