Updated sgml and html FAQ.

Paul.
(This used to be commit be5c7253dab694bc98f3906e37b6ca29ae8e8cf2)

5 files changed, 351 insertions, 325 deletions

diff --git a/docs/faq/sambafaq-1.html b/docs/faq/sambafaq-1.html
index 8bee1a37da..847c758632 100644
--- a/docs/faq/sambafaq-1.html
+++ b/docs/faq/sambafaq-1.html
@@ -38,30 +38,21 @@ flexibility designed to make life easier for administrators.</P>
 <P>
 <UL>
 <LI> smbd, the SMB server. This handles actual connections from
-clients, doing all the file, permission and username work
-</LI>
+clients, doing all the file, permission and username work</LI>
 <LI>nmbd, the Netbios name server, which helps clients locate
 servers, doing the browsing work and managing domains as this
-capability is being built into Samba
-</LI>
-<LI>smbclient, the Unix-hosted client program
-</LI>
+capability is being built into Samba</LI>
+<LI>smbclient, the Unix-hosted client program</LI>
 <LI>smbrun, a little 'glue' program to help the server run external
-programs
-</LI>
-<LI>testprns, a program to test server access to printers
-</LI>
+programs</LI>
+<LI>testprns, a program to test server access to printers</LI>
 <LI>testparms, a program to test the Samba configuration file for
-correctness
-</LI>
-<LI>smb.conf, the Samba configuration file
-</LI>
+correctness</LI>
+<LI>smb.conf, the Samba configuration file</LI>
 <LI> smbprint, a sample script to allow a Unix host to use smbclient
-to print to an SMB server
-</LI>
+to print to an SMB server</LI>
 <LI> documentation! DON'T neglect to read it - you will save a great
-deal of time!
-</LI>
+deal of time!</LI>
 </UL>
 </P>
 <P>The suite is supplied with full source (of course!) and is GPLed.</P>
@@ -114,31 +105,39 @@ all means take the plunge and help with the testing and development -
 but don't install it on your departmental server. Samba is typically
 very stable and safe, and this is mostly due to the policy of many
 public releases.</P>
-<P>How the scheme works:</P>
-<P>1) when major changes are made the version number is increased. For
+<P>How the scheme works:
+<OL>
+<LI>when major changes are made the version number is increased. For
 example, the transition from 1.9.15 to 1.9.16. However, this version
 number will not appear immediately and people should continue to use
-1.9.15 for production systems (see next point.)</P>
-<P>2) just after major changes are made the software is considered
+1.9.15 for production systems (see next point.)
+</LI>
+<LI>just after major changes are made the software is considered
 unstable, and a series of alpha releases are distributed, for example
 1.9.16alpha1. These are for testing by those who know what they are
 doing.  The "alpha" in the filename will hopefully scare off those who
-are just looking for the latest version to install.</P>
-<P>3) when Andrew thinks that the alphas have stabilised to the point
+are just looking for the latest version to install.
+</LI>
+<LI>when Andrew thinks that the alphas have stabilised to the point
 where he would recommend new users install it, he renames it to the
-same version number without the alpha, for example 1.9.16.</P>
-<P>4) inevitably bugs are found in the "stable" releases and minor patch
-levels are released which give us the pXX series, for example
-1.9.16p2.</P>
-<P>So the progression goes:</P>
-<P>1.9.15p7        (production)
-1.9.15p8        (production)
-1.9.16alpha1    (test sites only)
-:
-1.9.16alpha20   (test sites only)
-1.9.16          (production)
-1.9.16p1        (production)</P>
-<P>The above system means that whenever someone looks at the samba ftp
+same version number without the alpha, for example 1.9.16.
+</LI>
+<LI>inevitably bugs are found in the "stable" releases and minor patch
+levels are released which give us the pXX series, for example 1.9.16p2.</LI>
+</OL>
+
+So the progression goes:
+<PRE>
+                        1.9.15p7        (production)
+                        1.9.15p8        (production)
+                        1.9.16alpha1    (test sites only)
+                          :
+                        1.9.16alpha20   (test sites only)
+                        1.9.16          (production)
+                        1.9.16p1        (production)
+</PRE>
+
+The above system means that whenever someone looks at the samba ftp
 site they will be able to grab the highest numbered release without an
 alpha in the name and be sure of getting the current recommended
 version.</P>
@@ -151,40 +150,43 @@ version.</P>
 </P>
 <P>Many different platforms have run Samba successfully. The platforms
 most widely used and thus best tested are Linux and SunOS.</P>
-<P>At time of writing, the Makefile claimed support for:</P>
-<P>* SunOS
-* Linux with shadow passwords
-* Linux without shadow passwords
-* SOLARIS
-* SOLARIS 2.2 and above (aka SunOS 5)
-* SVR4
-* ULTRIX
-* OSF1 (alpha only)
-* OSF1 with NIS and Fast Crypt (alpha only)
-* OSF1 V2.0 Enhanced Security (alpha only)
-* AIX
-* BSDI
-* NetBSD
-* NetBSD 1.0
-* SEQUENT
-* HP-UX
-* SGI
-* SGI IRIX 4.x.x
-* SGI IRIX 5.x.x
-* FreeBSD
-* NeXT 3.2 and above
-* NeXT OS 2.x
-* NeXT OS 3.0
-* ISC SVR3V4 (POSIX mode)
-* ISC SVR3V4 (iBCS2 mode)
-* A/UX 3.0
-* SCO with shadow passwords.
-* SCO with shadow passwords, without YP.
-* SCO with TCB passwords
-* SCO 3.2v2 (ODT 1.1) with TCP passwords
-* intergraph
-* DGUX
-* Apollo Domain/OS sr10.3 (BSD4.3)</P>
+<P>At time of writing, the Makefile claimed support for:
+<UL>
+<LI> SunOS</LI>
+<LI> Linux with shadow passwords</LI>
+<LI> Linux without shadow passwords</LI>
+<LI> SOLARIS</LI>
+<LI> SOLARIS 2.2 and above (aka SunOS 5)</LI>
+<LI> SVR4</LI>
+<LI> ULTRIX</LI>
+<LI> OSF1 (alpha only)</LI>
+<LI> OSF1 with NIS and Fast Crypt (alpha only)</LI>
+<LI> OSF1 V2.0 Enhanced Security (alpha only)</LI>
+<LI> AIX</LI>
+<LI> BSDI</LI>
+<LI> NetBSD</LI>
+<LI> NetBSD 1.0</LI>
+<LI> SEQUENT</LI>
+<LI> HP-UX</LI>
+<LI> SGI</LI>
+<LI> SGI IRIX 4.x.x</LI>
+<LI> SGI IRIX 5.x.x</LI>
+<LI> FreeBSD</LI>
+<LI> NeXT 3.2 and above</LI>
+<LI> NeXT OS 2.x</LI>
+<LI> NeXT OS 3.0</LI>
+<LI> ISC SVR3V4 (POSIX mode)</LI>
+<LI> ISC SVR3V4 (iBCS2 mode)</LI>
+<LI> A/UX 3.0</LI>
+<LI> SCO with shadow passwords.</LI>
+<LI> SCO with shadow passwords, without YP.</LI>
+<LI> SCO with TCB passwords</LI>
+<LI> SCO 3.2v2 (ODT 1.1) with TCP passwords</LI>
+<LI> intergraph</LI>
+<LI> DGUX</LI>
+<LI> Apollo Domain/OS sr10.3 (BSD4.3)</LI>
+</UL>
+</P>
 
 
 <H2><A NAME="ss1.6">1.6 How can I find out more about Samba? </A></H2>
