1 files changed, 80 insertions, 0 deletions
diff --git a/docs/yodldocs/smb.conf.5.yo b/docs/yodldocs/smb.conf.5.yo
index 31adf6dada..8983c26880 100644
--- a/docs/yodldocs/smb.conf.5.yo
+++ b/docs/yodldocs/smb.conf.5.yo
@@ -746,6 +746,10 @@ it() link(bf(syslog))(syslog)
 
 it() link(bf(syslog only))(syslogonly)
 
+it() link(bf(template homedir))(templatehomedir)
+
+it() link(bf(template shell))(templateshell)
+
 it() link(bf(time offset))(timeoffset)
 
 it() link(bf(time server))(timeserver)
@@ -768,6 +772,12 @@ it() link(bf(utmp directory))(utmpdirectory)
 
 it() link(bf(valid chars))(validchars)
 
+it() link(bf(winbind cache time))(winbindcachetime)
+
+it() link(bf(winbind gid))(winbindgid)
+
+it() link(bf(winbind uid))(winbinduid)
+
 it() link(bf(wins hook))(winshook)
 
 it() link(bf(wins proxy))(winsproxy)
@@ -6153,6 +6163,32 @@ system syslog only, and not to the debug log files.
   bf(Default:)
 tt(	syslog only = no)
 
+label(templatehomedir)
+dit(bf(template homedir (G)))
+
+NOTE: this parameter is only available in Samba 3.0.
+
+When filling out the user information for a Windows NT user, the
+url(bf(winbindd))(winbindd.8.html) daemon uses this parameter to fill in
+the home directory for that user.  If the string tt(%D) is present it is
+substituted with the user's Windows NT domain name.  If the string tt(%U)
+is present it is substituted with the user's Windows NT user name.
+
+  bf(Default:)
+tt(     template homedir = /home/%D/%U)
+
+label(templateshell)
+dit(bf(template shell (G)))
+
+NOTE: this parameter is only available in Samba 3.0.
+
+When filling out the user information for a Windows NT user, the
+url(bf(winbindd))(winbindd.8.html) daemon uses this parameter to fill in
+the login shell for that user.
+
+  bf(Default:)
+tt(     template shell = /bin/false)
+
 label(timeoffset)
 dit(bf(time offset (G)))
 
@@ -6479,6 +6515,50 @@ tt(no utmp directory)
   bf(Example:)
 tt(utmp directory = /var/adm/)
 
+label(winbindcachetime)
+dit(winbind cache time)
+
+NOTE: this parameter is only available in Samba 3.0.
+
+This parameter specifies the number of seconds the
+url(bf(winbindd))(winbindd.8.html) daemon will cache user and group
+information before querying a Windows NT server again.
+
+  bf(Default:)
+tt(     winbind cache type = 15)
+
+label(winbindgid)
+dit(winbind gid)
+
+NOTE: this parameter is only available in Samba 3.0.
+
+The winbind gid parameter specifies the range of group ids that are
+allocated by the url(bf(winbindd))(winbindd.8.html) daemon.  This range of
+group ids should have no existing local or nis groups within it as strange
+conflicts can occur otherwise.
+
+  bf(Default:)
+tt(     winbind gid = <empty string>)
+
+  bf(Example:)
+tt(     winbind gid = 10000-20000)
+
+label(winbinduid)
+dit(winbind uid)
+
+NOTE: this parameter is only available in Samba 3.0.
+
+The winbind uid parameter specifies the range of user ids that are
+allocated by the url(bf(winbindd))(winbindd.8.html) daemon.  This range of
+ids should have no existing local or nis users within it as strange
+conflicts can occur otherwise.
+
+  bf(Default:)
+tt(     winbind uid = <empty string>)
+
+  bf(Example:)
+tt(     winbind uid = 10000-20000)
+
 label(validchars)
 dit(bf(valid chars (G)))