minor merge from HEAD
commitf14ea695115d2f2b503147df64e7315ddaf8ff40
authorGerald Carter <jerry@samba.org>
Wed, 8 May 2002 15:46:42 +0000 (8 15:46 +0000)
committerGerald Carter <jerry@samba.org>
Wed, 8 May 2002 15:46:42 +0000 (8 15:46 +0000)
treeedc9f6276c971d15bd9c20c14d187d362431188a
parentf14d73ca471b4f3328d6da8a53c8295f3a0bba01
minor merge from HEAD
docs/docbook/manpages/smb.conf.5.sgml
docs/htmldocs/smb.conf.5.html
docs/manpages/smb.conf.5