@@ -195,13 +197,21 @@ most widely used and thus best tested are Linux and SunOS.</P>
 <P>There are two mailing lists devoted to discussion of Samba-related
 matters.  There is also the newsgroup, comp.protocols.smb, which has a
 great deal of discussion on Samba. There is also a WWW site 'SAMBA Web
-Pages' at http://samba.canberra.edu.au/pub/samba/samba.html, under
+Pages' at 
+<A HREF="http://samba.canberra.edu.au/pub/samba/samba.html">http://samba.canberra.edu.au/pub/samba/samba.html</A>, under
 which there is a comprehensive survey of Samba users. Another useful
 resource is the hypertext archive of the Samba mailing list.</P>
-<P>Send email to listproc@samba.anu.edu.au. Make sure the subject line is
+<P>Send email to 
+<A HREF="mailto:listproc@samba.anu.edu.au">listproc@samba.anu.edu.au</A>. Make sure the subject line is
 blank, and include the following two lines in the body of the message:</P>
-<P>subscribe samba Firstname Lastname
-subscribe samba-announce Firstname Lastname</P>
+<P>
+<BLOCKQUOTE><CODE>
+<PRE>
+subscribe samba Firstname Lastname
+subscribe samba-announce Firstname Lastname
+</PRE>
+</CODE></BLOCKQUOTE>
+</P>
 <P>Obviously you should substitute YOUR first name for "Firstname" and
 YOUR last name for "Lastname"! Try not to send any signature stuff, it
 sometimes confuses the list processor.</P>
@@ -210,11 +220,17 @@ regurgitates a single message containing all the messages that have
 been received by the list since the last time and sends a copy of this
 message to all subscribers.</P>
 <P>If you stop being interested in Samba, please send another email to
-listproc@samba.anu.edu.au. Make sure the subject line is blank, and
+<A HREF="mailto:listproc@samba.anu.edu.au">listproc@samba.anu.edu.au</A>. Make sure the subject line is blank, and
 include the following two lines in the body of the message:</P>
-<P>unsubscribe samba
-unsubscribe samba-announce</P>
-<P>The From: line in your message MUST be the same address you used when
+<P>
+<BLOCKQUOTE><CODE>
+<PRE>
+unsubscribe samba
+unsubscribe samba-announce
+</PRE>
+</CODE></BLOCKQUOTE>
+</P>
+<P>The <B>From:</B> line in your message <EM>MUST</EM> be the same address you used when
 you subscribed.</P>
 
 
@@ -223,12 +239,12 @@ you subscribed.</P>
 <P> 
 <A NAME="wrong"></A> 
 </P>
-<P><F>#</F> *** IMPORTANT! *** <F>#</F> 
-DO NOT post messages on mailing lists or in newsgroups until you have
+<P><B><F>#</F> *** IMPORTANT! *** <F>#</F></B></P>
+<P>DO NOT post messages on mailing lists or in newsgroups until you have
 carried out the first three steps given here!</P>
 <P>Firstly, see if there are any likely looking entries in this FAQ! If
 you have just installed Samba, have you run through the checklist in
-DIAGNOSIS.txt? It can save you a lot of time and effort.</P>
+<A HREF="ftp://samba.anu.edu.au/pub/samba/DIAGNOSIS.txt">DIAGNOSIS.txt</A>? It can save you a lot of time and effort.</P>
 <P>Secondly, read the man pages for smbd, nmbd and smb.conf, looking for
 topics that relate to what you are trying to do.</P>
 <P>Thirdly, if there is no obvious solution to hand, try to get a look at
@@ -249,7 +265,8 @@ I can incorporate it in the next version.</P>
 <P>If you make changes to the source code, _please_ submit these patches
 so that everyone else gets the benefit of your work. This is one of
 the most important aspects to the maintainence of Samba. Send all
-patches to samba-bugs@samba.anu.edu.au, not Andrew Tridgell or any
+patches to 
+<A HREF="mailto:samba-bugs@samba.anu.edu.au">samba-bugs@samba.anu.edu.au</A>, not Andrew Tridgell or any
 other individual and not the samba team mailing list.</P>
 
 
diff --git a/docs/faq/sambafaq-2.html b/docs/faq/sambafaq-2.html
index f8e6bc7e9d..9f350052f6 100644
--- a/docs/faq/sambafaq-2.html
+++ b/docs/faq/sambafaq-2.html
@@ -18,9 +18,10 @@
 <P>
 <A NAME="no_browse"></A> 
 </P>
