3 files changed, 80 insertions, 7 deletions
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 933d71ff0c..f29e7b6b02 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -459,6 +459,8 @@ comment
 
 default case
 
+delete readonly
+
 deny hosts
 
 directory
@@ -831,6 +833,19 @@ things.
              path = /%S
           
 
+.SS delete readonly (S)
+This parameter allows readonly files to be deleted.  This is not normal DOS
+semantics, but is allowed by Unix.
+
+This option may be useful for running applications such as rcs, where unix
+file ownership prevents changing file permissions, and dos semantics prevent
+deletion of a read only file.
+
+.B Default:
+ 	delete readonly = No
+
+.B Example:
+ 	delete readonly = Yes
 .SS deny hosts (S)
 A synonym for this parameter is 'hosts deny'.
 
@@ -1187,9 +1202,9 @@ order to obtain "lpq"-style printer status information.
 This command should be a program or script which takes a printer name
 as its only parameter and outputs printer status information. 
 
-Currently four styles of printer status information are supported;
-BSD, SYSV, AIX and HPUX. This covers most unix systems. You control
-which type is expected using the "printing =" option.
+Currently six styles of printer status information are supported; BSD,
+SYSV, AIX, HPUX, QNX and PLP. This covers most unix systems. You
+control which type is expected using the "printing =" option.
 
 Some clients (notably Windows for Workgroups) may not correctly send the
 connection number for the printer they are requesting status information
@@ -1235,8 +1250,8 @@ order to delete a print job.
 This command should be a program or script which takes a printer name
 and job number, and deletes the print job.
 
-Currently four styles of printer control are supported; BSD, SYSV, AIX
-and HPUX. This covers most unix systems. You control which type is
+Currently six styles of printer control are supported; BSD, SYSV, AIX
+HPUX, QNX and PLP. This covers most unix systems. You control which type is
 expected using the "printing =" option.
 
 If a %p is given then the printername is put in it's place. A %j is
@@ -1881,8 +1896,9 @@ This parameters controls how printer status information is interpreted
 on your system, and also affects the default values for the "print
 command", "lpq command" and "lprm command".
 
-Currently three printing styles are supported. They are "printing =
-bsd", "printing = sysv", "printing = hpux" and "printing = aix".
+Currently six printing styles are supported. They are "printing =
+bsd", "printing = sysv", "printing = hpux", "printing = aix",
+"printing = qnx" and "printing = plp".
 
 To see what the defaults are for the other print commands when using
 these three options use the "testparm" program.
@@ -1946,6 +1962,14 @@ merits of each are discussed in the README file.
 
 .B Example:
 	protocol = LANMAN1
+.SS proxy name resolution (G)
+
+This is a boolean that controls if nmbd will respond to broadcast name
+queries on behalf of other hosts. You may need to set this to no for
+some older clients.
+
+.B Default:
+	proxy name resolution = yes
 .SS public (S)
 A synonym for this parameter is 'guest ok'.
 
diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1
index be3a953266..e0af67ca1a 100644
--- a/docs/manpages/smbclient.1
+++ b/docs/manpages/smbclient.1
@@ -44,8 +44,13 @@ smbclient \- ftp-like Lan Manager client program
 ] [
 .B -p
 .I port number
+] [
+.B -c
+.I command string
+] [
 .B -T
 .I tar options
+] [
 .B -D
 .I initial directory
 ]
@@ -440,6 +445,19 @@ with the tar (\-T) option.
 
 .RE
 
+.B -c
+.I command string
+
+.RS 3
+
+command string is a semicolon separated list of commands to be
+executed instead of prompting from stdin. -N is implied by -c.
+
+This is particularly useful in scripts and for printing stdin to
+the server, e.g. -c 'print -'.
+
+.RE
+
 .SH OPERATIONS
 Once the client is running, the user is presented with a prompt, "smb: \\>".
 The backslash ("\\") indicates the current working directory on the server,
diff --git a/docs/samba.faq b/docs/samba.faq
index 6e3cf2943a..86dd48877f 100644
--- a/docs/samba.faq
+++ b/docs/samba.faq
@@ -548,6 +548,37 @@ properly. Samba needs to be able to switch uids on the connection and
 it can't if your OS has a trapdoor uid system. You'll know this
 because Samba will note it in your logs.
 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* 5: Problem with printers under NT
+
+This info from Stefan Hergeth may be useful:
+
+ A network-printer (with ethernetcard) is connected to the NT-Clients via
+ our UNIX-Fileserver (SAMBA-Server), like the configuration told by
+ Matthew Harrell <harrell@leech.nrl.navy.mil> (see WinNT.txt)
+
+ 1.) If a user has choosen this printer as the default printer in his
+     NT-Session and this printer is not connected to the network
+     (e.g. switched off) than this user has a problem with the SAMBA-
+     connection of his filesystems. It's very slow.
+
+ 2.) If the printer is connected to the network everything works fine.
+
+ 3.) When the smbd ist started with debug level 3, you can see that the
+     NT spooling system try to connect to the printer many times. If the
+     printer ist not connected to the network this request fails and the
+     NT spooler is wasting a lot of time to connect to the printer service.
+     This seems to be the reason for the slow network connection.
+
+ 4.) Maybe it's possible to change this behaviour by setting different printer
+     properties in the Print-Manager-Menu of NT, but i didn't try it
+     yet.
+
+ I hope this information will help in some way.
+
+ Stefan Hergeth <hergeth@f7axp1.informatik.fh-muenchen.de>
+
+
 ===============================================================================
 SECTION FIVE: Specific client application problems
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~