From 55abd936a838a4410899db76cb5530b0c4694dc9 Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Wed, 10 Oct 2001 17:19:10 +0000
Subject: mega-merge from 2.2 (This used to be commit
 c76bf8ed3275e217d1b691879153fe9137bcbe38)

---
 docs/htmldocs/wbinfo.1.html | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'docs/htmldocs/wbinfo.1.html')

diff --git a/docs/htmldocs/wbinfo.1.html b/docs/htmldocs/wbinfo.1.html
index 2787f514c0..badeb6961e 100644
--- a/docs/htmldocs/wbinfo.1.html
+++ b/docs/htmldocs/wbinfo.1.html
@@ -35,7 +35,7 @@ NAME="AEN8"
 ><P
 ><B
 CLASS="COMMAND"
->nmblookup</B
+>wbinfo</B
 >  [-u] [-g] [-n name] [-s sid] [-U uid] [-G gid] [-S sid] [-Y sid] [-t] [-m]</P
 ></DIV
 ><DIV
@@ -243,25 +243,27 @@ NAME="AEN88"
 CLASS="COMMAND"
 >winbindd(8)
 	</B
-> daemon is not working wbinfo will always return 
+> daemon is not working <B
+CLASS="COMMAND"
+>wbinfo</B
+> will always return 
 	failure. </P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN92"
+NAME="AEN93"
 ></A
 ><H2
 >VERSION</H2
 ><P
 >This man page is correct for version 2.2 of 
-	the Samba suite.  winbindd is however not available in
-	stable release of Samba as of yet.</P
+	the Samba suite.</P
 ></DIV
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN95"
+NAME="AEN96"
 ></A
 ><H2
 >SEE ALSO</H2
@@ -279,7 +281,7 @@ CLASS="COMMAND"
 ><DIV
 CLASS="REFSECT1"
 ><A
-NAME="AEN100"
+NAME="AEN101"
 ></A
 ><H2
 >AUTHOR</H2
@@ -296,7 +298,7 @@ CLASS="COMMAND"
 CLASS="COMMAND"
 >winbindd</B
 >
-	were written by TIm Potter.</P
+	were written by Tim Potter.</P
 ><P
 >The conversion to DocBook for Samba 2.2 was done 
 	by Gerald Carter</P
-- 
cgit