-<P>*** Until the FAQ can be updated, please check the file:
-*** ftp://samba.anu.edu.au/pub/samba/BROWSING.txt
-*** for more information on browsing.</P>
+<P>See 
+<A HREF="ftp://samba.anu.edu.au/pub/samba/BROWSING.txt">BROWSING.txt</A>
+for more information on browsing.  Browsing.txt can also be found
+in the docs directory of the Samba source.</P>
 <P>If your GUI client does not permit you to select non-browsable
 servers, you may need to do so on the command line. For example, under
 Lan Manager you might connect to the above service as disk drive M:
@@ -30,14 +31,14 @@ thusly:</P>
 client to client - check your client's documentation.</P>
 
 
-<H2><A NAME="ss2.2">2.2 Some files that I KNOW are on the server doesn't show up when I</A>view the files from my client!</H2>
+<H2><A NAME="ss2.2">2.2 Some files that I KNOW are on the server doesn't show up when I view the files from my client! </A></H2>
 
 <P> 
 <A NAME="missing_files"></A> 
 </P>
 
 
-<H2><A NAME="ss2.3">2.3 Some files on the server show up with really wierd filenames when</A>I view the files from my client!</H2>
+<H2><A NAME="ss2.3">2.3 Some files on the server show up with really wierd filenames when I view the files from my client! </A></H2>
 
 <P> 
 <A NAME="strange_filenames"></A> 
@@ -81,7 +82,7 @@ Two of this FAQ for more ideas.</P>
 tests :-)     </P>
 
 
-<H2><A NAME="ss2.5">2.5 My client reports "cannot locate specified share name" or</A>similar</H2>
+<H2><A NAME="ss2.5">2.5 My client reports "cannot locate specified share name" or similar</A></H2>
 
 <P> 
 <A NAME="cant_see_share"></A> 
@@ -93,14 +94,14 @@ the name you gave.</P>
 trying to connect to (consult your system administrator). Assuming it
 exists and you specified it correctly (read your client's doco on how
 to specify a service name correctly), read on:</P>
-<P>* Many clients cannot accept or use service names longer than
-eight
-characters.
-* Many clients cannot accept or use service names containing
-spaces.
-* Some servers (not Samba though) are case sensitive with service
-names.
-* Some clients force service names into upper case.</P>
+<P>
+<UL>
+<LI> Many clients cannot accept or use service names longer than eight characters.</LI>
+<LI> Many clients cannot accept or use service names containing spaces.</LI>
+<LI> Some servers (not Samba though) are case sensitive with service names.</LI>
+<LI> Some clients force service names into upper case.</LI>
+</UL>
+</P>
 
 
 <H2><A NAME="ss2.6">2.6 My client reports "cannot find domain controller", "cannot log</A>on to the network" or similar </H2>
@@ -164,7 +165,8 @@ as a strictly temporary solution.</P>
 <P>In earlier Samba versions there were some difficulties with the very
 latest Microsoft products, particularly Excel 5 and Word for Windows
 6. These should have all been solved. If not then please let Andrew
-Tridgell know.</P>
+Tridgell know via email at 
+<A HREF="mailto:samba-bugs@anu.edu.au">samba-bugs@anu.edu.au</A>.</P>
 
 
 <H2><A NAME="ss2.9">2.9 My "server string" doesn't seem to be recognised</A></H2>
@@ -175,9 +177,9 @@ Tridgell know.</P>
 <P>my client reports the default setting, eg. "Samba 1.9.15p4", instead
 of what I have changed it to in the smb.conf file.</P>
 <P>You need to use the -C option in nmbd. The "server string" affects
-what smbd puts out and -C affects what nmbd puts out. In a future
-version these will probably be combined and -C will be removed, but
-for now use -C</P>
+what smbd puts out and -C affects what nmbd puts out. 
+Current versions of Samba (1.9.16p11 +) have combined these options into
+the "server string" field of smb.conf, -C for nmbd is now obsolete.</P>
 
 
 <H2><A NAME="ss2.10">2.10 My client reports "This server is not configured to list shared</A>resources" </H2>
diff --git a/docs/faq/sambafaq-3.html b/docs/faq/sambafaq-3.html
index 01401017b9..4432ee52d8 100644
--- a/docs/faq/sambafaq-3.html
+++ b/docs/faq/sambafaq-3.html
@@ -18,26 +18,24 @@
 <P> 
 <A NAME="mac_clients"></A> 
 </P>
-<P>In Rob Newberry's words (rob@eats.com, Sun, 4 Dec 1994):</P>
-<P>The answer is "No." Samba speaks SMB, the protocol used for Microsoft
-networks.  The Macintosh has ALWAYS spoken Appletalk. Even with
-Microsoft "services for Macintosh", it has been a matter of making the
-server speak Appletalk. It is the same for Novell Netware and the
-Macintosh, although I believe Novell has (VERY LATE) released an
-extension for the Mac to let it speak IPX.</P>
-<P>In future Apple System Software, you may see support for other
-protocols, such as SMB -- Applet is working on a new networking
-architecture that will --> -- make it easier to support additional
-protocols. But it's not here yet.</P>
-<P>Now, the nice part is that if you want your Unix machine to speak
-Appletalk, there are several options. "Netatalk" and "CAP" are free,
-and available on the net. There are also several commercial options,
-such as "PacerShare" and "Helios" (I think). In any case, you'll have
-to look around for a server, not anything for the Mac.</P>
-<P>Depending on you OS, some of these may not help you. I am currently
-coordinating the effort to get CAP working with Native Ethertalk under
-Linux, but we're not done yet.</P>
-
+<P>lkcl - update 09mar97 - the answer is "Yes!".  Thursby now have a
+CIFS Client / Server - see 
+<A HREF="http://www.thursby.com/">http://www.thursby.com/</A>.  They test it against
+Windows 95, Windows NT and samba for compatibility issues.  At
+present, DAVE is at version 1.0.0.  DAVE version 1.0.1 is in beta,
+and will be released in April 97 (the speed of finder copies has
+been greatly enhanced, and there are bug-fixes included).</P>
+<P>Alternatives - There are two free implementations of AppleTalk for
+several kinds of UNIX machnes, and several more commercial ones.
+These products allow you to run file services and print services
+natively to Macintosh users, with no additional support required on
+the Macintosh.  The two free omplementations are Netatalk,
+<A HREF="http://www.umich.edu/~rsug/netatalk/">http://www.umich.edu/~rsug/netatalk/</A>, and CAP, 
+<A HREF="http://www.cs.mu.oz.au/appletalk/atalk.html">http://www.cs.mu.oz.au/appletalk/atalk.html</A>.  What Samba offers 
+MS Windows users, these packages offer to Macs.  For more info on
+these packages, Samba, and Linux (and other UNIX-based systems)
+see 
+<A HREF="http://www.eats.com/linux_mac_win.html">http://www.eats.com/linux_mac_win.html</A></P>
 
 
 <H2><A NAME="ss3.2">3.2 "Session request failed (131,130)" error</A></H2>
