sync'ing up for 3.0alpha20 release

(This used to be commit b5d03c7b55fb2f34fa4d0228abe4389020e5ed5f)

1 files changed, 21 insertions, 18 deletions

diff --git a/docs/manpages/pdbedit.8 b/docs/manpages/pdbedit.8
index e2f5531d5d..523751712d 100644
--- a/docs/manpages/pdbedit.8
+++ b/docs/manpages/pdbedit.8
@@ -1,14 +1,15 @@
-.\" 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 "PDBEDIT" "8" "24 April 2002" "" ""
+.TH "PDBEDIT" "8" "20 August 2002" "" ""
 .SH NAME
 pdbedit \- manage the SAM database
 .SH SYNOPSIS
-.sp
-\fBpdbedit\fR [ \fB-l\fR ]  [ \fB-v\fR ]  [ \fB-w\fR ]  [ \fB-u username\fR ]  [ \fB-f fullname\fR ]  [ \fB-h homedir\fR ]  [ \fB-d drive\fR ]  [ \fB-s script\fR ]  [ \fB-p profile\fR ]  [ \fB-a\fR ]  [ \fB-m\fR ]  [ \fB-x\fR ]  [ \fB-i passdb-backend\fR ]  [ \fB-e passdb-backend\fR ]  [ \fB-D debuglevel\fR ] 
+
+\fBpdbedit\fR [ \fB-l\fR ] [ \fB-v\fR ] [ \fB-w\fR ] [ \fB-u username\fR ] [ \fB-f fullname\fR ] [ \fB-h homedir\fR ] [ \fB-d drive\fR ] [ \fB-s script\fR ] [ \fB-p profile\fR ] [ \fB-a\fR ] [ \fB-m\fR ] [ \fB-x\fR ] [ \fB-i passdb-backend\fR ] [ \fB-e passdb-backend\fR ] [ \fB-b passdb-backend\fR ] [ \fB-D debuglevel\fR ]
+
 .SH "DESCRIPTION"
 .PP
 This tool is part of the  Sambasuite.
@@ -34,12 +35,11 @@ the ':' character.
 
 Example: \fBpdbedit -l\fR
 
-.sp
+
 .nf
 		sorce:500:Simo Sorce
 		samba:45:Test User
 		
-.sp
 .fi
 .TP
 \fB-v\fR
@@ -49,7 +49,7 @@ out the account fields in a descriptive format.
 
 Example: \fBpdbedit -l -v\fR
 
-.sp
+
 .nf
 		---------------
 		username:       sorce
@@ -70,7 +70,6 @@ Example: \fBpdbedit -l -v\fR
 		Logon Script:   
 		Profile Path:   \\\\BERSERKER\\profile
 		
-.sp
 .fi
 .TP
 \fB-w\fR
@@ -81,12 +80,11 @@ out the account fields in a format compatible with the
 
 Example: \fBpdbedit -l -w\fR
 
-.sp
+
 .nf
 		sorce:500:508818B733CE64BEAAD3B435B51404EE:D2A2418EFC466A8A0F6B1DBB5C3DB80C:[UX         ]:LCT-00000000:
 		samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:BC281CE3F53B6A5146629CD4751D3490:[UX         ]:LCT-3BFA1E8D:
 		
-.sp
 .fi
 .TP
 \fB-u username\fR
@@ -138,11 +136,10 @@ the -u switch. When adding a new user pdbedit will also
 ask for the password to be used
 
 Example: \fBpdbedit -a -u sorce\fR
-.sp
+
 .nf
 new password:
 		retype new password
-.sp
 .fi
 .TP
 \fB-m\fR
@@ -161,11 +158,12 @@ from the database. It need the username be specified with the
 Example: \fBpdbedit -x -u bob\fR
 .TP
 \fB-i passdb-backend\fR
-Use a different passdb backend to retrieve users than the one specified in smb.conf.
+Use a different passdb backend to retrieve users than the one specified in smb.conf. Can be used to import data into your 
+local user database.
 
 This option will ease migration from one passdb backend to another.
 
-Example: \fBpdbedit -i smbpasswd:/etc/smbpasswd.old -e tdbsam:/etc/samba/passwd.tdb\fR
+Example: \fBpdbedit -i smbpasswd:/etc/smbpasswd.old\fR
 .TP
 \fB-e passdb-backend\fR
 Export all currently available users to the specified password database backend.
@@ -173,6 +171,11 @@ Export all currently available users to the specified password database backend.
 This option will ease migration from one passdb backend to another and will ease backupping
 
 Example: \fBpdbedit -e smbpasswd:/root/samba-users.backup\fR
+.TP
+\fB-b passdb-backend\fR
+Use a different default passdb backend. 
+
+Example: \fBpdbedit -b xml:/root/pdb-backup.xml -l\fR
 .SH "NOTES"
 .PP
 This command may be used only by root.
@@ -194,6 +197,6 @@ to the way the Linux kernel is developed.
 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 
+ftp://ftp.icce.rug.nl/pub/unix/) and updated for the Samba 2.0 
+release by Jeremy Allison.  The conversion to DocBook for 
 Samba 2.2 was done by Gerald Carter