Made docs more up to date with source. Preparing for 1.9.17alpha5.

Jeremy (jallison@whistle.com)
(This used to be commit 148b7a2ee3f520f31793d25ebe164a147f2afdfe)

diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 257a57dc09d8f23702173aac7758f64d8ddc49d8..49206230da5a9444c18ed32cd6b8f9b286052a3d 100644 (file)
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -321,6 +321,10 @@ case, while short names are lowered. Default no.
 Here is a list of all global parameters. See the section of each
 parameter for details.  Note that some are synonyms.
 
 Here is a list of all global parameters. See the section of each
 parameter for details.  Note that some are synonyms.
 

+announce as
+
+announce version
+

 auto services
 
 browse list
 auto services
 
 browse list


@@ -345,6 +349,8 @@ dns proxy
 
 domain controller
 
 
 domain controller
 

+domain logons
+

 domain master
 
 encrypt passwords
 domain master
 
 encrypt passwords


@@ -649,7 +655,7 @@ write list
 .SS EXPLANATION OF EACH PARAMETER
 .RS 3
 
 .SS EXPLANATION OF EACH PARAMETER
 .RS 3
 

-.SS admin users (G)
+.SS admin users (S)

 
 This is a list of users who will be granted administrative privileges
 on the share. This means that they will do all file operations as the
 
 This is a list of users who will be granted administrative privileges
 on the share. This means that they will do all file operations as the


@@ -665,6 +671,35 @@ file permissions.
 .B Example:
        admin users = jason
 
 .B Example:
        admin users = jason
 

+.SS announce as (G)
+
+This specifies what type of server nmbd will announce itself as in
+browse lists. By default this is set to Windows NT. The valid options
+are "NT", "Win95" or "WfW" meaining Windows NT, Windows 95 and
+Windows for Workgroups respectively. Do not change this parameter
+unless you have a specific need to stop Samba appearing as an NT
+server as this may prevent Samba servers from participating as
+browser servers correctly.
+
+.B Default:
+    announce as = NT
+
+.B Example
+    announce as = Win95
+
+.SS announce version (G)
+
+This specifies the major and minor version numbers that nmbd
+will use when announcing itself as a server. The default is 4.2.
+Do not change this parameter unless you have a specific need to
+set a Samba server to be a downlevel server.
+
+.B Default:
+   announce version = 4.2
+
+.B Example:
+   announce version = 2.0
+

 .SS auto services (G)
 This is a list of services that you want to be automatically added to
 the browse lists. This is most useful for homes and printers services
 .SS auto services (G)
 This is a list of services that you want to be automatically added to
 the browse lists. This is most useful for homes and printers services


@@ -1109,6 +1144,15 @@ logons from Win95 machines to. You should never need to set this parameter.
 .B Default:
         domain controller = no
 
 .B Default:
         domain controller = no
 

+.SS domain logons (G)
+
+If set to true, the Samba server will serve Windows 95 domain logons
+for the workgroup it is in. For more details on setting up this feature
+see the file DOMAINS.txt in the Samba source documentation directory.
+
+.B Default:
+        domain logons = no
+

 .SS domain master (G)
 
 Enable WAN-wide browse list collation.  Local master browsers on 
 .SS domain master (G)
 
 Enable WAN-wide browse list collation.  Local master browsers on