@@ -76,20 +74,31 @@ it.</P>
 <A NAME="synchronise_clock"></A> 
 </P>
 <P>To syncronize your PC's clock with your Samba server:</P>
-<P>* Copy timesync.pif to your windows directory
-* timesync.pif can be found at:
-http://samba.canberra.edu.au/pub/samba/binaries/miscellaneous/timesync.pif
-* Add timesync.pif to your 'Start Up' group/folder
-* Open the properties dialog box for the program/icon
-* Make sure the 'Run Minimized' option is set in program
-'Properties'
-* Change the command line section that reads \\sambahost to reflect
-the name
-of your server.
-* Close the properties dialog box by choosing 'OK'</P>
+<P>
+<UL>
+<LI> Copy timesync.pif to your windows directory</LI>
+<LI> timesync.pif can be found at:
+<A HREF="http://samba.canberra.edu.au/pub/samba/binaries/miscellaneous/timesync.pif">http://samba.canberra.edu.au/pub/samba/binaries/miscellaneous/timesync.pif</A></LI>
+<LI> Add timesync.pif to your 'Start Up' group/folder</LI>
+<LI> Open the properties dialog box for the program/icon</LI>
+<LI> Make sure the 'Run Minimized' option is set in program 'Properties'</LI>
+<LI> Change the command line section that reads \\sambahost to reflect the name of your server.</LI>
+<LI> Close the properties dialog box by choosing 'OK'</LI>
+</UL>
+</P>
 <P>Each time you start your computer (or login for Win95) your PC will
 synchronize it's clock with your Samba server.</P>
+<P>Alternativley, if you clients support Domain Logons, you can setup Domain Logons with Samba
+- see: 
+<A HREF="ftp://samba.anu.edu.au/pub/samba/docs/BROWSING.txt">BROWSING.txt</A> *** for more information.</P>
+<P>Then add 
+<BLOCKQUOTE><CODE>
+<PRE>
+NET TIME \\%L /SET /YES
+</PRE>
+</CODE></BLOCKQUOTE>
 
+as one of the lines in the logon script.</P>
 
 <H2><A NAME="ss3.4">3.4 Problems with WinDD, NTrigue, WinCenterPro etc</A></H2>
 
@@ -137,24 +146,25 @@ home directory. Use \\server\username instead.</P>
 hergeth@f7axp1.informatik.fh-muenchen.de may be useful:</P>
 <P>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)</P>
-<P>1.) If a user has choosen this printer as the default printer in his
+Matthew Harrell harrell@leech.nrl.navy.mil (see WinNT.txt)
+<OL>
+<LI>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.</P>
-<P>2.) If the printer is connected to the network everything works fine.</P>
-<P>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.</P>
-<P>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.</P>
+connection of his filesystems. It's very slow.
+</LI>
+<LI>If the printer is connected to the network everything works fine.
+</LI>
+<LI>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.
+</LI>
+<LI>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.</LI>
+</OL>
+</P>
 
 
 <H2><A NAME="ss3.6">3.6 Why are my file's timestamps off by an hour, or by a few hours?</A></H2>
@@ -168,64 +178,70 @@ it yet.</P>
 namely, the number of seconds since 1970-01-01 00:00:00 Universal Time
 (or ``GMT''), not counting leap seconds.</P>
 <P>On the server side, Samba uses the Unix TZ variable to convert
-internal
-timestamps to and from local time.  So on the server side, there are
-two
-things to get right.</P>
-<P>1.  The Unix system clock must have the correct Universal
-time.
-Use the shell command "sh -c 'TZ=UTC0 date'" to check this.</P>
-<P>2.  The TZ environment variable must be set on the server
+internal timestamps to and from local time.  So on the server side, there are
+two things to get right.
+<OL>
+<LI>The Unix system clock must have the correct Universal time.
+Use the shell command "sh -c 'TZ=UTC0 date'" to check this.
+</LI>
+<LI>The TZ environment variable must be set on the server
 before Samba is invoked.  The details of this depend on the
 server OS, but typically you must edit a file whose name is
-/etc/TIMEZONE or /etc/default/init, or run the command `zic
--l'.</P>
-<P>3.  TZ must have the correct value.</P>
-<P>3a.  If possible, use geographical time zone settings
+/etc/TIMEZONE or /etc/default/init, or run the command `zic -l'.
+</LI>
+<LI>TZ must have the correct value.
+<OL>
+<LI>If possible, use geographical time zone settings
 (e.g. TZ='America/Los_Angeles' or perhaps
 TZ=':US/Pacific').  These are supported by most
 popular Unix OSes, are easier to get right, and are
 more accurate for historical timestamps.  If your
 operating system has out-of-date tables, you should be
 able to update them from the public domain time zone
-tables at URL:ftp://elsie.nci.nih.gov/pub/.</P>
-<P>3b.  If your system does not support geographical time
-zone
+tables at 
+<A HREF="ftp://elsie.nci.nih.gov/pub/">ftp://elsie.nci.nih.gov/pub/</A>.
+</LI>
+<LI>If your system does not support geographical timezone
 settings, you must use a Posix-style TZ strings, e.g.
 TZ='PST8PDT,M4.1.0/2,M10.5.0/2' for US Pacific time.
