merge from HEAD

(This used to be commit c0ca286e36d49deba6c73690114b0d867cbfd63e)

1 files changed, 21 insertions, 20 deletions

diff --git a/docs/manpages/smbtar.1 b/docs/manpages/smbtar.1
index b9bbf3df15..bee874dcba 100644
--- a/docs/manpages/smbtar.1
+++ b/docs/manpages/smbtar.1
@@ -1,20 +1,21 @@
-.\" 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 "SMBTAR" "1" "28 January 2002" "" ""
+.TH "SMBTAR" "1" "01 October 2002" "" ""
 .SH NAME
 smbtar \- shell script for backing up SMB/CIFS shares  directly to UNIX tape drives
 .SH SYNOPSIS
-.sp
-\fBsmbtar\fR \fB-s server\fR [ \fB-p password\fR ]  [ \fB-x services\fR ]  [ \fB-X\fR ]  [ \fB-d directory\fR ]  [ \fB-u user\fR ]  [ \fB-t tape\fR ]  [ \fB-t tape\fR ]  [ \fB-b blocksize\fR ]  [ \fB-N filename\fR ]  [ \fB-i\fR ]  [ \fB-r\fR ]  [ \fB-l loglevel\fR ]  [ \fB-v\fR ]  \fBfilenames\fR
+
+\fBsmbtar\fR \fB-s server\fR [ \fB-p password\fR ] [ \fB-x services\fR ] [ \fB-X\fR ] [ \fB-d directory\fR ] [ \fB-u user\fR ] [ \fB-t tape\fR ] [ \fB-t tape\fR ] [ \fB-b blocksize\fR ] [ \fB-N filename\fR ] [ \fB-i\fR ] [ \fB-r\fR ] [ \fB-l loglevel\fR ] [ \fB-v\fR ] \fBfilenames\fR
+
 .SH "DESCRIPTION"
 .PP
-This tool is part of the  Sambasuite.
+This tool is part of the  Samba suite.
 .PP
 \fBsmbtar\fR is a very small shell script on top 
-of \fBsmbclient(1)\fR
+of \fBsmbclient(1)\fR 
 which dumps SMB shares directly to tape. 
 .SH "OPTIONS"
 .TP
@@ -32,7 +33,7 @@ create or restore.
 .TP
 \fB-d directory\fR
 Change to initial \fIdirectory
-\fRbefore restoring / backing up files. 
+\fR before restoring / backing up files. 
 .TP
 \fB-v\fR
 Verbose mode.
@@ -49,7 +50,7 @@ UNIX login name.
 Tape device. May be regular file or tape 
 device. Default: \fI$TAPE\fR environmental 
 variable; if not set, a file called \fItar.out
-\fR\&. 
+\fR. 
 .TP
 \fB-b blocksize\fR
 Blocking factor. Defaults to 20. See
@@ -72,7 +73,7 @@ from the tar file.
 \fB-l log level\fR
 Log (debug) level. Corresponds to the 
 \fI-d\fR flag of \fBsmbclient(1)
-\fR\&. 
+\fR. 
 .SH "ENVIRONMENT VARIABLES"
 .PP
 The \fI$TAPE\fR variable specifies the 
@@ -81,27 +82,27 @@ with the -t option.
 .SH "BUGS"
 .PP
 The \fBsmbtar\fR script has different 
-options from ordinary tar and tar called from smbclient. 
+options from ordinary tar and from smbclient's tar command. 
 .SH "CAVEATS"
 .PP
 Sites that are more careful about security may not like 
 the way the script handles PC passwords. Backup and restore work 
-on entire shares, should work on file lists. smbtar works best
+on entire shares; should work on file lists. smbtar works best
 with GNU tar and may not work well with other versions. 
 .SH "DIAGNOSTICS"
 .PP
 See the \fBDIAGNOSTICS\fR section for the 
 \fBsmbclient(1)\fR 
-command.
+ command.
 .SH "VERSION"
 .PP
-This man page is correct for version 2.2 of 
+This man page is correct for version 3.0 of 
 the Samba suite.
 .SH "SEE ALSO"
 .PP
-\fBsmbd(8)\fR, 
-\fBsmbclient(1)\fR, 
-smb.conf(5),
+\fBsmbd(8)\fR 
+\fBsmbclient(1)\fR 
+smb.conf(5)
 .SH "AUTHOR"
 .PP
 The original Samba software and related utilities 
@@ -109,12 +110,12 @@ 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
-Ricky Poulten <URL:mailto:poultenr@logica.co.uk> 
+Ricky Poulten <URL:mailto:poultenr@logica.co.uk>  
 wrote the tar extension and this man page. The \fBsmbtar\fR 
 script was heavily rewritten and improved by Martin Kraemer <URL:mailto:Martin.Kraemer@mch.sni.de>. Many 
 thanks to everyone who suggested extensions, improvements, bug 
 fixes, etc. 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.