merge from HEAD

(This used to be commit c0ca286e36d49deba6c73690114b0d867cbfd63e)

1 files changed, 24 insertions, 18 deletions

diff --git a/docs/manpages/samba.7 b/docs/manpages/samba.7
index 82e7409627..c898b8ce73 100644
--- a/docs/manpages/samba.7
+++ b/docs/manpages/samba.7
@@ -1,21 +1,23 @@
-.\" This manpage has been automatically generated by docbook2man-spec
-.\" from a DocBook document.  docbook2man-spec can be found at:
-.\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
+.\" 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 "SAMBA" "7" "28 January 2002" "" ""
+.TH "SAMBA" "7" "01 October 2002" "" ""
 .SH NAME
 SAMBA \- A Windows SMB/CIFS fileserver for UNIX
 .SH SYNOPSIS
-.sp
+
 \fBSamba\fR
+
 .SH "DESCRIPTION"
 .PP
 The Samba software suite is a collection of programs 
 that implements the Server Message Block (commonly abbreviated 
 as SMB) protocol for UNIX systems. This protocol is sometimes 
-also referred to as the Common Internet File System (CIFS), 
-LanManager or NetBIOS protocol.
+also referred to as the Common Internet File System (CIFS). For a
+more thorough description, see  http://www.ubiqx.org/cifs/ <URL:http://www.ubiqx.org/cifs/>. Samba also implements the NetBIOS
+protocol in nmbd.
 .TP
 \fBsmbd\fR
 The \fBsmbd \fR
@@ -26,7 +28,7 @@ for this daemon is described in \fIsmb.conf\fR
 .TP
 \fBnmbd\fR
 The \fBnmbd\fR
-daemon provides NetBIOS nameserving and browsing
+daemon provides NetBIOS nameservice and browsing
 support. The configuration file for this daemon 
 is described in \fIsmb.conf\fR
 .TP
@@ -46,7 +48,7 @@ utility is a simple syntax checker for Samba's
 \fBtestprns\fR
 The \fBtestprns\fR
 utility supports testing printer names defined 
-in your \fIprintcap>\fR file used 
+in your \fIprintcap\fR file used 
 by Samba.
 .TP
 \fBsmbstatus\fR
@@ -74,8 +76,13 @@ The Samba suite is made up of several components. Each
 component is described in a separate manual page. It is strongly 
 recommended that you read the documentation that comes with Samba 
 and the manual pages of those components that you use. If the 
-manual pages aren't clear enough then please send a patch or 
-bug report to  samba@samba.org <URL:mailto:samba@samba.org>
+manual pages and documents aren't clear enough then please visit
+http://devel.samba.org <URL:http://devel.samba.org/>
+for information on how to file a bug report or submit a patch.
+.PP
+If you require help, visit the Samba webpage at
+http://www.samba.org/ <URL:http://samba.org/> and
+explore the many option available to you.
 .SH "AVAILABILITY"
 .PP
 The Samba software suite is licensed under the 
@@ -108,11 +115,10 @@ If you wish to contribute to the Samba project,
 then I suggest you join the Samba mailing list at 
 http://lists.samba.org <URL:http://lists.samba.org/>.
 .PP
-If you have patches to submit or bugs to report 
-then you may mail them directly to samba-patches@samba.org.
-Note, however, that due to the enormous popularity of this 
-package the Samba Team may take some time to respond to mail. We 
-prefer patches in \fBdiff -u\fR format.
+If you have patches to submit, visit
+http://devel.samba.org/ <URL:http://devel.samba.org/>
+for information on how to do it properly. We prefer patches in
+\fBdiff -u\fR format.
 .SH "CONTRIBUTORS"
 .PP
 Contributors to the project are now too numerous 
@@ -125,7 +131,7 @@ Samba. The project would have been unmanageable without it.
 .PP
 In addition, several commercial organizations now help 
 fund the Samba Team with money and equipment. For details see 
-the Samba Web pages at  http://samba.org/samba/samba-thanks.html.
+the Samba Web pages at  http://samba.org/samba/samba-thanks.html
 .SH "AUTHOR"
 .PP
 The original Samba software and related utilities 
@@ -137,5 +143,5 @@ The original Samba man pages were written by Karl Auer.
 The man page sources were converted to YODL format (another 
 excellent piece of Open Source software, available at
 ftp://ftp.icce.rug.nl/pub/unix/ <URL:ftp://ftp.icce.rug.nl/pub/unix/>) and updated for the Samba 2.0 
-release by Jeremy Allison. The conversion to DocBook for 
+release by Jeremy Allison.  The conversion to DocBook for 
 Samba 2.2 was done by Gerald Carter