1 files changed, 148 insertions, 118 deletions
diff --git a/docs/manpages/wbinfo.1 b/docs/manpages/wbinfo.1
index 3cc35e494d..0481489078 100644
--- a/docs/manpages/wbinfo.1
+++ b/docs/manpages/wbinfo.1
@@ -1,139 +1,169 @@
-.\" This manpage has been automatically generated by docbook2man 
-.\" from a DocBook document.  This tool can be found at:
-.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-.\" Please send any bug reports, improvements, comments, patches, 
-.\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "WBINFO" "1" "04 March 2003" "" ""
+.\"Generated by db2man.xsl. Don't modify this, modify the source.
+.de Sh \" Subsection
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Ip \" List item
+.br
+.ie \\n(.$>=3 .ne \\$3
+.el .ne 3
+.IP "\\$1" \\$2
+..
+.TH "WBINFO" 1 "" "" ""
 .SH NAME
 wbinfo \- Query information from winbind daemon
-.SH SYNOPSIS
+.SH "SYNOPSIS"
 
-\fBwbinfo\fR [ \fB-u\fR ] [ \fB-g\fR ] [ \fB-i ip\fR ] [ \fB-N netbios-name\fR ] [ \fB-n name\fR ] [ \fB-s sid\fR ] [ \fB-U uid\fR ] [ \fB-G gid\fR ] [ \fB-S sid\fR ] [ \fB-Y sid\fR ] [ \fB-t\fR ] [ \fB-m\fR ] [ \fB-r user\fR ] [ \fB-a user%password\fR ] [ \fB-A user%password\fR ] [ \fB-p\fR ]
+.nf
+\fBwbinfo\fR [-u] [-g] [-N netbios-name] [-I ip] [-n name] [-s sid] [-U uid] [-G gid]
+       [-S sid] [-Y sid] [-t] [-m] [--sequence] [-r user] [-a user%password]
+       [-A user%password] [--get-auth-user] [-p]
+.fi
 
 .SH "DESCRIPTION"
+
 .PP
-This tool is part of the  Samba suite.
+This tool is part of the \fBSamba\fR(7) suite\&.
+
 .PP
-The \fBwbinfo\fR program queries and returns information 
-created and used by the \fB winbindd(8)\fR daemon. 
+The \fBwbinfo\fR program queries and returns information created and used by the \fBwinbindd\fR(8) daemon\&.
+
 .PP
-The \fBwinbindd(8)\fR daemon must be configured 
-and running for the \fBwbinfo\fR program to be able 
-to return information.
+The \fBwinbindd\fR(8) daemon must be configured and running for the \fBwbinfo\fR program to be able to return information\&.
+
 .SH "OPTIONS"
+
+.TP
+-u
+This option will list all users available in the Windows NT domain for which the \fBwinbindd\fR(8) daemon is operating in\&. Users in all trusted domains will also be listed\&. Note that this operation does not assign user ids to any users that have not already been seen by \fBwinbindd\fR(8) \&.
+
+
+.TP
+-g
+This option will list all groups available in the Windows NT domain for which the \fBSamba\fR(7) daemon is operating in\&. Groups in all trusted domains will also be listed\&. Note that this operation does not assign group ids to any groups that have not already been seen by \fBwinbindd\fR(8)\&.
+
+
+.TP
+-N name
+The \fI-N\fR option queries \fBwinbindd\fR(8) to query the WINS server for the IP address associated with the NetBIOS name specified by the \fIname\fR parameter\&.
+
+
+.TP
+-I ip
+The \fI-I\fR option queries \fBwinbindd\fR(8) to send a node status request to get the NetBIOS name associated with the IP address specified by the \fIip\fR parameter\&.
+
+
 .TP
-\fB-u\fR
-This option will list all users available 
-in the Windows NT domain for which the \fBwinbindd(8)
-\fR daemon is operating in. Users in all trusted domains 
-will also be listed.  Note that this operation does not assign 
-user ids to any users that have not already been seen by 
-\fBwinbindd(8)\fR.
-.TP
-\fB-g\fR
-This option will list all groups available 
-in the Windows NT domain for which the \fBwinbindd(8)
-\fR daemon is operating in. Groups in all trusted domains
-will also be listed.  Note that this operation does not assign 
-group ids to any groups that have not already been seen by
-\fBwinbindd(8)\fR. 
-.TP
-\fB-N name\fR
-The \fI-N\fR option 
-queries \fBwinbindd(8)\fR to query the WINS
-server for the IP address associated with the NetBIOS name
-specified by the \fIname\fR parameter.
-.TP
-\fB-I ip\fR
-The \fI-I\fR option 
-queries \fBwinbindd(8)\fR to send a node status
-request to get the NetBIOS name associated with the IP address
-specified by the \fIip\fR parameter.
-.TP
-\fB-n name\fR
-The \fI-n\fR option 
-queries \fBwinbindd(8)\fR for the SID   
-associated with the name specified. Domain names can be specified 
-before the user name by using the winbind separator character.  
-For example CWDOM1/Administrator refers to the Administrator
-user in the domain CWDOM1.  If no domain is specified then the 
-domain used is the one specified in the \fIsmb.conf\fR
-\fIworkgroup\fR parameter. 
-.TP
-\fB-s sid\fR
-Use \fI-s\fR to resolve
-a SID to a name.  This is the inverse of the \fI-n
-\fR option above.  SIDs must be specified as ASCII strings 
-in the traditional Microsoft format. For example,
-S-1-5-21-1455342024-3071081365-2475485837-500. 
-.TP
-\fB-U uid\fR
-Try to convert a UNIX user id to a Windows NT 
-SID.  If the uid specified does not refer to one within
-the winbind uid range then the operation will fail. 
-.TP
-\fB-G gid\fR
-Try to convert a UNIX group id to a Windows 
-NT SID.  If the gid specified does not refer to one within 
-the winbind gid range then the operation will fail. 
-.TP
-\fB-S sid\fR
-Convert a SID to a UNIX user id.  If the SID 
-does not correspond to a UNIX user mapped by \fB  winbindd(8)\fR then the operation will fail. 
-.TP
-\fB-Y sid\fR
-Convert a SID to a UNIX group id.  If the SID 
-does not correspond to a UNIX group mapped by \fB  winbindd(8)\fR then the operation will fail. 
-.TP
-\fB-t\fR
-Verify that the workstation trust account 
-created when the Samba server is added to the Windows NT
-domain is working. 
-.TP
-\fB-m\fR
-Produce a list of domains trusted by the 
-Windows NT server \fBwinbindd(8)\fR contacts 
-when resolving names.  This list does not include the Windows 
-NT domain the server is a Primary Domain Controller for.
-.TP
-\fB-r username\fR
-Try to obtain the list of UNIX group ids
-to which the user belongs.  This only works for users
-defined on a Domain Controller.
-.TP
-\fB-a username%password\fR
-Attempt to authenticate a user via winbindd. 
-This checks both authenticaion methods and reports its results.
-.TP
-\fB-A username%password\fR
-Store username and password used by winbindd 
-during session setup to a domain controller.  This enables
-winbindd to operate in a Windows 2000 domain with Restrict
-Anonymous turned on (a.k.a. Permissions compatiable with
-Windows 2000 servers only).
+-n name
+The \fI-n\fR option queries \fBwinbindd\fR(8) for the SID associated with the name specified\&. Domain names can be specified before the user name by using the winbind separator character\&. For example CWDOM1/Administrator refers to the Administrator user in the domain CWDOM1\&. If no domain is specified then the domain used is the one specified in the \fBsmb.conf\fR(5) \fIworkgroup \fR parameter\&.
+
+
+.TP
+-s sid
+Use \fI-s\fR to resolve a SID to a name\&. This is the inverse of the \fI-n \fR option above\&. SIDs must be specified as ASCII strings in the traditional Microsoft format\&. For example, S-1-5-21-1455342024-3071081365-2475485837-500\&.
+
+
+.TP
+-U uid
+Try to convert a UNIX user id to a Windows NT SID\&. If the uid specified does not refer to one within the winbind uid range then the operation will fail\&.
+
+
+.TP
+-G gid
+Try to convert a UNIX group id to a Windows NT SID\&. If the gid specified does not refer to one within the winbind gid range then the operation will fail\&.
+
+
+.TP
+-S sid
+Convert a SID to a UNIX user id\&. If the SID does not correspond to a UNIX user mapped by \fBwinbindd\fR(8) then the operation will fail\&.
+
+
+.TP
+-Y sid
+Convert a SID to a UNIX group id\&. If the SID does not correspond to a UNIX group mapped by \fBwinbindd\fR(8) then the operation will fail\&.
+
+
+.TP
+-t
+Verify that the workstation trust account created when the Samba server is added to the Windows NT domain is working\&.
+
+
+.TP
+-m
+Produce a list of domains trusted by the Windows NT server \fBwinbindd\fR(8) contacts when resolving names\&. This list does not include the Windows NT domain the server is a Primary Domain Controller for\&.
+
+
+.TP
+--sequence
+Show sequence numbers of all known domains
+
+
+.TP
+-r username
+Try to obtain the list of UNIX group ids to which the user belongs\&. This only works for users defined on a Domain Controller\&.
+
+
+.TP
+-a username%password
+Attempt to authenticate a user via winbindd\&. This checks both authenticaion methods and reports its results\&.
+
+
+.TP
+-A username%password
+Store username and password used by winbindd during session setup to a domain controller\&. This enables winbindd to operate in a Windows 2000 domain with Restrict Anonymous turned on (a\&.k\&.a\&. Permissions compatiable with Windows 2000 servers only)\&.
+
+
+.TP
+--get-auth-user
+Print username and password used by winbindd during session setup to a domain controller\&. Username and password can be set using '-A'\&. Only available for root\&.
+
+
+.TP
+-p
+Check whether winbindd is still alive\&. Prints out either 'succeeded' or 'failed'\&.
+
+
+.TP
+-V
+Prints the version number for \fBsmbd\fR\&.
+
+
+.TP
+-h|--help
+Print a summary of command line options\&.
+
+
 .SH "EXIT STATUS"
+
 .PP
-The wbinfo program returns 0 if the operation 
-succeeded, or 1 if the operation failed.  If the \fBwinbindd(8)
-\fR daemon is not working \fBwbinfo\fR will always return 
-failure. 
+The wbinfo program returns 0 if the operation succeeded, or 1 if the operation failed\&. If the \fBwinbindd\fR(8) daemon is not working \fBwbinfo\fR will always return failure\&.
+
 .SH "VERSION"
+
 .PP
-This man page is correct for version 3.0 of 
-the Samba suite.
+This man page is correct for version 3\&.0 of the Samba suite\&.
+
 .SH "SEE ALSO"
+
 .PP
-\fBwinbindd(8)\fR
+\fBwinbindd\fR(8)
 
 .SH "AUTHOR"
+
 .PP
-The original Samba software and related utilities 
-were created by Andrew Tridgell. Samba is now developed
-by the Samba Team as an Open Source project similar 
-to the way the Linux kernel is developed.
+The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&.
+
 .PP
-\fBwbinfo\fR and \fBwinbindd\fR
-were written by Tim Potter.
+\fBwbinfo\fR and \fBwinbindd\fR were written by Tim Potter\&.
+
 .PP
-The conversion to DocBook for Samba 2.2 was done 
-by Gerald Carter
+The conversion to DocBook for Samba 2\&.2 was done by Gerald Carter\&. The conversion to DocBook XML 4\&.2 for Samba 3\&.0 was done by Alexander Bokovoy\&.
+