-Posix TZ strings can take the following form (with
-optional
-items in brackets):</P>
-<P>StdOffset<F>Dst[Offset</F>,Date/Time,Date/Time]</P>
-<P>where:</P>
-<P>`Std' is the standard time designation
-(e.g. `PST').</P>
-<P>`Offset' is the number of hours behind UTC
-(e.g. `8').
+Posix TZ strings can take the following form (with optional
+items in brackets):
+<PRE>
+                        StdOffset[Dst[Offset],Date/Time,Date/Time]
+</PRE>
+
+where:
+<UL>
+<LI>                        `Std' is the standard time designation (e.g. `PST').
+</LI>
+<LI>                        `Offset' is the number of hours behind UTC (e.g. `8').
 Prepend a `-' if you are ahead of UTC, and
 append `:30' if you are at a half-hour offset.
 Omit all the remaining items if you do not use
-daylight-saving time.</P>
-<P>`Dst' is the daylight-saving time designation
-(e.g. `PDT').</P>
-<P>The optional second `Offset' is the number of
+daylight-saving time.
+</LI>
+<LI>                        `Dst' is the daylight-saving time designation
+(e.g. `PDT').
+
+The optional second `Offset' is the number of
 hours that daylight-saving time is behind UTC.
-The default is 1 hour ahead of standard time.</P>
-<P>`Date/Time,Date/Time' specify when
-daylight-saving
-time starts and ends.  The format for a date
-is
-`Mm.n.d', which specifies the dth day (0 is
-Sunday)
-of the nth week of the mth month, where week 5
-means
-the last such day in the month.  The format
-for a
-time is <F>h</F>h<F>:mm[:ss</F>], using a 24-hour clock.</P>
-<P>Other Posix string formats are allowed but you don't
-want
-to know about them.</P>
-<P>On the client side, you must make sure that your client's clock and
+The default is 1 hour ahead of standard time.
+</LI>
+<LI>                        `Date/Time,Date/Time' specify when daylight-saving
+time starts and ends.  The format for a date is
+`Mm.n.d', which specifies the dth day (0 is Sunday)
+of the nth week of the mth month, where week 5 means
+the last such day in the month.  The format for a
+time is <F>h</F>h<F>:mm[:ss</F>], using a 24-hour clock.</LI>
+</UL>
+
+Other Posix string formats are allowed but you don't want
+to know about them.</LI>
+</OL>
+</LI>
+</OL>
+
+On the client side, you must make sure that your client's clock and
 time zone is also set appropriately.  <F>[I don't know how to do this.</F>]
 Samba traditionally has had many problems dealing with time zones, due
 to the bizarre ways that Microsoft network protocols handle time
@@ -241,27 +257,41 @@ and then reconnecting to it; or upgrade your Samba server to
 <A NAME="printer_driver_name"></A> 
 </P>
 <P>Question:
-> On NT, I opened "Printer Manager" and "Connect to Printer".
-> Enter "\\ptdi270\ps1" in the box of printer. I got the
-> following error message:
->
->     You do not have sufficient access to your machine
->     to connect to the selected printer, since a driver
->     needs to be installed locally.</P>
-<P>Answer:</P>
+On NT, I opened "Printer Manager" and "Connect to Printer".
+Enter "\\ptdi270\ps1" in the box of printer. I got the
+following error message:
+<BLOCKQUOTE><CODE>
+<PRE>
+     You do not have sufficient access to your machine
+     to connect to the selected printer, since a driver
+     needs to be installed locally.
+</PRE>
+</CODE></BLOCKQUOTE>
+
+Answer:</P>
 <P>In the more recent versions of Samba you can now set the "printer
 driver" in smb.conf. This tells the client what driver to use. For
-example, I have:</P>
-<P>printer driver = HP LaserJet 4L</P>
-<P>and NT knows to use the right driver. You have to get this string
+example, I have:
+<BLOCKQUOTE><CODE>
+<PRE>
+     printer driver = HP LaserJet 4L
+</PRE>
+</CODE></BLOCKQUOTE>
+
+and NT knows to use the right driver. You have to get this string
 exactly right.</P>
 <P>To find the exact string to use, you need to get to the dialog box in
 your client where you select which printer driver to install. The
 correct strings for all the different printers are shown in a listbox
 in that dialog box.</P>
-<P>You could also try setting the driver to NULL like this:</P>
-<P>printer driver = NULL</P>
-<P>this is effectively what older versions of Samba did, so if that
+<P>You could also try setting the driver to NULL like this:
+<BLOCKQUOTE><CODE>
+<PRE>
+     printer driver = NULL
+</PRE>
+</CODE></BLOCKQUOTE>
+
+this is effectively what older versions of Samba did, so if that
 worked for you then give it a go. If this does work then let me know
 and I'll make it the default. Currently the default is a 0 length
 string.</P>
diff --git a/docs/faq/sambafaq.html b/docs/faq/sambafaq.html
index a86d71320e..9d777bd4ba 100644
--- a/docs/faq/sambafaq.html
+++ b/docs/faq/sambafaq.html
@@ -42,11 +42,11 @@ Table of Contents
 <HR>
 <H1> Samba FAQ</H1>
 
-<H2>Paul Blackman, <CODE>ictinus@lake.canberra.edu.au</CODE></H2>, v 0.5
+<H2>Paul Blackman, <CODE>ictinus@lake.canberra.edu.au</CODE></H2>, v 0.7
 <P><HR><EM> This is the Frequently Asked Questions (FAQ) document for
 Samba, the free and very popular SMB server product. An SMB server
 allows file and printer connections from clients such as Windows,
-OS/2, Linux and others. Current to version 1.9.16. Please send any
+OS/2, Linux and others. Current to version 1.9.17. Please send any
 corrections to the author.</EM><HR></P>
 <P>
 <H2><A NAME="toc1">1.</A> <A HREF="sambafaq-1.html">General Information</A></H2>
@@ -65,10 +65,10 @@ corrections to the author.</EM><HR></P>
 <H2><A NAME="toc2">2.</A> <A HREF="sambafaq-2.html">Compiling and installing Samba on a Unix host</A></H2>
 <UL>
 <LI><A HREF="sambafaq-2.html#ss2.1">2.1 I can't see the Samba server in any browse lists!</A>
-<LI><A HREF="sambafaq-2.html#ss2.2">2.2 Some files that I KNOW are on the server doesn't show up when I</A>
-<LI><A HREF="sambafaq-2.html#ss2.3">2.3 Some files on the server show up with really wierd filenames when</A>
+<LI><A HREF="sambafaq-2.html#ss2.2">2.2 Some files that I KNOW are on the server doesn't show up when I view the files from my client! </A>
+<LI><A HREF="sambafaq-2.html#ss2.3">2.3 Some files on the server show up with really wierd filenames when I view the files from my client! </A>
 <LI><A HREF="sambafaq-2.html#ss2.4">2.4 My client reports "cannot locate specified computer" or similar</A>
-<LI><A HREF="sambafaq-2.html#ss2.5">2.5 My client reports "cannot locate specified share name" or</A>
+<LI><A HREF="sambafaq-2.html#ss2.5">2.5 My client reports "cannot locate specified share name" or similar</A>
 <LI><A HREF="sambafaq-2.html#ss2.6">2.6 My client reports "cannot find domain controller", "cannot log</A>
 <LI><A HREF="sambafaq-2.html#ss2.7">2.7 Printing doesn't work :-(</A>
 <LI><A HREF="sambafaq-2.html#ss2.8">2.8 My programs install on the server OK, but refuse to work properly</A>
diff --git a/docs/faq/sambafaq.sgml b/docs/faq/sambafaq.sgml
index 618fecbcc3..be84112a8f 100644
--- a/docs/faq/sambafaq.sgml
+++ b/docs/faq/sambafaq.sgml
@@ -54,29 +54,20 @@ The components of the suite are (in summary):
 
 <item> smbd, the SMB server. This handles actual connections from
 clients, doing all the file, permission and username work
-
 <item>nmbd, the Netbios name server, which helps clients locate
 servers, doing the browsing work and managing domains as this
 capability is being built into Samba
-
 <item>smbclient, the Unix-hosted client program
-
 <item>smbrun, a little 'glue' program to help the server run external
 programs
-
 <item>testprns, a program to test server access to printers
-
 <item>testparms, a program to test the Samba configuration file for
 correctness
-
 <item>smb.conf, the Samba configuration file
-
 <item> smbprint, a sample script to allow a Unix host to use smbclient
 to print to an SMB server
-
 <item> documentation! DON'T neglect to read it - you will save a great
 deal of time!
-
 </itemize>
 
 The suite is supplied with full source (of course!) and is GPLed.
@@ -125,28 +116,27 @@ very stable and safe, and this is mostly due to the policy of many
 public releases.
 
 How the scheme works:
-
-1) when major changes are made the version number is increased. For
+<enum>
+<item>when major changes are made the version number is increased. For
 example, the transition from 1.9.15 to 1.9.16. However, this version
 number will not appear immediately and people should continue to use
 1.9.15 for production systems (see next point.)
 
