merge from 2.2
authorGerald Carter <jerry@samba.org>
Thu, 21 Jun 2001 14:27:41 +0000 (14:27 +0000)
committerGerald Carter <jerry@samba.org>
Thu, 21 Jun 2001 14:27:41 +0000 (14:27 +0000)
commit57d93d21f345ef5892b33a7a7370762373b9421f
treea49b7013462087a2ce20e2f5c0f01279bee46adb
parent91b8a8d1d21b810b6aca44ce647837669efd6dcf
merge from 2.2
(This used to be commit 5932471a03e74ef7fcc71e22dbb52c530332a713)
docs/Samba-HOWTO-Collection.pdf
docs/docbook/Makefile.in
docs/docbook/projdoc/samba-doc.sgml
docs/htmldocs/Samba-HOWTO-Collection.html
docs/htmldocs/nmblookup.1.html
docs/manpages/nmblookup.1
swat/help/welcome.html