-2) just after major changes are made the software is considered
+<item>just after major changes are made the software is considered
 unstable, and a series of alpha releases are distributed, for example
 1.9.16alpha1. These are for testing by those who know what they are
 doing.  The "alpha" in the filename will hopefully scare off those who
 are just looking for the latest version to install.
 
-3) when Andrew thinks that the alphas have stabilised to the point
+<item>when Andrew thinks that the alphas have stabilised to the point
 where he would recommend new users install it, he renames it to the
 same version number without the alpha, for example 1.9.16.
 
-4) inevitably bugs are found in the "stable" releases and minor patch
-levels are released which give us the pXX series, for example
-1.9.16p2.
-
+<item>inevitably bugs are found in the "stable" releases and minor patch
+levels are released which give us the pXX series, for example 1.9.16p2.
+</enum>
 So the progression goes:
-
+<verb>
                         1.9.15p7        (production)
                         1.9.15p8        (production)
                         1.9.16alpha1    (test sites only)
@@ -154,7 +144,7 @@ So the progression goes:
                         1.9.16alpha20   (test sites only)
                         1.9.16          (production)
                         1.9.16p1        (production)
-
+</verb>
 The above system means that whenever someone looks at the samba ftp
 site they will be able to grab the highest numbered release without an
 alpha in the name and be sure of getting the current recommended
@@ -207,15 +197,17 @@ At time of writing, the Makefile claimed support for:
 There are two mailing lists devoted to discussion of Samba-related
 matters.  There is also the newsgroup, comp.protocols.smb, which has a
 great deal of discussion on Samba. There is also a WWW site 'SAMBA Web
-Pages' at http://samba.canberra.edu.au/pub/samba/samba.html, under
+Pages' at <url url="http://samba.canberra.edu.au/pub/samba/samba.html">, under
 which there is a comprehensive survey of Samba users. Another useful
 resource is the hypertext archive of the Samba mailing list.
 
-Send email to listproc@samba.anu.edu.au. Make sure the subject line is
+Send email to <htmlurl url="mailto:listproc@samba.anu.edu.au" name="listproc@samba.anu.edu.au">. Make sure the subject line is
 blank, and include the following two lines in the body of the message:
 
-      subscribe samba Firstname Lastname
-      subscribe samba-announce Firstname Lastname
+<tscreen><verb>
+subscribe samba Firstname Lastname
+subscribe samba-announce Firstname Lastname
+</verb></tscreen>
 
 Obviously you should substitute YOUR first name for "Firstname" and
 YOUR last name for "Lastname"! Try not to send any signature stuff, it
@@ -227,24 +219,26 @@ been received by the list since the last time and sends a copy of this
 message to all subscribers.
 
 If you stop being interested in Samba, please send another email to
-listproc@samba.anu.edu.au. Make sure the subject line is blank, and
+<htmlurl url="mailto:listproc@samba.anu.edu.au" name="listproc@samba.anu.edu.au">. Make sure the subject line is blank, and
 include the following two lines in the body of the message:
 
-      unsubscribe samba
-      unsubscribe samba-announce
+<tscreen><verb>
+unsubscribe samba
+unsubscribe samba-announce
+</verb></tscreen>
 
-The From: line in your message MUST be the same address you used when
+The <bf>From:</bf> line in your message <em>MUST</em> be the same address you used when
 you subscribed.
 
 <sect1> Something's gone wrong - what should I do? <p> <label id="wrong">
 
-[#] *** IMPORTANT! *** [#] 
-DO NOT post messages on mailing lists or in newsgroups until you have
+<bf>[#] *** IMPORTANT! *** [#]</bf>
+<p>DO NOT post messages on mailing lists or in newsgroups until you have
 carried out the first three steps given here!
 
 Firstly, see if there are any likely looking entries in this FAQ! If
 you have just installed Samba, have you run through the checklist in
-DIAGNOSIS.txt? It can save you a lot of time and effort.
+<url url="ftp://samba.anu.edu.au/pub/samba/DIAGNOSIS.txt" name="DIAGNOSIS.txt">? It can save you a lot of time and effort.
 
 Secondly, read the man pages for smbd, nmbd and smb.conf, looking for
 topics that relate to what you are trying to do.
@@ -270,7 +264,7 @@ I can incorporate it in the next version.
 If you make changes to the source code, _please_ submit these patches
 so that everyone else gets the benefit of your work. This is one of
 the most important aspects to the maintainence of Samba. Send all
-patches to samba-bugs@samba.anu.edu.au, not Andrew Tridgell or any
+patches to <htmlurl url="mailto:samba-bugs@samba.anu.edu.au" name="samba-bugs@samba.anu.edu.au">, not Andrew Tridgell or any
 other individual and not the samba team mailing list.
 
 <sect1> Pizza supply details <p> <label id="pizza">
@@ -306,7 +300,7 @@ hungry sniffer dogs but it will have been a noble gesture.
 <sect1>I can't see the Samba server in any browse lists!<p>
 <label id="no_browse">
 
- See ftp://samba.anu.edu.au/pub/samba/BROWSING.txt 
+ See <url url="ftp://samba.anu.edu.au/pub/samba/BROWSING.txt" name="BROWSING.txt">
  for more information on browsing.  Browsing.txt can also be found
  in the docs directory of the Samba source.
 
@@ -320,11 +314,9 @@ thusly:
 The details of how to do this and the specific syntax varies from
 client to client - check your client's documentation.
 
-<sect1>Some files that I KNOW are on the server doesn't show up when I
-view the files from my client! <p> <label id="missing_files">
+<sect1>Some files that I KNOW are on the server doesn't show up when I view the files from my client! <p> <label id="missing_files">
 
-<sect1>Some files on the server show up with really wierd filenames when
-I view the files from my client! <p> <label id="strange_filenames">
+<sect1>Some files on the server show up with really wierd filenames when I view the files from my client! <p> <label id="strange_filenames">
 
 If you check what files are not showing up, you will note that they
 are files which contain upper case letters or which are otherwise not
@@ -366,9 +358,7 @@ Two of this FAQ for more ideas.
 By the way, remember to REMOVE the hardcoded mapping before further
 tests :-)     
 
-<sect1>My client reports "cannot locate specified share name" or
-similar<p> 
-<label id="cant_see_share">
+<sect1>My client reports "cannot locate specified share name" or similar<p> <label id="cant_see_share">
 
 This message indicates that your client CAN locate the specified
 server, which is a good start, but that it cannot find a service of
@@ -446,7 +436,7 @@ as a strictly temporary solution.
 In earlier Samba versions there were some difficulties with the very
 latest Microsoft products, particularly Excel 5 and Word for Windows
 6. These should have all been solved. If not then please let Andrew
-Tridgell know via email at 'samba-bugs@anu.edu.au'.
+Tridgell know via email at <htmlurl url="mailto:samba-bugs@anu.edu.au" name="samba-bugs@anu.edu.au">.
 
 <sect1>My "server string" doesn't seem to be recognised<p>
 <label id="bad_server_string">
@@ -508,7 +498,7 @@ as uid 65535 will actually run as root. This is not good!
 <sect1>Are any Macintosh clients for Samba<p> <label id="mac_clients">
 
 lkcl - update 09mar97 - the answer is "Yes!".  Thursby now have a
-CIFS Client / Server - see www.thursby.com.  They test it against
+CIFS Client / Server - see <url url="http://www.thursby.com/">.  They test it against
 Windows 95, Windows NT and samba for compatibility issues.  At
 present, DAVE is at version 1.0.0.  DAVE version 1.0.1 is in beta,
 and will be released in April 97 (the speed of finder copies has
@@ -519,11 +509,11 @@ several kinds of UNIX machnes, and several more commercial ones.
 These products allow you to run file services and print services
 natively to Macintosh users, with no additional support required on
 the Macintosh.  The two free omplementations are Netatalk,
-http://www.umich.edu/~rsug/netatalk/, and CAP, 
-http://www.cs.mu.oz.au/appletalk/atalk.html.  What Samba offers 
+<url url="http://www.umich.edu/~rsug/netatalk/">, and CAP, 
+<url url="http://www.cs.mu.oz.au/appletalk/atalk.html">.  What Samba offers 
 MS Windows users, these packages offer to Macs.  For more info on
 these packages, Samba, and Linux (and other UNIX-based systems)
-see http://www.eats.com/linux_mac_win.html
+see <url url="http://www.eats.com/linux_mac_win.html">
 
 <sect1>"Session request failed (131,130)" error<p> <label id="sess_req_fail">
 
@@ -562,20 +552,24 @@ To syncronize your PC's clock with your Samba server:
 <itemize>
 <item> Copy timesync.pif to your windows directory
  <item> timesync.pif can be found at:
-    http://samba.canberra.edu.au/pub/samba/binaries/miscellaneous/timesync.pif
+    <url url="http://samba.canberra.edu.au/pub/samba/binaries/miscellaneous/timesync.pif">
 <item> Add timesync.pif to your 'Start Up' group/folder
 <item> Open the properties dialog box for the program/icon
 <item> Make sure the 'Run Minimized' option is set in program 'Properties'
 <iteM> Change the command line section that reads \\sambahost to reflect the name of your server.
 <item> Close the properties dialog box by choosing 'OK'
+</itemize>
 
 Each time you start your computer (or login for Win95) your PC will
 synchronize it's clock with your Samba server.
 
 Alternativley, if you clients support Domain Logons, you can setup Domain Logons with Samba
- - see: ftp://samba.anu.edu.au/pub/samba/BROWSING.txt *** for more information.
-Then add NET TIME \\%L /SET /YES as one of the lines in the logon script.
-
+ - see: <url url="ftp://samba.anu.edu.au/pub/samba/docs/BROWSING.txt" name="BROWSING.txt"> *** for more information.
+<p>Then add 
+<tscreen><verb>
+NET TIME \\%L /SET /YES
+</verb></tscreen>
+as one of the lines in the logon script.
 <sect1>Problems with WinDD, NTrigue, WinCenterPro etc<p>
 <label id="multiple_session_clients">
 
@@ -624,27 +618,23 @@ hergeth@f7axp1.informatik.fh-muenchen.de 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
+<enum>
+<item>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.
+<item>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.
+<item>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.
+<item>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.
+</enum>
 
 <sect1>Why are my file's timestamps off by an hour, or by a few hours?<p>
 <label id="dst_bugs">
@@ -658,77 +648,64 @@ namely, the number of seconds since 1970-01-01 00:00:00 Universal Time
 (or ``GMT''), not counting leap seconds.
 
 On the server side, Samba uses the Unix TZ variable to convert
-internal
-timestamps to and from local time.  So on the server side, there are
-two
-things to get right.
-
-        1.  The Unix system clock must have the correct Universal
-time.
+internal timestamps to and from local time.  So on the server side, there are
+two things to get right.
+<enum>
+<item>The Unix system clock must have the correct Universal time.
         Use the shell command "sh -c 'TZ=UTC0 date'" to check this.
 
-        2.  The TZ environment variable must be set on the server
+<item>The TZ environment variable must be set on the server
         before Samba is invoked.  The details of this depend on the
         server OS, but typically you must edit a file whose name is
-        /etc/TIMEZONE or /etc/default/init, or run the command `zic
--l'.
+        /etc/TIMEZONE or /etc/default/init, or run the command `zic -l'.
 
-        3.  TZ must have the correct value.
-
-                3a.  If possible, use geographical time zone settings
+<item>TZ must have the correct value.
+<enum>
+      <item>If possible, use geographical time zone settings
                 (e.g. TZ='America/Los_Angeles' or perhaps
                 TZ=':US/Pacific').  These are supported by most
                 popular Unix OSes, are easier to get right, and are
                 more accurate for historical timestamps.  If your
                 operating system has out-of-date tables, you should be
                 able to update them from the public domain time zone
-                tables at URL:ftp://elsie.nci.nih.gov/pub/.
+                tables at <url url="ftp://elsie.nci.nih.gov/pub/">.
 
-                3b.  If your system does not support geographical time
-zone
+      <item>If your system does not support geographical timezone
                 settings, you must use a Posix-style TZ strings, e.g.
                 TZ='PST8PDT,M4.1.0/2,M10.5.0/2' for US Pacific time.
-                Posix TZ strings can take the following form (with
-optional
+                Posix TZ strings can take the following form (with optional
                 items in brackets):
-
+<verb>
                         StdOffset[Dst[Offset],Date/Time,Date/Time]
-
+</verb>
                 where:
+<itemize>
+<item>                        `Std' is the standard time designation (e.g. `PST').
 
-                        `Std' is the standard time designation
-(e.g. `PST').
-
-                        `Offset' is the number of hours behind UTC
-(e.g. `8').
+<item>                        `Offset' is the number of hours behind UTC (e.g. `8').
                         Prepend a `-' if you are ahead of UTC, and
                         append `:30' if you are at a half-hour offset.
                         Omit all the remaining items if you do not use
                         daylight-saving time.
 
-                        `Dst' is the daylight-saving time designation
+<item>                        `Dst' is the daylight-saving time designation
                         (e.g. `PDT').
 
                         The optional second `Offset' is the number of
                         hours that daylight-saving time is behind UTC.
                         The default is 1 hour ahead of standard time.
 
-                        `Date/Time,Date/Time' specify when
-daylight-saving
-                        time starts and ends.  The format for a date
-is
-                        `Mm.n.d', which specifies the dth day (0 is
-Sunday)
-                        of the nth week of the mth month, where week 5
-means
-                        the last such day in the month.  The format
-for a
+<item>                        `Date/Time,Date/Time' specify when daylight-saving
+                        time starts and ends.  The format for a date is
+                        `Mm.n.d', which specifies the dth day (0 is Sunday)
+                        of the nth week of the mth month, where week 5 means
+                        the last such day in the month.  The format for a
                         time is [h]h[:mm[:ss]], using a 24-hour clock.
-
-                Other Posix string formats are allowed but you don't
-want
+</itemize>
+                Other Posix string formats are allowed but you don't want
                 to know about them.
-
+</enum>
+</enum>
 On the client side, you must make sure that your client's clock and
 time zone is also set appropriately.  [[I don't know how to do this.]]
 Samba traditionally has had many problems dealing with time zones, due
@@ -742,22 +719,22 @@ and then reconnecting to it; or upgrade your Samba server to
 <label id="printer_driver_name">
 
 Question:
-> On NT, I opened "Printer Manager" and "Connect to Printer".
-> Enter "\\ptdi270\ps1" in the box of printer. I got the
-> following error message:
->
->     You do not have sufficient access to your machine
->     to connect to the selected printer, since a driver
->     needs to be installed locally.
-
+ On NT, I opened "Printer Manager" and "Connect to Printer".
+ Enter "\\ptdi270\ps1" in the box of printer. I got the
+ following error message:
+<tscreen><verb>
+     You do not have sufficient access to your machine
+     to connect to the selected printer, since a driver
+     needs to be installed locally.
+</verb></tscreen>
 Answer:
 
 In the more recent versions of Samba you can now set the "printer
 driver" in smb.conf. This tells the client what driver to use. For
 example, I have:
-
+<tscreen><verb>
      printer driver = HP LaserJet 4L
-
+</verb></tscreen>
 and NT knows to use the right driver. You have to get this string
 exactly right.
 
@@ -767,9 +744,9 @@ correct strings for all the different printers are shown in a listbox
 in that dialog box.
 
 You could also try setting the driver to NULL like this:
-
+<tscreen><verb>
      printer driver = NULL
-
+</verb></tscreen>
 this is effectively what older versions of Samba did, so if that
 worked for you then give it a go. If this does work then let me know
 and I'll make it the default. Currently the default is a 0 length