Removed samba.faq from the docs directory, it was out of date. All FAQs in

docs/faq.

Replaced all reference to samba.canberra.edu.au/pub/samba/samba.html
with samba.anu.edu.au/samba/

Replaced references to ictinus@lake.canberra.edu.au
with ictinus@samba.anu.edu.au

Added 3 new mirrors, Greece, Poland, Romania
Paul.
(This used to be commit d808df8191cdf21b011e773e6e99b0c65524253c)

14 files changed, 506 insertions, 1187 deletions

diff --git a/docs/announce b/docs/announce
index adcde8966f..a03ddcd0e6 100644
--- a/docs/announce
+++ b/docs/announce
@@ -127,7 +127,7 @@ There is also often quite a bit of discussion about Samba on the
 newsgroup comp.protocols.smb.
 
 A WWW site with lots of Samba info can be found at 
-http://samba.canberra.edu.au/pub/samba/
+http://samba.anu.edu.au/samba/
 
 The Samba Team (Contact: samba-bugs@samba.anu.edu.au)
 June 1996
diff --git a/docs/faq/Samba-Server-FAQ.sgml b/docs/faq/Samba-Server-FAQ.sgml
index 4887481e2b..020d532281 100644
--- a/docs/faq/Samba-Server-FAQ.sgml
+++ b/docs/faq/Samba-Server-FAQ.sgml
@@ -3,7 +3,7 @@
  v 0.1 23 Aug 1997 	Dan Shearer 
 			Original Samba-Client-FAQ.sgml from Paul's sambafaq.sgml
  v 0.2 25 Aug 1997	Dan
-
+ v 0.3 7  Oct 1997	Paul, changed email address from ictinus@lake... to ictinus@samba.anu
 -->
 
 
@@ -11,9 +11,9 @@
 
 <title> Samba Server FAQ
 
-<author>Dan Shearer & Paul Blackman, <tt>ictinus@lake.canberra.edu.au</tt>
+<author>Dan Shearer & Paul Blackman, <tt>ictinus@samba.anu.edu.au</tt>
 
-<date>v 0.1, 23 Aug '97
+<date>v 0.3, 7 Oct '97
 
 <abstract> This is the <em>Server</em> Frequently Asked Questions (FAQ)
 document for Samba, the free and very popular SMB and CIFS server
diff --git a/docs/faq/Samba-meta-FAQ-2.html b/docs/faq/Samba-meta-FAQ-2.html
index c5ebab7e7e..ac76038006 100644
--- a/docs/faq/Samba-meta-FAQ-2.html
+++ b/docs/faq/Samba-meta-FAQ-2.html
@@ -166,7 +166,7 @@ See below for subscription information.
 discussion about Samba. 
 </LI>
 <LI>The WWW site 'SAMBA Web Pages' at 
-<A HREF="http://samba.canberra.edu.au/pub/samba/samba.html">http://samba.canberra.edu.au/pub/samba/samba.html</A> includes:
+<A HREF="http://samba.anu.edu.au/samba/">http://samba.anu.edu.au/samba/</A> includes:
 
 <UL>
 <LI>Links to man pages and documentation, including this FAQ</LI>
diff --git a/docs/faq/Samba-meta-FAQ.sgml b/docs/faq/Samba-meta-FAQ.sgml
index 2b54c6fa0f..75038f19f5 100644
--- a/docs/faq/Samba-meta-FAQ.sgml
+++ b/docs/faq/Samba-meta-FAQ.sgml
@@ -3,15 +3,17 @@
  v 0.1 23 Aug 1997 	Dan Shearer 
 			Original Samba-meta-FAQ.sgml from Paul's sambafaq.sgml
  v 0.2 25 Aug 1997      Dan   
+ v 0.3 7  Oct 1997	Paul
+			Changed samba.canberra refs to samba.anu.../samba/
 -->
 
 <article>
 
 <title> Samba meta FAQ
 
-<author>Dan Shearer & Paul Blackman, <tt>ictinus@lake.canberra.edu.au</tt>
+<author>Dan Shearer & Paul Blackman, <tt>ictinus@samba.anu.edu.au</tt>
 
-<date>v 0.1, 23 Aug '97
+<date>v 0.3, 7 Oct '97
 
 <abstract> This is the meta-Frequently Asked Questions (FAQ) document
 for Samba, the free and very popular SMB and CIFS server product. It
@@ -286,7 +288,7 @@ See below for subscription information.
 discussion about Samba. 
 
 <item>The WWW site 'SAMBA Web Pages' at <url
-url="http://samba.canberra.edu.au/pub/samba/samba.html"> includes:
+url="http://samba.anu.edu.au/samba/"> includes:
 
   <itemize>
     <item>Links to man pages and documentation, including this FAQ
diff --git a/docs/faq/Samba-meta-FAQ.txt b/docs/faq/Samba-meta-FAQ.txt
index 967dceac8d..4fb1ed6544 100644
--- a/docs/faq/Samba-meta-FAQ.txt
+++ b/docs/faq/Samba-meta-FAQ.txt
@@ -43,7 +43,7 @@
 
   2.11.   Pizza supply details
 
-  3.      About CIFS and SMB
+  3.      About the CIFS and SMB Protocols
 
   3.1.    What is the Server Message Block (SMB) Protocol?
 
@@ -53,7 +53,7 @@
 
   4.      Designing A SMB and CIFS Network
 
-  4.1.    Workgroups, Browsing Domains and Authentication Domains
+  4.1.    Workgroups, Domains, Authentication and Browsing
 
   4.1.1.  Defining the Terms
 
@@ -63,19 +63,16 @@
 
   4.2.    Authentication Schemes
 
-  4.2.1.  Workgroup Mode Services
 
-  4.2.2.  Windows NT-Style Domain
+  4.2.1.  NIS
 
-  4.2.3.  NIS
+  4.2.2.  Kerberos
 
-  4.2.4.  Kerberos
+  4.2.3.  FTP
 
-  4.2.5.  FTP
+  4.2.4.  Default Server Method
 
-  4.2.6.  Default Server Method
-
-  4.2.7.  Client-side Database Only
+  4.2.5.  Client-side Database Only
 
   4.3.    Post-Authentication: Netlogon, Logon Scripts, Profiles
 
@@ -88,47 +85,87 @@
 
   11..  QQuuiicckk RReeffeerreennccee GGuuiiddeess ttoo SSaammbbaa DDooccuummeennttaattiioonn
 
+
   We are endeavouring to provide links here to every major class of
   information about Samba or things related to Samba. We cannot list
   every document, but we are aiming for all documents to be at most two
   referrals from those listed here. This needs constant maintaining, so
   please send the author your feedback.
 
+
   11..11..  SSaammbbaa ffoorr tthhee IImmppaattiieenntt
 
+
   You know you should read the documentation but can't wait to start?
   What you need to do then is follow the instructions in the following
-  documents, in order. This should be enough to get a _s_i_m_p_l_e site going
-  quickly. If you have any problems at all, refer back to this section
-  and do some more reading.
-
-  1. Getting Samba: ``Download Instructions''
-
-  2. Installing Samba: making sure the binaries are in place and work.
-     At the moment there are two kinds of Samba server installs: Unix or
-     close relative <INSTALL.txt> and Others <Samba-Server-
-     FAQ.html#PortInfo>. Do not forget to
-
-  3. Debug sequence: If you think you have completed the previous step
-     and things aren't working properly work through the diagnosis
-     recipe. <DIAGNOSIS.txt>
-
-  4. Exporting files to SMB clients: You should read the manual pages
-     for smb.conf, but here is a quick answer guide. <Samba-Server-
-     FAQ.html#Exporting>
-
-  5. Controlling user access: the quickest and dirtiest way of sharing
-     resources is to use ``share level security.'' If you want to spend
-     more time and have a proper username and password database you must
-     read the paragraph on ``domain mode security.'' If you want
-     encryption (eg you are using Windows NT clients) follow the SMB
-     encryption instructions. <Samba-Server-FAQ.html#SMBEncryptionSteps>
-  6. Browsing: if you are happy to type in "\samba-serverrename" at the
-     client end then do not read any further. Otherwise you need to
-     understand the ``browsing terminoligy'' and read  <BROWSING.txt>.
-
-  7. Printing: See the printing quick answer guide. <Samba-Server-
-     FAQ.html#Printing>
+  documents in the order given. This should be enough to get a fairly
+  simple site going quickly. If you have any problems, refer back to
+  this meta-FAQ and follow the links to find more reading material.
+
+
+
+     GGeettttiinngg SSaammbbaa::
+        The fastest way to get Samba going is and install it is to have
+        an operating system for which the Samba team has put together an
+        installation package. To see if your OS is included have a look
+        at the directory /pub/samba/Binary_Packages/"OS_Vendor" on your
+        nearest mirror site <../MIRRORS>. If it is included follow the
+        installation instructions in the README file there and then do
+        some ``basic testing''. If you are not so fortunate, follow the
+        normal ``download instructions'' and then continue with
+        ``building and installing Samba''.
+
+
+     BBuuiillddiinngg aanndd IInnssttaalllliinngg SSaammbbaa::
+        At the moment there are two kinds of Samba server installs
+        besides the prepackaged binaries mentioned in the previous step.
+        You need to decide if you have a Unix or close relative
+        <../UNIX_INSTALL.txt> or other supported operating system
+        <Samba-Server-FAQ.html#PortInfo>.
+
+
+     BBaassiicc TTeessttiinngg::
+        Try to connect using the supplied smbclient command-line
+        program. You need to know the IP hostname of your server. A
+        service name must be defined in smb.conf, as given in the
+        examples (under many operating systems if there is a homes
+        service you can just use a valid username.) Then type smbclient
+        \hostnamevicename Under most Unixes you will need to put the
+        parameters within quotation marks. If this works, try connecting
+        from one of the SMB clients you were planning to use with Samba.
+
+
+     DDeebbuugg sseeqquueennccee::
+        If you think you have completed the previous step and things
+        aren't working properly work through the diagnosis recipe.
+        <../DIAGNOSIS.txt>
+
+
+     EExxppoorrttiinngg ffiilleess ttoo SSMMBB cclliieennttss::
+        You should read the manual pages for smb.conf, but here is a
+        quick answer guide. <Samba-Server-FAQ.html#Exporting>
+
+
+     CCoonnttrroolllliinngg uusseerr aacccceessss::
+        the quickest and dirtiest way of sharing resources is to use
+        ``share level security.'' If you want to spend more time and
+        have a proper username and password database you must read the
+        paragraph on ``domain mode security.'' If you want encryption
+        (eg you are using Windows NT clients) follow the SMB encryption
+        instructions. <Samba-Server-FAQ.html#SMBEncryptionSteps>
+
+
+     BBrroowwssiinngg::
+        if you are happy to type in "\samba-serverrename" at the client
+        end then do not read any further. Otherwise you need to
+        understand the ``browsing terminology'' and read  <Samba-Server-
+        FAQ.html#NameBrowsing>.
+
+
+     PPrriinnttiinngg::
+        See the printing quick answer guide. <Samba-Server-
+        FAQ.html#Printing>
+
 
   If you have got everything working to this point, you can expect Samba
   to be stable and secure: these are its greatest strengths. However
@@ -138,8 +175,11 @@
   so on are all covered either in this document or in those it refers
   to.
 
+
   11..22..  AAllll SSaammbbaa DDooccuummeennttaattiioonn
 
+
+
   +o  Meta-FAQ. This is the mother of all documents, and is the one you
      are reading now. The latest version is always at
      <http://samba.anu.edu.au/[.....]> but there is probably a much
@@ -151,27 +191,31 @@
      from...)
 
   +o  <Samba-Client-FAQ.html> is the best starting point for information
-     about client-side issues, includes a list of all clients that work
-     with Samba.
+     about client-side issues, includes a list of all clients that are
+     known to work with Samba.
 
-  +o  <samba-man-index.html> contains descriptions of and links to all
-     the Samba manual pages, in Unix man and postscript format.
+  +o  manual pages <samba-man-index.html> contains descriptions of and
+     links to all the Samba manual pages, in Unix man and postscript
+     format.
 
   +o  <samba-txt-index.html> has descriptions of and links to a large
      number of text files have been contributed to samba covering many
-     topics. These are gradually being absorbed into the FAQs and HOWTOS
+     topics. These are gradually being absorbed into the FAQs and HOWTOs
      but in the meantime you might find helpful answers here.
 
   +o
 
+
   22..  GGeenneerraall IInnffoorrmmaattiioonn
 
+
   All about Samba - what it is, how to get it, related sources of
-  information, how to understand the version numbering scheme, pizza
-  details
+  information, how to understand the numbering scheme, pizza details.
+
 
   22..11..  WWhhaatt iiss SSaammbbaa??
 
+
   Samba is a suite of programs which work together to allow clients to
   access to a server's filespace and printers via the SMB (Server
   Message Block) and CIFS (Common Internet Filesystem) protocols.
@@ -181,6 +225,7 @@
   behave much like a LAN Server, Windows NT Server or Pathworks machine,
   only with added functionality and flexibility designed to make life
   easier for administrators.
+
   This means that using Samba you can share a server's disks and
   printers to many sorts of network clients, including Lan Manager,
   Windows for Workgroups, Windows NT, Linux, OS/2, and AIX. There is
@@ -188,6 +233,10 @@
   which gives a user on the server an ftp-like interface to access
   filespace and printers on any other SMB/CIFS servers.
 
+  SMB has been implemented over many protocols, including XNS, NBT, IPX,
+  NetBEUI and TCP/IP. Samba only uses TCP/IP. This is not likely to
+  change although there have been some requests for NetBEUI support.
+
   Many users report that compared to other SMB implementations Samba is
   more stable, faster, and compatible with more clients. Administrators
   of some large installations say that Samba is the only SMB server
@@ -206,16 +255,19 @@
   versions incorporate much effort by many net.helpers. The man pages
   and this FAQ were originally written by Karl Auer.
 
+
   22..22..  WWhhaatt iiss tthhee ccuurrrreenntt vveerrssiioonn ooff SSaammbbaa??
 
+
   At time of writing, the current version was 1.9.17. If you want to be
   sure check the bottom of the change-log file.
   <ftp://samba.anu.edu.au/pub/samba/alpha/change-log>
-
   For more information see ``What do the version numbers mean?''
 
+
   22..33..  WWhheerree ccaann II ggeett iitt??
 
+
   The Samba suite is available via anonymous ftp from samba.anu.edu.au
   and many mirror <../MIRRORS> sites. You will get much faster
   performance if you use a mirror site. The latest and greatest versions
@@ -235,8 +287,18 @@
   binaries for that platform. The VMS, OS/2, Netware and Amiga and other
   ports typically have binaries made available.
 
+  A special case is vendor-provided binary packages. Samba binaries and
+  default configuration files are put into packages for a specific
+  operating system. RedHat Linux and Sun Solaris (Sparc and x86) is
+  already included, and others such as OS/2 may follow. All packages are
+  in the directory:
+
+  /pub/samba/Binary_Packages/"OS_Vendor"
+
+
   22..44..  WWhhaatt ddoo tthhee vveerrssiioonn nnuummbbeerrss mmeeaann??
 
+
   It is not recommended that you run a version of Samba with the word
   "alpha" in its name unless you know what you are doing and are willing
   to do some debugging. Many, many people just get the latest
@@ -248,6 +310,7 @@
 
   How the scheme works:
 
+
   1. When major changes are made the version number is increased. For
      example, the transition from 1.9.16 to 1.9.17. However, this
      version number will not appear immediately and people should
@@ -269,6 +332,7 @@
 
   So the progression goes:
 
+
                   1.9.16p10       (production)
                   1.9.16p11       (production)
                   1.9.17alpha1    (test sites only)
@@ -277,24 +341,30 @@
                   1.9.17          (production)
                   1.9.17p1        (production)
 
+
+
   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.
 
+
   22..55..  WWhheerree ccaann II ggoo ffoorr ffuurrtthheerr iinnffoorrmmaattiioonn??
 
+
   There are a number of places to look for more information on Samba,
   including:
 
+
   +o  Two mailing lists devoted to discussion of Samba-related matters.
      See below for subscription information.
 
   +o  The newsgroup comp.protocols.smb, which has a great deal of
      discussion about Samba.
 
-  +o  The WWW site 'SAMBA Web Pages' at
-     <http://samba.canberra.edu.au/pub/samba/samba.html> includes:
+  +o  The WWW site 'SAMBA Web Pages' at  <http://samba.anu.edu.au/samba/>
+     includes:
+
 
   +o  Links to man pages and documentation, including this FAQ
 
@@ -306,14 +376,22 @@
 
   +o  This FAQ and the rest in its family
 
+
+
   22..66..  HHooww ddoo II ssuubbssccrriibbee ttoo tthhee SSaammbbaa MMaaiilliinngg LLiissttss??
 
+
   Send email to 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
 
+
+
+
   Obviously you should substitute YOUR first name for "Firstname" and
   YOUR last name for "Lastname"! Try not to send any signature, it
   sometimes confuses the list processor.
@@ -327,20 +405,29 @@
   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
 
+
+
+
   The FFrroomm:: line in your message _M_U_S_T be the same address you used when
   you subscribed.
 
+
   22..77..  SSoommeetthhiinngg''ss ggoonnee wwrroonngg -- wwhhaatt sshhoouulldd II ddoo??
 
+
   ## ****** IIMMPPOORRTTAANNTT!! ****** ##
 
+
   DO NOT post messages on mailing lists or in newsgroups until you have
   carried out the first three steps given here!
 
-  1. See if there are any likely looking entries in this FAQ! If you
+
+  1. 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 <ftp://samba.anu.edu.au/pub/samba/DIAGNOSIS.txt>? It
      can save you a lot of time and effort.  DIAGNOSIS.txt can also be
@@ -370,8 +457,12 @@
   succinct description of the symptom, the problem and the solution, so
   that an explanation can be incorporated into the next version.
 
+
+
+
   22..88..  HHooww ddoo II ssuubbmmiitt ppaattcchheess oorr bbuugg rreeppoorrttss??
 
+
   If you make changes to the source code, _p_l_e_a_s_e 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
@@ -412,6 +503,7 @@
 
   Some extras :
 
+
   +o  what you did and what happened
 
   +o  relevant parts of a debugging output file with debuglevel higher.
@@ -420,8 +512,10 @@
 
   +o  anything else you think is useful to trace down the bug
 
+
   22..99..  WWhhaatt iiff II hhaavvee aann UURRGGEENNTT mmeessssaaggee ffoorr tthhee ddeevveellooppeerrss??
 
+
   If you have spotted something very serious and believe that it is
   important to contact the developers quickly send a message to samba-
   urgent@samba.anu.edu.au. This will be processed more quickly than mail
@@ -434,21 +528,25 @@
 
   22..1100..  WWhhaatt iiff II nneeeedd ppaaiidd--ffoorr ssuuppppoorrtt??
 
+
   Samba has a large network of consultants who provide Samba support on
   a commercial basis. The list is included in the package in
-  Support.txt, and the latest version will always be on the main samba
-  ftp site.  Any company in the world can request that the samba team
-  include their details in Support.txt so we can give no guarantee of
-  their services.
+  <../Support.txt>, and the latest version will always be on the main
+  samba ftp site. Any company in the world can request that the samba
+  team include their details in Support.txt so we can give no guarantee
+  of their services.
+
 
   22..1111..  PPiizzzzaa ssuuppppllyy ddeettaaiillss
 
+
   Those who have registered in the Samba survey as "Pizza Factory" will
   already know this, but the rest may need some help. Andrew doesn't ask
   for payment, but he does appreciate it when people give him pizza.
   This calls for a little organisation when the pizza donor is twenty
   thousand kilometres away, but it has been done.
 
+
   1. Ring up your local branch of an international pizza chain and see
      if they honour their vouchers internationally. Pizza Hut do, which
      is how the entire Canberra Linux Users Group got to eat pizza one
@@ -468,7 +566,10 @@
      will probably get stuck in customs or torn apart by hungry sniffer
      dogs but it will have been a noble gesture.
 
-  33..  AAbboouutt CCIIFFSS aanndd SSMMBB
+
+  33..  AAbboouutt tthhee CCIIFFSS aanndd SSMMBB PPrroottooccoollss
+
+
 
   33..11..  WWhhaatt iiss tthhee SSeerrvveerr MMeessssaaggee BBlloocckk ((SSMMBB)) PPrroottooccooll??
 
@@ -493,6 +594,7 @@
   implement more and more of these protocols. Samba began to take a
   significant share of the SMB server market.
 
+
   33..22..  WWhhaatt iiss tthhee CCoommmmoonn IInntteerrnneett FFiilleessyysstteemm ((CCIIFFSS))??
 
   The initial pressure for Microsoft to document their current SMB
@@ -516,6 +618,7 @@
 
   The following is taken from  <http://www.microsoft.com/intdev/cifs/>
 
+
       CIFS defines a standard remote file system access protocol for use
       over the Internet, enabling groups of users to work together and
       share documents across the Internet or within their corporate
@@ -526,6 +629,8 @@
       users can open and share remote files on the Internet without having
       to install new software or change the way they work."
 
+
+
   If you consider CIFS as a backwardsly-compatible refinement of SMB
   that will work reasonably efficiently over the Internet you won't be
   too far wrong.
@@ -537,6 +642,7 @@
   reason why a site shouldn't conduct all its file and printer sharing
   with CIFS and yet have no Microsoft products at all.
 
+
   33..33..  WWhhaatt iiss BBrroowwssiinngg??
 
   The term "Browsing" causes a lot of confusion. It is the part of the
@@ -549,11 +655,16 @@
   subject for debate. Look at the CIFS list archives to see what the
   experts think.
 
+
+
+
   44..  DDeessiiggnniinngg AA SSMMBB aanndd CCIIFFSS NNeettwwoorrkk
 
+
   The big issues for installing any network of LAN or WAN file and print
   servers are
 
+
   +o  How and where usernames, passwords and other security information
      is stored
 
@@ -562,6 +673,7 @@
 
   +o  What protocols the clients can converse with
 
+
   If you buy Netware, Windows NT or just about any other LAN fileserver
   product you are expected to lock yourself into the product's preferred
   answers to these questions. This tendancy is restrictive and often
@@ -573,65 +685,103 @@
   administators, which means allowing as many combinations of clients,
   servers, operating systems and protocols as possible.
 
-  44..11..  WWoorrkkggrroouuppss,, BBrroowwssiinngg DDoommaaiinnss aanndd AAuutthheennttiiccaattiioonn DDoommaaiinnss
 
-  The concepts of a Workgroup and a Domain are fundamental to SMB
-  networking. Although Microsoft integrates Workgroups and Domains
-  tightly with their authentication procedures there is no reason why
-  this has to be so in an SMB network. Groups of SMB machines can work
-  together just as well with Unix or OS/2 Samba servers as they can with
-  Windows NT servers, even though the password storage and access
-  methods are totally different.
+  44..11..  WWoorrkkggrroouuppss,, DDoommaaiinnss,, AAuutthheennttiiccaattiioonn aanndd BBrroowwssiinngg
+
+
+  From the point of view of networking implementation, Domains and
+  Workgroups are _e_x_a_c_t_l_y the same, except for the client logon sequence.
+  Some kind of distributed authentication database is associated with a
+  domain (there are quite a few choices) and this adds so much
+  flexibility that many people think of a domain as a completely
+  different entity to a workgroup. From Samba's point of view a client
+  connecting to a service presents an authentication token, and it if it
+  is valid they have access. Samba does not care what mechanism was used
+  to generate that token in the first place.
+
+  The SMB client logging on to a domain has an expectation that every
+  other server in the domain should accept the same authentication
+  information.  However the network browsing functionality of domains
+  and workgroups is identical and is explained in  <../BROWSING.txt>.
+
+  There are some implementation differences: Windows 95 can be a member
+  of both a workgroup and a domain, but Windows NT cannot. Windows 95
+  also has the concept of an "alternative workgroup". Samba can only be
+  a member of a single workgroup or domain, although this is due to
+  change with a future version when nmbd will be split into two daemons,
+  one for WINS and the other for browsing ( <../NetBIOS.txt> explains
+  what WINS is.)
+
 
   44..11..11..  DDeeffiinniinngg tthhee TTeerrmmss
 
-  A Workgroup (or Browsing Domain) is collection of machines that
-  maintain a common database contianing information about their shared
-  resources.  They do not necessarily have any security information in
-  common. The database is dynamic, modified as servers come and go on
-  the network and as resources are added or deleted. The term "browsing"
-  refers to a user accessing the database via whatever interface the
-  client provides. SMB servers agree between themselves as to which ones
-  will maintain the browsing database. Workgroups can be anywhere on a
-  connected TCP/IP network, including on different subnets or anywhere
-  on the Interet. This is a very tricky part of SMB to implement.
 
-  Due to the convoluted history of SMB there is now conflicting
-  terminology describing Domains and Workgroups. "Domain" is used in the
-  browsing specifications to define that group of servers and clients
-  who share a common name and a common browsing database. The following
-  are used exclusively in the context of Workgroup browsing:
 
-  +o  Domain Master Browser
 
-  +o  Local Master Browser
+     WWoorrkkggrroouupp
+        means a collection of machines that maintain a common browsing
+        database containing information about their shared resources.
+        They do not necessarily have any security information in common
+        (if they do, it gets called a Domain.) The browsing database is
+        dynamic, modified as servers come and go on the network and as
+        resources are added or deleted. The term "browsing" refers to a
+        user accessing the database via whatever interface the client
+        provides, eg the OS/2 Workplace Shell or Windows 95 Explorer.
+        SMB servers agree between themselves as to which ones will
+        maintain the browsing database. Workgroups can be anywhere on a
+        connected TCP/IP network, including on different subnets or even
+        on the Interet. This is a very tricky part of SMB to implement.
+
 
-  Alternative terms include confusing variations such as "Browse
-  Master", and "Master Browser" which we are trying to eliminate from
-  the Samba documentation. We are moving to the use of "Browsing Domain"
-  wherever the word "Domain" occurs in a workgroup context. Ideally
-  "Workgroup" would also be replaced by Browsing Domain but it is very
-  widely used terminology.
+     MMaasstteerr BBrroowwsseerrss
+        are machines which holds the master browsing database for a
+        workgroup or domain. There are two kinds of Master Browser:
 
-  Unfortunately the group of machines which use the the Microsoft method
-  of sharing authentication information (but not any of the many other
-  methods) is also called a Domain. As explained elsewhere Microsoft are
-  not making this protocol public and The following are used exclusively
-  in the context of Microsoft Authentication domains:
 
-  +o  Primary Domain Controller
+     +o  Domain Master Browser, which holds the master browsing
+        information for an entire domain, which may well cross multiple
+        TCP/IP subnets.
 
-  +o  Backup Domain Controller
+     +o  Local Master Browser, which holds the master browsing database
+        for a particular subnet and communicates with the Domain Master
+        Browser to get information on other subnets.
+
+        Subnets are differentiated because browsing is based on
+        broadcasts, and broadcasts do not pass through routers. Subnets
+        are not routed: while it is possible to have more than one
+        subnet on a single network segment this is regarded as very bad
+        practice.
+
+        Master Browsers (both Domain and Local) are elected dynamically
+        according to an algorithm which is supposed to take into account
+        the machine's ability to sustain the browsing load. Samba can be
+        configured to always act as a master browser, ie it always wins
+        elections under all circumstances, even against systems such as
+        a Windows NT Primary Domain Controller which themselves expect
+        to win.
+
+        There are also Backup Browsers which are promoted to Master
+        Browsers in the event of a Master Browser disappearing from the
+        network.
+
+        Alternative terms include confusing variations such as "Browse
+        Master", and "Master Browser" which we are trying to eliminate
+        from the Samba documentation.
+
+
+     DDoommaaiinn CCoonnttrroolllleerr
+        is a term which comes from the Microsoft and IBM etc
+        implementation of the LAN Manager protocols. It is tied to
+        authentication. There are other ways of doing domain
+        authentication, but the Windows NT method has a large market
+        share. The general issues are discussed in  <../DOMAIN.txt> and
+        a Windows NT-specific discussion is in  <../DOMAIN_CONTROL.txt>.
 
-  +o  Domain Logon
 
-  These terms can be very confusing, and so in the Samba documentation
-  we are moving to the term "Authentication Domain" wherever Domain is
-  used in this sense. As a final touch of irony, all Authentication
-  Domains are also Browsing Domains.
 
   44..11..22..  SShhaarreelleevveell ((WWoorrkkggrroouupp)) SSeeccuurriittyy SSeerrvviicceess
 
+
   With the Samba setting "security = SHARE", all shared resources
   information about what password is associated with them but only hints
   as to what usernames might be valid (the hint can be 'all users', in
@@ -643,16 +793,20 @@
   authentication infrastructure present or requiring them to do more
   than fill in a dialogue box.
 
+
   44..11..33..  AAuutthheennttiiccaattiioonn DDoommaaiinn MMooddee SSeerrvviicceess
 
+
   With the Samba settings "security = USER" or "security = SERVER"
   accesses to all resources are checked for username/password pair
-  matches in a more rigorous manner. This has the effect of emulating a
-  Microsoft Authentication Domain. Whether or not an Authentication
-  Domain is involved depends on how the network has been designed.
+  matches in a more rigorous manner. To the client, this has the effect
+  of emulating a Microsoft Domain. The client is not concerned whether
+  or not Samba looks up a Windows NT SAM or does it in some other way.
+
 
   44..22..  AAuutthheennttiiccaattiioonn SScchheemmeess
 
+
   In the simple case authentication information is stored on a single
   server and the user types a password on connecting for the first time.
   However client operating systems often require a password before they
@@ -661,7 +815,8 @@
   different contexts just does not work. Some kind of distributed
   authentication database is needed. It must cope with password changes
   and provide for assigning groups of users the same level of access
-  permissions.
+  permissions. This is why Samba installations often choose to implement
+  a Domain model straight away.
 
   Authentication decisions are some of the biggest in designing a
   network.  Are you going to use a scheme native to the client operating
@@ -671,29 +826,49 @@
   setups would be appreciated. refer to server FAQ for "passwd chat"
   passwd program password server etc etc...
 
-  44..22..11..  WWoorrkkggrroouupp MMooddee SSeerrvviicceess
 
-  etc etc
+  44..22..11..  NNIISS
+
+
+  For Windows 95, Windows for Workgroups and most other clients Samba
+  can be a domain controller and share the password database via NIS
+  transparently. Windows NT is different.  Free NIS NT client
+  <http://www.dcs.qmw.ac.uk/~williams>
+
+
+  44..22..22..  KKeerrbbeerrooss
+
+
+  Kerberos for US users only: Kerberos overview
+  <http://www.cygnus.com/product/unifying-security.html> Download
+  Kerberos <http://www.cygnus.com/product/kerbnet-download.html>
+
+
+  44..22..33..  FFTTPP
 
-  44..22..22..  WWiinnddoowwss NNTT--SSttyyllee DDoommaaiinn
 
-  Samba compiled with libdes - enabling encrypted passwords security =
-  server
+  Other NT w/s logon hack via NT
 
-  44..22..33..  NNIISS
 
-  44..22..44..  KKeerrbbeerrooss
+  44..22..44..  DDeeffaauulltt SSeerrvveerr MMeetthhoodd
 
-  44..22..55..  FFTTPP
 
-  44..22..66..  DDeeffaauulltt SSeerrvveerr MMeetthhoodd
 
-  44..22..77..  CClliieenntt--ssiiddee DDaattaabbaassee OOnnllyy
+
+
+  44..22..55..  CClliieenntt--ssiiddee DDaattaabbaassee OOnnllyy
+
+
 
   44..33..  PPoosstt--AAuutthheennttiiccaattiioonn:: NNeettllooggoonn,, LLooggoonn SSccrriippttss,, PPrrooffiilleess
 
+
+  See  <../DOMAIN.txt>
+
+
   55..  CCrroossss--PPrroottooccooll FFiillee SShhaarriinngg
 
+
   Samba is an important tool for...
 
   It is possible to...
@@ -710,10 +885,40 @@
   packages, Samba, and Linux (and other UNIX-based systems) see
   <http://www.eats.com/linux_mac_win.html> 3.5) Sniffing your nework
 
+
+
   66..  MMiisscceellllaanneeoouuss
 
+
   66..11..  IIss SSaammbbaa YYeeaarr 22000000 ccoommpplliiaanntt??
 
+
   The CIFS protocol that Samba implements negotiates times in various
   formats, all of which are able to cope with dates beyond 2000.
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/faq/sambafaq-1.html b/docs/faq/sambafaq-1.html
index 4b9e589e84..c010e50e01 100644
--- a/docs/faq/sambafaq-1.html
+++ b/docs/faq/sambafaq-1.html
@@ -197,7 +197,7 @@ There are a number of places to look for more information on Samba, including:
 <LI>Two mailing lists devoted to discussion of Samba-related matters.  </LI>
 <LI>The newsgroup, comp.protocols.smb, which has a great deal of discussion on Samba. </LI>
 <LI>The WWW site 'SAMBA Web Pages' at 
-<A HREF="http://samba.canberra.edu.au/pub/samba/samba.html">http://samba.canberra.edu.au/pub/samba/samba.html</A> includes:
+<A HREF="http://samba.edu.au/samba/">http://samba.edu.au/samba/</A> includes:
 <UL>
 <LI>Links to man pages and documentation, including this FAQ</LI>
 <LI>A comprehensive survey of Samba users.</LI>
diff --git a/docs/faq/sambafaq-3.html b/docs/faq/sambafaq-3.html
index 8b24de54f2..1b5dcf4d9a 100644
--- a/docs/faq/sambafaq-3.html
+++ b/docs/faq/sambafaq-3.html
@@ -76,7 +76,7 @@ To syncronize your PC's clock with your Samba server:
 <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>
+<A HREF="http://samba.anu.edu.au/samba/binaries/miscellaneous/timesync.pif">http://samba.anu.edu.au/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>
diff --git a/docs/faq/sambafaq.sgml b/docs/faq/sambafaq.sgml
index 951ad822ed..d306881b56 100644
--- a/docs/faq/sambafaq.sgml
+++ b/docs/faq/sambafaq.sgml
@@ -9,15 +9,17 @@
        9 June 1997 Paul
         Lots of changes, added doco list, updated compatible systems list
         added NT SP3 entry, added Year 2000 entry, Getting ready for 1.9.17
+ v 0.8 7th Oct 97 Paul
+        changed samba.canberra entries to samba.anu.../samba/
 -->
 
 <article>
 
 <title> Samba FAQ
 
-<author>Paul Blackman, <tt>ictinus@lake.canberra.edu.au</tt>
+<author>Paul Blackman, <tt>ictinus@samba.anu.edu.au</tt>
 
-<date>v 0.7, June '97
+<date>v 0.8, June '97
 
 <abstract> This is the Frequently Asked Questions (FAQ) document for
 Samba, the free and very popular SMB server product. An SMB server
@@ -191,7 +193,7 @@ There are a number of places to look for more information on Samba, including:
 <itemize>
 <item>Two mailing lists devoted to discussion of Samba-related matters.  
 <item>The newsgroup, comp.protocols.smb, which has a great deal of discussion on Samba. 
-<item>The WWW site 'SAMBA Web Pages' at <url url="http://samba.canberra.edu.au/pub/samba/samba.html"> includes:
+<item>The WWW site 'SAMBA Web Pages' at <url url="http://samba.edu.au/samba/"> includes:
   <itemize>
     <item>Links to man pages and documentation, including this FAQ
     <item>A comprehensive survey of Samba users.
@@ -562,7 +564,8 @@ 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:
-    <url url="http://samba.canberra.edu.au/pub/samba/binaries/miscellaneous/timesync.pif">
+    <url 
+url="http://samba.anu.edu.au/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'
diff --git a/docs/faq/sambafaq.txt b/docs/faq/sambafaq.txt
index e7f5f32a20..49cfa479fe 100644
--- a/docs/faq/sambafaq.txt
+++ b/docs/faq/sambafaq.txt
@@ -92,7 +92,7 @@
   5.1.    Is Samba Year 2000 compliant?
   ______________________________________________________________________
 
-  1.  General Information
+  11..  GGeenneerraall IInnffoorrmmaattiioonn
 
 
 
@@ -101,7 +101,7 @@
   details
 
 
-  1.1.  What is Samba?
+  11..11..  WWhhaatt iiss SSaammbbaa??
 
 
   Samba is a suite of programs which work together to allow clients to
@@ -122,30 +122,30 @@
   The components of the suite are (in summary):
 
 
-  o  smbd, the SMB server. This handles actual connections from clients,
+  +o  ssmmbbdd, the SMB server. This handles actual connections from clients,
      doing all the file, permission and username work
 
-  o  nmbd, the Netbios name server, which helps clients locate servers,
+  +o  nnmmbbdd, the Netbios name server, which helps clients locate servers,
      doing the browsing work and managing domains as this capability is
      being built into Samba
 
 
-  o  smbclient, the Unix-hosted client program
+  +o  ssmmbbcclliieenntt, the Unix-hosted client program
 
-  o  smbrun, a little 'glue' program to help the server run external
+  +o  ssmmbbrruunn, a little 'glue' program to help the server run external
      programs
 
-  o  testprns, a program to test server access to printers
+  +o  tteessttpprrnnss, a program to test server access to printers
 
-  o  testparms, a program to test the Samba configuration file for
+  +o  tteessttppaarrmmss, a program to test the Samba configuration file for
      correctness
 
-  o  smb.conf, the Samba configuration file
+  +o  ssmmbb..ccoonnff, the Samba configuration file
 
-  o  smbprint, a sample script to allow a Unix host to use smbclient to
+  +o  ssmmbbpprriinntt, a sample script to allow a Unix host to use smbclient to
      print to an SMB server
 
-  o  Documentation! DON'T neglect to read it - you will save a great
+  +o  DDooccuummeennttaattiioonn!! DON'T neglect to read it - you will save a great
      deal of time!
 
   The suite is supplied with full source (of course!) and is GPLed.
@@ -155,7 +155,7 @@
   and this FAQ were originally written by Karl Auer.
 
 
-  1.2.  What is the current version of Samba?
+  11..22..  WWhhaatt iiss tthhee ccuurrrreenntt vveerrssiioonn ooff SSaammbbaa??
 
 
   At time of writing, the current version was 1.9.17. If you want to be
@@ -165,7 +165,7 @@
   For more information see ``What do the version numbers mean?''
 
 
-  1.3.  Where can I get it?
+  11..33..  WWhheerree ccaann II ggeett iitt??
 
 
   The Samba suite is available via anonymous ftp from samba.anu.edu.au.
@@ -185,7 +185,7 @@
   do contain Samba binaries for that platform.
 
 
-  1.4.  What do the version numbers mean?
+  11..44..  WWhhaatt ddoo tthhee vveerrssiioonn nnuummbbeerrss mmeeaann??
 
 
   It is not recommended that you run a version of Samba with the word
@@ -234,7 +234,7 @@
   sion.
 
 
-  1.5.  What platforms are supported?
+  11..55..  WWhhaatt ppllaattffoorrmmss aarree ssuuppppoorrtteedd??
 
 
   Many different platforms have run Samba successfully. The platforms
@@ -242,188 +242,188 @@
 
   At time of writing, the Makefile claimed support for:
 
-  o  A/UX 3.0
+  +o  A/UX 3.0
 
-  o  AIX
+  +o  AIX
 
-  o  Altos Series 386/1000
+  +o  Altos Series 386/1000
 
-  o  Amiga
+  +o  Amiga
 
-  o  Apollo Domain/OS sr10.3
+  +o  Apollo Domain/OS sr10.3
 
-  o  BSDI
+  +o  BSDI
 
-  o  B.O.S. (Bull Operating System)
+  +o  B.O.S. (Bull Operating System)
 
-  o  Cray, Unicos 8.0
+  +o  Cray, Unicos 8.0
 
-  o  Convex
+  +o  Convex
 
-  o  DGUX.
+  +o  DGUX.
 
-  o  DNIX.
+  +o  DNIX.
 
-  o  FreeBSD
+  +o  FreeBSD
 
-  o  HP-UX
+  +o  HP-UX
 
-  o  Intergraph.
+  +o  Intergraph.
 
-  o  Linux with/without shadow passwords and quota
+  +o  Linux with/without shadow passwords and quota
 
-  o  LYNX 2.3.0
+  +o  LYNX 2.3.0
 
-  o  MachTen (a unix like system for Macintoshes)
+  +o  MachTen (a unix like system for Macintoshes)
 
-  o  Motorola 88xxx/9xx range of machines
+  +o  Motorola 88xxx/9xx range of machines
 
-  o  NetBSD
+  +o  NetBSD
 
-  o  NEXTSTEP Release 2.X, 3.0 and greater (including OPENSTEP for
+  +o  NEXTSTEP Release 2.X, 3.0 and greater (including OPENSTEP for
      Mach).
 
-  o  OS/2 using EMX 0.9b
+  +o  OS/2 using EMX 0.9b
 
-  o  OSF1
+  +o  OSF1
 
-  o  QNX 4.22
+  +o  QNX 4.22
 
-  o  RiscIX.
+  +o  RiscIX.
 
-  o  RISCOs 5.0B
+  +o  RISCOs 5.0B
 
-  o  SEQUENT.
+  +o  SEQUENT.
 
-  o  SCO (including: 3.2v2, European dist., OpenServer 5)
+  +o  SCO (including: 3.2v2, European dist., OpenServer 5)
 
-  o  SGI.
+  +o  SGI.
 
-  o  SMP_DC.OSx v1.1-94c079 on Pyramid S series
+  +o  SMP_DC.OSx v1.1-94c079 on Pyramid S series
 
-  o  SONY NEWS, NEWS-OS (4.2.x and 6.1.x)
+  +o  SONY NEWS, NEWS-OS (4.2.x and 6.1.x)
 
-  o  SUNOS 4
+  +o  SUNOS 4
 
-  o  SUNOS 5.2, 5.3, and 5.4 (Solaris 2.2, 2.3, and '2.4 and later')
+  +o  SUNOS 5.2, 5.3, and 5.4 (Solaris 2.2, 2.3, and '2.4 and later')
 
-  o  Sunsoft ISC SVR3V4
+  +o  Sunsoft ISC SVR3V4
 
-  o  SVR4
+  +o  SVR4
 
-  o  System V with some berkely extensions (Motorola 88k R32V3.2).
+  +o  System V with some berkely extensions (Motorola 88k R32V3.2).
 
-  o  ULTRIX.
+  +o  ULTRIX.
 
-  o  UNIXWARE
+  +o  UNIXWARE
 
-  o  UXP/DS
+  +o  UXP/DS
 
 
-  1.6.  How can I find out more about Samba?
+  11..66..  HHooww ccaann II ffiinndd oouutt mmoorree aabboouutt SSaammbbaa??
 
 
   There are a number of places to look for more information on Samba,
   including:
 
-  o  Two mailing lists devoted to discussion of Samba-related matters.
+  +o  Two mailing lists devoted to discussion of Samba-related matters.
 
-  o  The newsgroup, comp.protocols.smb, which has a great deal of
+  +o  The newsgroup, comp.protocols.smb, which has a great deal of
      discussion on Samba.
 
-  o  The WWW site 'SAMBA Web Pages' at
-     <http://samba.canberra.edu.au/pub/samba/samba.html> includes:
+  +o  The WWW site 'SAMBA Web Pages' at  <http://samba.edu.au/samba/>
+     includes:
 
-  o  Links to man pages and documentation, including this FAQ
+  +o  Links to man pages and documentation, including this FAQ
 
-  o  A comprehensive survey of Samba users.
+  +o  A comprehensive survey of Samba users.
 
-  o  A searchable hypertext archive of the Samba mailing list.
+  +o  A searchable hypertext archive of the Samba mailing list.
 
-  o  Links to Samba source code, binaries, and mirrors of both.
+  +o  Links to Samba source code, binaries, and mirrors of both.
 
-  o  The long list of topic documentation.  These files can be found in
+  +o  The long list of topic documentation.  These files can be found in
      the 'docs' directory of the Samba source, or at
      <ftp://samba.anu.edu.au/pub/samba/docs/>
 
-  o  Application_Serving.txt
+  +o  Application_Serving.txt
      <ftp://samba.anu.edu.au/pub/samba/docs/Application_Serving.txt>
 
-  o  BROWSING.txt <ftp://samba.anu.edu.au/pub/samba/docs/BROWSING.txt>
+  +o  BROWSING.txt <ftp://samba.anu.edu.au/pub/samba/docs/BROWSING.txt>
 
-  o  BUGS.txt <ftp://samba.anu.edu.au/pub/samba/docs/BUGS.txt>
+  +o  BUGS.txt <ftp://samba.anu.edu.au/pub/samba/docs/BUGS.txt>
 
-  o  DIAGNOSIS.txt <ftp://samba.anu.edu.au/pub/samba/docs/DIAGNOSIS.txt>
+  +o  DIAGNOSIS.txt <ftp://samba.anu.edu.au/pub/samba/docs/DIAGNOSIS.txt>
 
-  o  DNIX.txt <ftp://samba.anu.edu.au/pub/samba/docs/DNIX.txt>
+  +o  DNIX.txt <ftp://samba.anu.edu.au/pub/samba/docs/DNIX.txt>
 
-  o  DOMAIN.txt <ftp://samba.anu.edu.au/pub/samba/docs/DOMAIN.txt>
+  +o  DOMAIN.txt <ftp://samba.anu.edu.au/pub/samba/docs/DOMAIN.txt>
 
-  o  CONTROL.txt
+  +o  CONTROL.txt
      <ftp://samba.anu.edu.au/pub/samba/docs/DOMAIN_CONTROL.txt>
 
-  o  ENCRYPTION.txt
+  +o  ENCRYPTION.txt
      <ftp://samba.anu.edu.au/pub/samba/docs/ENCRYPTION.txt>
 
-  o  Faxing.txt <ftp://samba.anu.edu.au/pub/samba/docs/Faxing.txt>
+  +o  Faxing.txt <ftp://samba.anu.edu.au/pub/samba/docs/Faxing.txt>
 
-  o  GOTCHAS.txt <ftp://samba.anu.edu.au/pub/samba/docs/GOTCHAS.txt>
+  +o  GOTCHAS.txt <ftp://samba.anu.edu.au/pub/samba/docs/GOTCHAS.txt>
 
-  o  HINTS.txt <ftp://samba.anu.edu.au/pub/samba/docs/HINTS.txt>
+  +o  HINTS.txt <ftp://samba.anu.edu.au/pub/samba/docs/HINTS.txt>
 
-  o  INSTALL.sambatar
+  +o  INSTALL.sambatar
      <ftp://samba.anu.edu.au/pub/samba/docs/INSTALL.sambatar>
 
-  o  INSTALL.txt <ftp://samba.anu.edu.au/pub/samba/docs/INSTALL.txt>
+  +o  INSTALL.txt <ftp://samba.anu.edu.au/pub/samba/docs/INSTALL.txt>
 
-  o  MIRRORS <ftp://samba.anu.edu.au/pub/samba/docs/MIRRORS>
+  +o  MIRRORS <ftp://samba.anu.edu.au/pub/samba/docs/MIRRORS>
 
-  o  NetBIOS.txt <ftp://samba.anu.edu.au/pub/samba/docs/NetBIOS.txt>
+  +o  NetBIOS.txt <ftp://samba.anu.edu.au/pub/samba/docs/NetBIOS.txt>
 
-  o  OS2.txt <ftp://samba.anu.edu.au/pub/samba/docs/OS2.txt>
+  +o  OS2.txt <ftp://samba.anu.edu.au/pub/samba/docs/OS2.txt>
 
-  o  PROJECTS <ftp://samba.anu.edu.au/pub/samba/docs/PROJECTS>
+  +o  PROJECTS <ftp://samba.anu.edu.au/pub/samba/docs/PROJECTS>
 
-  o  Passwords.txt <ftp://samba.anu.edu.au/pub/samba/docs/Passwords.txt>
+  +o  Passwords.txt <ftp://samba.anu.edu.au/pub/samba/docs/Passwords.txt>
 
-  o  Printing.txt <ftp://samba.anu.edu.au/pub/samba/docs/Printing.txt>
+  +o  Printing.txt <ftp://samba.anu.edu.au/pub/samba/docs/Printing.txt>
 
-  o  README.DCEDFS <ftp://samba.anu.edu.au/pub/samba/docs/README.DCEDFS>
+  +o  README.DCEDFS <ftp://samba.anu.edu.au/pub/samba/docs/README.DCEDFS>
 
-  o  README.OS2 <ftp://samba.anu.edu.au/pub/samba/docs/README.OS2>
+  +o  README.OS2 <ftp://samba.anu.edu.au/pub/samba/docs/README.OS2>
 
-  o  README.jis <ftp://samba.anu.edu.au/pub/samba/docs/README.jis>
+  +o  README.jis <ftp://samba.anu.edu.au/pub/samba/docs/README.jis>
 
-  o  README.sambatar
+  +o  README.sambatar
      <ftp://samba.anu.edu.au/pub/samba/docs/README.sambatar>
 
-  o  SCO.txt <ftp://samba.anu.edu.au/pub/samba/docs/SCO.txt>
+  +o  SCO.txt <ftp://samba.anu.edu.au/pub/samba/docs/SCO.txt>
 
-  o  SMBTAR.notes <ftp://samba.anu.edu.au/pub/samba/docs/SMBTAR.notes>
+  +o  SMBTAR.notes <ftp://samba.anu.edu.au/pub/samba/docs/SMBTAR.notes>
 
-  o  Speed.txt <ftp://samba.anu.edu.au/pub/samba/docs/Speed.txt>
+  +o  Speed.txt <ftp://samba.anu.edu.au/pub/samba/docs/Speed.txt>
 
-  o  Support.txt <ftp://samba.anu.edu.au/pub/samba/docs/Support.txt>
+  +o  Support.txt <ftp://samba.anu.edu.au/pub/samba/docs/Support.txt>
 
-  o  THANKS <ftp://samba.anu.edu.au/pub/samba/docs/THANKS>
+  +o  THANKS <ftp://samba.anu.edu.au/pub/samba/docs/THANKS>
 
-  o  Tracing.txt <ftp://samba.anu.edu.au/pub/samba/docs/Tracing.txt>
+  +o  Tracing.txt <ftp://samba.anu.edu.au/pub/samba/docs/Tracing.txt>
 
-  o  SMB.txt <ftp://samba.anu.edu.au/pub/samba/docs/UNIX-SMB.txt>
+  +o  SMB.txt <ftp://samba.anu.edu.au/pub/samba/docs/UNIX-SMB.txt>
 
-  o  Warp.txt <ftp://samba.anu.edu.au/pub/samba/docs/Warp.txt>
+  +o  Warp.txt <ftp://samba.anu.edu.au/pub/samba/docs/Warp.txt>
 
-  o  WinNT.txt <ftp://samba.anu.edu.au/pub/samba/docs/WinNT.txt>
+  +o  WinNT.txt <ftp://samba.anu.edu.au/pub/samba/docs/WinNT.txt>
 
-  o  history <ftp://samba.anu.edu.au/pub/samba/docs/history>
+  +o  history <ftp://samba.anu.edu.au/pub/samba/docs/history>
 
-  o  level.txt
+  +o  level.txt
      <ftp://samba.anu.edu.au/pub/samba/docs/security_level.txt>
 
-  o  slip.htm <ftp://samba.anu.edu.au/pub/samba/docs/wfw_slip.htm>
+  +o  slip.htm <ftp://samba.anu.edu.au/pub/samba/docs/wfw_slip.htm>
 
 
-  1.7.  How do I subscribe to the Samba Mailing Lists?
+  11..77..  HHooww ddoo II ssuubbssccrriibbee ttoo tthhee SSaammbbaa MMaaiilliinngg LLiissttss??
 
 
   Send email to listproc@samba.anu.edu.au. Make sure the subject line is
@@ -456,14 +456,14 @@
 
 
 
-  The From: line in your message MUST be the same address you used when
+  The FFrroomm:: line in your message _M_U_S_T be the same address you used when
   you subscribed.
 
 
-  1.8.  Something's gone wrong - what should I do?
+  11..88..  SSoommeetthhiinngg''ss ggoonnee wwrroonngg -- wwhhaatt sshhoouulldd II ddoo??
 
 
-  # *** IMPORTANT! *** #
+  ## ****** IIMMPPOORRTTAANNTT!! ****** ##
 
   DO NOT post messages on mailing lists or in newsgroups until you have
   carried out the first three steps given here!
@@ -501,7 +501,7 @@
   Tridgell or any other individual, they may be lost if you do.
 
 
-  1.9.  Pizza supply details
+  11..99..  PPiizzzzaa ssuuppppllyy ddeettaaiillss
 
 
   Those who have registered in the Samba survey as "Pizza Factory" will
@@ -531,11 +531,11 @@
   hungry sniffer dogs but it will have been a noble gesture.
 
 
-  2.  Compiling and installing Samba on a Unix host
+  22..  CCoommppiilliinngg aanndd iinnssttaalllliinngg SSaammbbaa oonn aa UUnniixx hhoosstt
 
 
 
-  2.1.  I can't see the Samba server in any browse lists!
+  22..11..  II ccaann''tt sseeee tthhee SSaammbbaa sseerrvveerr iinn aannyy bbrroowwssee lliissttss!!
 
 
   See BROWSING.txt <ftp://samba.anu.edu.au/pub/samba/BROWSING.txt> for
@@ -557,14 +557,14 @@
   client to client - check your client's documentation.
 
 
-  2.2.  Some files that I KNOW are on the server doesn't show up when I
-  view the files from my client!
+  22..22..  SSoommee ffiilleess tthhaatt II KKNNOOWW aarree oonn tthhee sseerrvveerr ddooeessnn''tt sshhooww uupp wwhheenn II
+  vviieeww tthhee ffiilleess ffrroomm mmyy cclliieenntt!!
 
 
   See the next question.
 
-  2.3.  Some files on the server show up with really wierd filenames
-  when I view the files from my client!
+  22..33..  SSoommee ffiilleess oonn tthhee sseerrvveerr sshhooww uupp wwiitthh rreeaallllyy wwiieerrdd ffiilleennaammeess
+  wwhheenn II vviieeww tthhee ffiilleess ffrroomm mmyy cclliieenntt!!
 
 
   If you check what files are not showing up, you will note that they
@@ -579,7 +579,7 @@
   "mangled names = yes".
 
 
-  2.4.  My client reports "cannot locate specified computer" or similar
+  22..44..  MMyy cclliieenntt rreeppoorrttss ""ccaannnnoott llooccaattee ssppeecciiffiieedd ccoommppuutteerr"" oorr ssiimmiillaarr
 
 
   This indicates one of three things: You supplied an incorrect server
@@ -610,8 +610,8 @@
   tests :-)
 
 
-  2.5.  My client reports "cannot locate specified share name" or simi-
-  lar
+  22..55..  MMyy cclliieenntt rreeppoorrttss ""ccaannnnoott llooccaattee ssppeecciiffiieedd sshhaarree nnaammee"" oorr ssiimmii--
+  llaarr
 
 
   This message indicates that your client CAN locate the specified
@@ -624,19 +624,19 @@
   to specify a service name correctly), read on:
 
 
-  o  Many clients cannot accept or use service names longer than eight
+  +o  Many clients cannot accept or use service names longer than eight
      characters.
 
-  o  Many clients cannot accept or use service names containing spaces.
+  +o  Many clients cannot accept or use service names containing spaces.
 
-  o  Some servers (not Samba though) are case sensitive with service
+  +o  Some servers (not Samba though) are case sensitive with service
      names.
 
-  o  Some clients force service names into upper case.
+  +o  Some clients force service names into upper case.
 
 
-  2.6.  My client reports "cannot find domain controller", "cannot log
-  on to the network" or similar
+  22..66..  MMyy cclliieenntt rreeppoorrttss ""ccaannnnoott ffiinndd ddoommaaiinn ccoonnttrroolllleerr"",, ""ccaannnnoott lloogg
+  oonn ttoo tthhee nneettwwoorrkk"" oorr ssiimmiillaarr
 
 
   Nothing is wrong - Samba does not implement the primary domain name
@@ -658,7 +658,7 @@
 
 
 
-  2.7.  Printing doesn't work :-(
+  22..77..  PPrriinnttiinngg ddooeessnn''tt wwoorrkk ::--((
 
 
   Make sure that the specified print command for the service you are
@@ -689,8 +689,8 @@
   mechanism.
 
 
-  2.8.  My programs install on the server OK, but refuse to work prop-
-  erly
+  22..88..  MMyy pprrooggrraammss iinnssttaallll oonn tthhee sseerrvveerr OOKK,, bbuutt rreeffuussee ttoo wwoorrkk pprroopp--
+  eerrllyy
 
 
   There are numerous possible reasons for this, but one MAJOR
@@ -706,7 +706,7 @@
   Tridgell know via email at samba-bugs@samba.anu.edu.au.
 
 
-  2.9.  My "server string" doesn't seem to be recognised
+  22..99..  MMyy ""sseerrvveerr ssttrriinngg"" ddooeessnn''tt sseeeemm ttoo bbee rreeccooggnniisseedd
 
 
   OR My client reports the default setting, eg. "Samba 1.9.15p4",
@@ -719,8 +719,8 @@
   the "server string" field of smb.conf, -C for nmbd is now obsolete.
 
 
-  2.10.  My client reports "This server is not configured to list shared
-  resources"
+  22..1100..  MMyy cclliieenntt rreeppoorrttss ""TThhiiss sseerrvveerr iiss nnoott ccoonnffiigguurreedd ttoo lliisstt sshhaarreedd
+  rreessoouurrcceess""
 
 
   Your guest account is probably invalid for some reason. Samba uses the
@@ -730,7 +730,7 @@
   See also 'guest account' in smb.conf man page.
 
 
-  2.11.  Log message "you appear to have a trapdoor uid system"
+  22..1111..  LLoogg mmeessssaaggee ""yyoouu aappppeeaarr ttoo hhaavvee aa ttrraappddoooorr uuiidd ssyysstteemm""
 
 
   This can have several causes. It might be because you are using a uid
@@ -765,12 +765,12 @@
   as uid 65535 will actually run as root. This is not good!
 
 
-  3.  Common client questions
+  33..  CCoommmmoonn cclliieenntt qquueessttiioonnss
 
 
 
 
-  3.1.  Are there any Macintosh clients for Samba?
+  33..11..  AArree tthheerree aannyy MMaacciinnttoosshh cclliieennttss ffoorr SSaammbbaa??
 
 
   Yes! Thursby now have a CIFS Client / Server called DAVE - see
@@ -790,7 +790,7 @@
   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>
-  3.2.  Session request failed (131,130)" error
+  33..22..  SSeessssiioonn rreeqquueesstt ffaaiilleedd ((113311,,113300))"" eerrrroorr
 
 
   The following answer is provided by John E. Miller:
@@ -819,26 +819,26 @@
   you'd have to use smbclient -iSomeStr otherparms in connecting to it.
 
 
-  3.3.  How do I synchronise my PC's clock with my Samba server?
+  33..33..  HHooww ddoo II ssyynncchhrroonniissee mmyy PPCC''ss cclloocckk wwiitthh mmyy SSaammbbaa sseerrvveerr??
 
 
   To syncronize your PC's clock with your Samba server:
 
-  o  Copy timesync.pif to your windows directory
+  +o  Copy timesync.pif to your windows directory
 
-  o  timesync.pif can be found at:
-     <http://samba.canberra.edu.au/pub/samba/binaries/miscellaneous/timesync.pif>
+  +o  timesync.pif can be found at:
+     <http://samba.anu.edu.au/samba/binaries/miscellaneous/timesync.pif>
 
-  o  Add timesync.pif to your 'Start Up' group/folder
+  +o  Add timesync.pif to your 'Start Up' group/folder
 
-  o  Open the properties dialog box for the program/icon
+  +o  Open the properties dialog box for the program/icon
 
-  o  Make sure the 'Run Minimized' option is set in program 'Properties'
+  +o  Make sure the 'Run Minimized' option is set in program 'Properties'
 
-  o  Change the command line section that reads \sambahost to reflect
+  +o  Change the command line section that reads \sambahost to reflect
      the name of your server.
 
-  o  Close the properties dialog box by choosing 'OK'
+  +o  Close the properties dialog box by choosing 'OK'
 
      Each time you start your computer (or login for Win95) your PC will
      synchronize its clock with your Samba server.
@@ -858,7 +858,7 @@
 
   as one of the lines in the logon script.
 
-  3.4.  Problems with WinDD, NTrigue, WinCenterPro etc
+  33..44..  PPrroobblleemmss wwiitthh WWiinnDDDD,, NNTTrriigguuee,, WWiinnCCeenntteerrPPrroo eettcc
 
 
   All of the above programs are applications that sit on an NT box and
@@ -900,7 +900,7 @@
   home directory. Use \serversername instead.
 
 
-  3.5.  Problem with printers under NT
+  33..55..  PPrroobblleemm wwiitthh pprriinntteerrss uunnddeerr NNTT
 
 
   This info from Stefan Hergeth hergeth@f7axp1.informatik.fh-muenchen.de
@@ -929,7 +929,7 @@
      try it yet.
 
 
-  3.6.  Why are my file's timestamps off by an hour, or by a few hours?
+  33..66..  WWhhyy aarree mmyy ffiillee''ss ttiimmeessttaammppss ooffff bbyy aann hhoouurr,, oorr bbyy aa ffeeww hhoouurrss??
 
 
   This is from Paul Eggert eggert@twinsun.com.
@@ -973,20 +973,20 @@
 
      where:
 
-     o  `Std' is the standard time designation (e.g. `PST').
+     +o  `Std' is the standard time designation (e.g. `PST').
 
-     o  `Offset' is the number of hours behind UTC (e.g. `8').  Prepend
+     +o  `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.
 
-     o  `Dst' is the daylight-saving time designation (e.g. `PDT').
+     +o  `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.
 
-     o  `Date/Time,Date/Time' specify when daylight-saving time starts
+     +o  `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
@@ -1005,7 +1005,7 @@
      Samba server to 1.9.16alpha10 or later.
 
 
-  3.7.  How do I set the printer driver name correctly?
+  33..77..  HHooww ddoo II sseett tthhee pprriinntteerr ddrriivveerr nnaammee ccoorrrreeccttllyy??
 
 
   Question: On NT, I opened "Printer Manager" and "Connect to Printer".
@@ -1050,17 +1050,17 @@
 
   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 us know
-  via samba-bugs@samba.anu.edu.au, and we'll make it the default. Currently
-  the default is a 0 length string.
+  via samba-bugs@samba.anu.edu.au, and we'll make it the default. Cur-
+  rently the default is a 0 length string.
 
 
-  3.8.  I've applied NT 4.0 SP3, and now I can't access Samba shares,
-  Why?
+  33..88..  II''vvee aapppplliieedd NNTT 44..00 SSPP33,, aanndd nnooww II ccaann''tt aacccceessss SSaammbbaa sshhaarreess,,
+  WWhhyy??
 
 
   As of SP3, Microsoft has decided that they will no longer default to
   passing clear text passwords over the network.  To enable access to
-  Samba shares from NT 4.0 SP3, you must do ONE of two things:
+  Samba shares from NT 4.0 SP3, you must do OONNEE of two things:
 
   1. Set the Samba configuration option 'security = user' and implement
      all of the stuff detailed in ENCRYPTION.txt
@@ -1071,13 +1071,13 @@
      <http://www.microsoft.com/kb/articles/q166/7/30.htm>
 
 
-  4.  Specific client application problems
+  44..  SSppeecciiffiicc cclliieenntt aapppplliiccaattiioonn pprroobblleemmss
 
 
 
 
-  4.1.  MS Office Setup reports "Cannot change properties of 'MSOF-
-  FICEUP.INI'"
+  44..11..  MMSS OOffffiiccee SSeettuupp rreeppoorrttss ""CCaannnnoott cchhaannggee pprrooppeerrttiieess ooff ''MMSSOOFF--
+  FFIICCEEUUPP..IINNII''""
 
 
   When installing MS Office on a Samba drive for which you have admin
@@ -1093,11 +1093,11 @@
   to fix the owner.
 
 
-  5.  Miscellaneous
+  55..  MMiisscceellllaanneeoouuss
 
 
 
-  5.1.  Is Samba Year 2000 compliant?
+  55..11..  IIss SSaammbbaa YYeeaarr 22000000 ccoommpplliiaanntt??
 
 
   The CIFS protocol that Samba implements negotiates times in various
diff --git a/docs/manpages/samba.7 b/docs/manpages/samba.7
index 7e98c850d4..7260cbad39 100644
--- a/docs/manpages/samba.7
+++ b/docs/manpages/samba.7
@@ -65,7 +65,7 @@ the mailing list are given in the README file that comes with Samba.
 
 If you have access to a WWW viewer (such as Netscape or Mosaic) then
 you will also find lots of useful information, including back issues
-of the Samba mailing list, at http://samba.canberra.edu.au/pub/samba/
+of the Samba mailing list, at http://samba.anu.edu.au/samba/
 .SH AUTHOR
 
 The main author of the Samba suite is Andrew Tridgell. He may be
diff --git a/docs/samba.faq b/docs/samba.faq
deleted file mode 100644
index 1912643950..0000000000
--- a/docs/samba.faq
+++ /dev/null
@@ -1,900 +0,0 @@
-
-                           Frequently Asked Questions
-
-                                    about the
-
-                                   SAMBA Suite
-
-                  (FAQ version 1.9.15a, Samba version 1.09.15)
-
--------------------------------------------------------------------------------
-
-This FAQ was originally prepared by Karl Auer and is
-currently maintained by Paul Blackman (ictinus@lake.canberra.edu.au).
-
-As Karl originally said, 'this FAQ was prepared with lots of help from numerous
-net.helpers', and that's the way I'd like to keep it. So if you find anything
-that you think should be in here don't hesitate to contact me.
-
-Thanks to Karl for the work he's done, and continuing thanks to Andrew Tridgell
-for developing Samba.
-
-Note: This FAQ is (and probably always will be) under construction. Some
-sections exist only as optimistic entries in the Contents page.
-
--------------------------------------------------------------------------------
-
-Contents
-
-     * SECTION ONE: General information
-          All about Samba - what it is, how to get it, related sources of
-          information, how to understand the version numbering scheme,
-          pizza details
-     * SECTION TWO: Compiling and installing Samba on a Unix host
-          Common problems that arise when building and installing Samba under
-          Unix.
-     * SECTION THREE: Common client problems
-          Common problems that arise when trying to communicate from a client
-          computer to a Samba server. All problems which have symptoms you see
-          at the client end will be in this section.
-     * SECTION FOUR: Specific client problems
-          This section covers problems that are specific to certain clients,
-          such as Windows for Workgroups or Windows NT. Please check Section
-          Three first!
-     * SECTION FIVE: Specific client application problems
-          This section covers problems that are specific to certain products,
-          such as Windows for Workgroups or Windows NT. Please check Sections
-          Three and Four first!
-     * SECTION SIX: Miscellaneous
-          All the questions that aren't classifiable into any other section.
-
-
-===============================================================================
-SECTION ONE: General information
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 1: What is Samba?
-
-Samba is a suite of programs which work together to allow clients to access
-to a server's filespace and printers via the SMB (Session Message Block) 
-protocol. Initially written for Unix, Samba now also runs on Netware, OS/2 and
-AmigaDOS.
-
-In practice, this means that you can redirect disks and printers to Unix disks
-and printers from Lan Manager clients, Windows for Workgroups 3.11 clients,
-Windows NT clients, Linux clients and OS/2 clients. There is also a generic 
-Unix client program supplied as part of the suite which allows Unix users to 
-use an ftp-like interface to access filespace and printers on any other SMB 
-servers. This gives the capability for these operating systems to behave much
-like a LAN Server or Windows NT Server machine, only with added functionality
-and flexibility designed to make life easier for administrators.
-
-The components of the suite are (in summary):
-
-     * smbd, the SMB server. This handles actual connections from clients,
-         doing all the file, permission and username work
-     * 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
-     * smbclient, the Unix-hosted client program
-     * smbrun, a little 'glue' program to help the server run external
-         programs
-     * testprns, a program to test server access to printers
-     * testparms, a program to test the Samba configuration file for
-         correctness
-     * smb.conf, the Samba configuration file
-     * smbprint, a sample script to allow a Unix host to use smbclient to
-         print to an SMB server
-     * documentation! DON'T neglect to read it - you will save a great deal
-         of time!
-
-The suite is supplied with full source (of course!) and is GPLed.
-
-The primary creator of the Samba suite is Andrew Tridgell. Later versions
-incorporate much effort by many net.helpers. The man pages and this FAQ were
-originally written by Karl Auer.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 2: What is the current version of Samba?
-
-At time of writing, the current version was 1.9.16. If you want to be sure
-check the bottom of the change-log file. 
-(ftp://samba.anu.edu.au/pub/samba/alpha/change-log)
-
-For more information see question 5, "What do the version numbers mean?"
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 3: Where can I get it?
-
-The Samba suite is available via anonymous ftp from samba.anu.edu.au. The
-latest and greatest versions of the suite are in the directory:
-
-/pub/samba/
-
-Development (read "alpha") versions, which are NOT necessarily stable and which
-do NOT necessarily have accurate documentation, are available in the directory:
-
-/pub/samba/alpha
-
-Note that binaries are NOT included in any of the above. Samba is distributed
-ONLY in source form, though binaries may be available from other sites. Recent
-versions of some Linux distributions, for example, do contain Samba binaries
-for that platform.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 5: What do the version numbers mean?
-
-It is not recommended that you run a version of Samba with the word "alpha"
-in its name unless you know what you are doing and are willing to do some 
-debugging. Many, many people just get the latest recommended stable release 
-version and are happy. If you are brave, by 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.
-
-How the scheme works:
-
-1) 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
-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 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. 
-
-So the progression goes:
-
-			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)
-
-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.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 4: What platforms are supported?
-
-Many different platforms have run Samba successfully. The platforms most widely
-used and thus best tested are Linux and SunOS.
-
-At time of writing, the Makefile claimed support for:
-
-     * 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)
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 5: How can I find out more about Samba?
-
-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 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
-blank, and include the following two lines in the body of the message:
-
-      subscribe samba Firstname Lastname
-      subscribe samba-announce Firstname Lastname
-
-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.
-
-The samba list is a digest list - every eight hours or so it 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.
-
-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
-include the following two lines in the body of the message:
-
-      unsubscribe samba
-      unsubscribe samba-announce
-
-The From: line in your message MUST be the same address you used when you
-subscribed.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 6: Something's gone wrong - what should I do?
-
-[#] *** IMPORTANT! *** [#]
-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.
-
-Secondly, read the man pages for smbd, nmbd and smb.conf, looking for topics
-that relate to what you are trying to do.
-
-Thirdly, if there is no obvious solution to hand, try to get a look at the log
-files for smbd and/or nmbd for the period during which you were having
-problems. You may need to reconfigure the servers to provide more extensive
-debugging information - usually level 2 or level 3 provide ample debugging
-info. Inspect these logs closely, looking particularly for the string "Error:".
-
-Fourthly, if you still haven't got anywhere, ask the mailing list or newsgroup.
-In general nobody minds answering questions provided you have followed the
-preceding steps. It might be a good idea to scan the archives of the mailing
-list, which are available through the Samba web site described in the previous
-section.
-
-If you successfully solve a problem, please mail the FAQ maintainer a succinct 
-description of the symptom, the problem and the solution, so 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 other individual and
-not the samba team mailing list.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* n: Pizza Supply Details
-
-Those who have registered in the Samba survey as "Pizza Factory" will already
-know this, but the rest may need some help. Andrew doesn't ask for payment, 
-but he does appreciate it when people give him pizza. This calls for a little
-organisation when the pizza donor is twenty thousand kilometres away, but
-it has been done.
-
-Method 1: Ring up your local branch of an international pizza chain and see if
-they honour their vouchers internationally. Pizza Hut do, which is how the
-entire Canberra Linux Users Group got to eat pizza one night, courtesy of
-someone in the US
-
-Method 2: Ring up a local pizza shop in Canberra and quote a credit card
-number for a certain amount, and tell them that Andrew will be collecting
-it (don't forget to tell him.) One kind soul from Germany did this.
-
-Method 3: Purchase a pizza voucher from your local pizza shop that has no
-international affiliations and send it to Andrew. It is completely useless
-but he can hang it on the wall next to the one he already has from Germany :-)
-
-Method 4: Air freight him a pizza with your favourite regional flavours. It will
-probably get stuck in customs or torn apart by hungry sniffer dogs but it will
-have been a noble gesture.
-
-===============================================================================
-SECTION TWO: Compiling and installing Samba on a Unix host
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-===============================================================================
-SECTION THREE: Common client problems
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 1: I can't see the Samba server in any browse lists!
-
-*** Until the FAQ can be updated, please check the file:
-*** ftp://samba.anu.edu.au/pub/samba/docs/BROWSING.txt
-*** for more information on browsing. 
-
-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: thusly:
-
-   net use M: \\mary\fred
-
-The details of how to do this and the specific syntax varies from client to
-client - check your client's documentation.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 2: Some files that I KNOW are on the server doesn't show up when I view the
-     directories from my client!
-
-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 DOS-compatible (ie,
-they are not legal DOS filenames for some reason).
-
-The Samba server can be configured either to ignore such files completely, or
-to present them to the client in "mangled" form. If you are not seeing the
-files at all, the Samba server has most likely been configured to ignore them.
-Consult the man page smb.conf(5) for details of how to change this - the
-parameter you need to set is "mangled names = yes".
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 3: Some files on the server show up with really wierd filenames when I view
-the directories from my client!
-
-If you check what files are showing up wierd, you will note that they are files
-which contain upper case letters or which are otherwise not DOS-compatible (ie,
-they are not legal DOS filenames for some reason).
-
-The Samba server can be configured either to ignore such files completely, or
-to present them to the client in "mangled" form. If you are seeing strange file
-names, they are most likely "mangled". If you would prefer to have such files
-ignored rather than presented in "mangled" form, consult the man page
-smb.conf(5) for details of how to change the server configuration - the
-parameter you need to set is "mangled names = no".
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 4: My client reports "cannot locate specified computer" or similar.
-
-This indicates one of three things: You supplied an incorrect server name, the
-underlying TCP/IP layer is not working correctly, or the name you specified
-cannot be resolved.
-
-After carefully checking that the name you typed is the name you should have
-typed, try doing things like pinging a host or telnetting to somewhere on your
-network to see if TCP/IP is functioning OK. If it is, the problem is most
-likely name resolution.
-
-If your client has a facility to do so, hardcode a mapping between the hosts IP
-and the name you want to use. For example, with Man Manager or Windows for
-Workgroups you would put a suitable entry in the file LMHOSTS. If this works,
-the problem is in the communication between your client and the netbios name
-server. If it does not work, then there is something fundamental wrong with
-your naming and the solution is beyond the scope of this document.
-
-If you do not have any server on your subnet supplying netbios name resolution,
-hardcoded mappings are your only option. If you DO have a netbios name server
-running (such as the Samba suite's nmbd program), the problem probably lies in
-the way it is set up. Refer to Section Two of this FAQ for more ideas.
-
-By the way, remember to REMOVE the hardcoded mapping before further tests :-)
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 5: My client reports "cannot locate specified share name" or similar.
-
-This message indicates that your client CAN locate the specified server, which
-is a good start, but that it cannot find a service of the name you gave.
-
-The first step is to check the exact name of the service you are 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:
-
-     * 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.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 6: My client reports "cannot find domain controller", "cannot log on to the
-network" or similar.
-
-Nothing is wrong - Samba does not implement the primary domain name controller
-stuff for several reasons, including the fact that the whole concept of a
-primary domain controller and "logging in to a network" doesn't fit well with
-clients possibly running on multiuser machines (such as users of smbclient
-under Unix). Having said that, several developers are working hard on 
-building it in to the next major version of Samba. If you can contribute, 
-send a message to samba-bugs!
-
-Seeing this message should not affect your ability to mount redirected disks
-and printers, which is really what all this is about.
-
-For many clients (including Windows for Workgroups and Lan Manager), setting
-the domain to STANDALONE at least gets rid of the message.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 7: Printing doesn't work :-(
-
-Make sure that the specified print command for the service you are connecting
-to is correct and that it has a fully-qualified path (eg., use "/usr/bin/lpr"
-rather than just "lpr").
-
-Make sure that the spool directory specified for the service is writable by the
-user connected to the service. In particular the user "nobody" often has
-problems with printing, even if it worked with an earlier version of Samba. Try
-creating another guest user other than "nobody".
-
-Make sure that the user specified in the service is permitted to use the
-printer.
-
-Check the debug log produced by smbd. Search for the printer name and see if
-the log turns up any clues. Note that error messages to do with a service ipc$
-are meaningless - they relate to the way the client attempts to retrieve status
-information when using the LANMAN1 protocol.
-
-If using WfWg then you need to set the default protocol to TCP/IP, not Netbeui.
-This is a WfWg bug.
-
-If using the Lanman1 protocol (the default) then try switching to coreplus.
-Also not that print status error messages don't mean printing won't work. The
-print status is received by a different mechanism.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 8: My programs install on the server OK, but refuse to work properly.
-
-There are numerous possible reasons for this, but one MAJOR possibility is that
-your software uses locking. Make sure you are using Samba 1.6.11 or later. It
-may also be possible to work around the problem by setting "locking=no" in the
-Samba configuration file for the service the software is installed on. This
-should be regarded 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.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 9: My "server string" doesn't seem to be recognized, my client reports the
-     default setting, eg. "Samba 1.9.15p4", instead of what I have changed it
-     to in the smb.conf file.
- 
-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
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 10: When I attempt to get a listing of available resources from the Samba
-      server, my client reports
-      "This server is not configured to list shared resources".
-
-Your guest account is probably invalid for some reason. Samba uses
-the guest account for browsing in smbd.  Check that your guest account is
-valid.
-
-See also 'guest account' in smb.conf man page.
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 11: You get the message "you appear to have a trapdoor uid system"
-      in your logs
-
-This can have several causes. It might be because you are using a uid
-or gid of 65535 or -1. This is a VERY bad idea, and is a big security
-hole. Check carefully in your /etc/passwd file and make sure that no
-user has uid 65535 or -1. Especially check the "nobody" user, as many
-broken systems are shipped with nobody setup with a uid of 65535.
-
-It might also mean that your OS has a trapdoor uid/gid system :-)
-
-This means that once a process changes effective uid from root to
-another user it can't go back to root. Unfortunately Samba relies on
-being able to change effective uid from root to non-root and back
-again to implement its security policy. If your OS has a trapdoor uid
-system this won't work, and several things in Samba may break. Less
-things will break if you use user or server level security instead of
-the default share level security, but you may still strike
-problems. 
-
-The problems don't give rise to any security holes, so don't panic,
-but it does mean some of Samba's capabilities will be unavailable.
-In particular you will not be able to connect to the Samba server as
-two different uids at once. This may happen if you try to print as a
-"guest" while accessing a share as a normal user. It may also affect
-your ability to list the available shares as this is normally done as
-the guest user.
-
-Complain to your OS vendor and ask them to fix their system.
-
-Note: the reason why 65535 is a VERY bad choice of uid and gid is that
-it casts to -1 as a uid, and the setreuid() system call ignores (with
-no error) uid changes to -1. This means any daemon attempting to run
-as uid 65535 will actually run as root. This is not good!
-
-===============================================================================
-SECTION FOUR: Specific client problems
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 1: Are any MacIntosh clients for Samba.
-
-Yes. Thursby Software Systems have released 'Dave' - a SMB client for
-MacIntosh systems. This is a commercial product and inclusion in this
-faq does not imply any endorsement by the Samba developers. Having said
-that, the first public demonstration of 'Dave' was to the Samba server
-run by Andrew Tridgell over the Internet from Redmond, Washington, USA to
-Australia as part of the first CIFS developers conference.
-
-For more details on 'Dave' contact :
-
-Web contact: www.thursby.com
-
-Thursby Software Systems, Inc.
-5840 W. Interstate 20
-Arlington, Texas 76017 U.S.A.
-Voice: 817-478-5070
-FAX: 817-561-2313
-sales@thursby.com
-
-There are currently no Free Software solutions other than to make
-your UNIX server talk AppleTalk.
-
-In Rob Newberry's words (rob@eats.com, Sun, 4 Dec 1994):
-
-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.
-
-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.
-
-Depending on your 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.
-
-Rob
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 2: I am getting a "Session request failed (131,130)" error when I try to
-     connect to my Win95 PC with smbclient. I am able to connect from the PC
-     to the Samba server without problems. What gives?
-
-The following answer is provided by John E. Miller:
-
-I'll assume that you're able to ping back and forth between the machines by
-IP address and name, and that you're using some security model where you're
-confident that you've got user IDs and passwords right.  The logging options
-(-d3 or greater) can help a lot with that.  DNS and WINS configuration can
-also impact connectivity as well.
-
-Now, on to 'scope id's.  Somewhere in your Win95 TCP/IP network configuration
-(I'm too much of an NT bigot to know where it's located in the Win95 setup,
-but I'll have to learn someday since I teach for a Microsoft Solution Provider
-Authorized Tech Education Center - what an acronym...) [Note: It's under
-Control Panel | Network | TCP/IP | WINS Configuration] there's a little text
-entry field called something like 'Scope ID'. 
-
-This field essentially creates 'invisible' sub-workgroups on the same wire.
-Boxes can only see other boxes whose Scope IDs are set to the exact same
-value - it's sometimes used by OEMs to configure their boxes to browse only
-other boxes from the same vendor and, in most environments, this field should
-be left blank.  If you, in fact, have something in this box that EXACT value
-(case-sensitive!) needs to be provided to smbclient and nmbd as the -i 
-(lowercase) parameter. So, if your Scope ID is configured as the string
-'SomeStr' in Win95 then you'd have to use smbclient -iSomeStr <otherparms>
-in connecting to it.  
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 3: How do I synchronize my PC's clock with my Samba server? 
-
-To syncronize your PC's clock with your Samba server:
-
-* 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'
-
-Each time you start your computer (or login for Win95) your PC will
-synchronize its clock with your Samba server.
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 4: Problems with WinDD, NTrigue, WinCenterPro etc
-
-All of the above programs are applications that sit on an NT box and
-allow multiple users to access the NT GUI applications from remote
-workstations (often over X).
-
-What has this got to do with Samba? The problem comes when these users
-use filemanager to mount shares from a Samba server. The most common
-symptom is that the first user to connect get correct file permissions
-and has a nice day, but subsequent connections get logged in as the
-same user as the first person to login. They find that they cannot
-access files in their own home directory, but that they can access
-files in the first users home directory (maybe not such a nice day
-after all?)
-
-Why does this happen? The above products all share a common heritage
-(and code base I believe). They all open just a single TCP based SMB
-connection to the Samba server, and requests from all users are piped
-over this connection. This is unfortunate, but not fatal.
-
-It means that if you run your Samba server in share level security
-(the default) then things will definately break as described above. The
-share level SMB security model has no provision for multiple user IDs
-on the one SMB connection. See security_level.txt in the docs for more
-info on share/user/server level security.
-
-If you run in user or server level security then you have a chance,
-but only if you have a recent version of Samba (at least 1.9.15p6). In
-older versions bugs in Samba meant you still would have had problems.
-
-If you have a trapdoor uid system in your OS then it will never work
-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.
-
-Also note that you should not use the magic "homes" share name with
-products like these, as otherwise all users will end up with the same
-home directory. Use \\server\username instead.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 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>
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 6: Why are my file's timestamps off by an hour, or by a few hours? 
-
-This is from Paul Eggert <eggert@twinsun.com>.
-
-Most likely it's a problem with your time zone settings.
-
-Internally, Samba maintains time in traditional Unix format,
-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.
-	Use the shell command "sh -c 'TZ=UTC0 date'" to check this.
-
-	2.  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'.
-
-	3.  TZ must have the correct value.
-	
-		3a.  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/>.
-
-		3b.  If your system does not support geographical time zone
-		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):
-
-			StdOffset[Dst[Offset],Date/Time,Date/Time]
-
-		where:
-
-			`Std' is the standard time designation (e.g. `PST').
-		
-			`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
-			(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
-			time is [h]h[:mm[:ss]], using a 24-hour clock.
-
-		Other Posix string formats are allowed but you don't want
-		to know about them.
-
-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
-to the bizarre ways that Microsoft network protocols handle time
-zones.  A common symptom is for file timestamps to be off by an hour.
-To work around the problem, try disconnecting from your Samba server
-and then reconnecting to it; or upgrade your Samba server to
-1.9.16alpha10 or later.
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 7: How do I set the printer driver name correctly?
-
-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.
-
-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:
-
-     printer driver = HP LaserJet 4L
-
-and NT knows to use the right driver. You have to get this string
-exactly right.
-
-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.
-
-You could also try setting the driver to NULL like this:
-
-     printer driver = NULL
-
-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.
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-* 8: I have upgraded my NT 4.0 system to service pack 3. Why
-     can't I connect anymore ?
-
-This is not a bug.  Microsoft has changed their policy on sending
-unencrypted passwords over the net.  They no longer default to allowing
-unencrypted passwords to be sent over the net.  This effects all Samba
-servers which are configured to use security=share or security=user level
-security without password encryption. They do, however, have a fix which 
-can be applied to the registry to fix the problem.  Here's a synopsis 
-from the SP3 web page that discusses how to enable unencrypted password 
-sending from an NT 4.0 box.
-
-A better solution is to re-compile Samba to use encrypted passwords.
-See the document :
-
-ftp://samba.anu.edu.au/pub/samba/docs/ENCRYPTION.txt
-
->SYMPTOMS
->==========
->
->Connecting to SMB servers (such as Samba) with unencrypted password fails
-after upgrading to Windows NT 4.0 service pack 3 version 1.76. 
->
->CAUSE
->======
->
->The SMB redirector in Windows NT 4.0 service pack 3 version 1.76 handles
->unencrypted passwords differently than previous version of Windows NT.
->Beginning with this version, the SMB redirector will not send an
->unencrypted password unless you add a registry entry to enable them.
->
->RESOLUTION
->===========
->
->To enable unencrypted (plain text) passwords modify the registry in this way.
->
->
->
->WARNING: Using Registry Editor incorrectly can cause serious, system-wide
->problems that may require you to reinstall Windows NT to correct them.
->Microsoft cannot guarantee that any problems resulting from the use of
->Registry Editor can be solved. Use this tool at your own risk.
->
->
->
->1. Run Registry Editor (REGEDT32.EXE).
->
->2. From the HKEY_LOCAL_MACHINE subtree, go to the following key:
->
->
->
->\system\currentcontrolset\services\rdr\parameters
->
->
->
->3. From the Edit menu, select Add Value.
->
->4. Add the following:
->
->
->
->Value Name: EnablePlainTextPassword 
->
->Data Type: REG_DWORD
->
->Data: 1
->
->
->
->5. Choose OK and quit Registry Editor.
->
->6. Shutdown and restart Windows NT.
->
-> 
------------------------------------------------------------------------
-
-===============================================================================
-SECTION FIVE: Specific client application problems
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* 1: MS Office Setup reports "Cannot change properties of the file named:
-                                      X:\MSOFFICE\SETUP.INI"
-
-When installing MS Office on a Samba drive for which you have admin user
-permissions, ie. admin users = <username>, you will find the setup program
-unable to complete the installation.
-
-To get around this problem, do the installation without admin user permissions
-The problem is that MS Office Setup checks that a file is rdonly by trying to
-open it for writing.
-
-Admin users can always open a file for writing, as they run as root. 
-You just have to install as a non-admin user and then use "chown -R" to fix
-the owner.
-
-===============================================================================
-SECTION SIX: Miscellaneous
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Maintained By Paul Blackman, Email:ictinus@lake.canberra.edu.au
diff --git a/docs/textdocs/BUGS.txt b/docs/textdocs/BUGS.txt
index 0bd12e8af0..5fc069371b 100644
--- a/docs/textdocs/BUGS.txt
+++ b/docs/textdocs/BUGS.txt
@@ -25,7 +25,7 @@ that list that may be able to help you.
 
 You may also like to look though the recent mailing list archives,
 which are conveniently accessible on the Samba web pages
-at http://samba.canberra.edu.au/pub/samba/ 
+at http://samba.anu.edu.au/samba/ 
 
 
 GENERAL INFO
diff --git a/docs/textdocs/MIRRORS.txt b/docs/textdocs/MIRRORS.txt
index 01bc277a20..c9bd04f1c8 100755
--- a/docs/textdocs/MIRRORS.txt
+++ b/docs/textdocs/MIRRORS.txt
@@ -1,6 +1,9 @@
 The main Samba ftp site is samba.anu.edu.au in pub/samba/. Contact
 samba-bugs@samba.anu.edu.au for help with this site.
 
+The 'Source Only' sites may also contain binary packages as we are now 
+including them on samba.anu.edu.au/pub/samba/Binary_Packages
+
 Mirror sites include:
 
 Source Only
@@ -18,6 +21,8 @@ Source Only
 --- Germany ---  
 	ftp://ftp.uni-trier.de/pub/unix/network/samba/
 	ftp://ftp.gwdg.de/pub/server/samba/
+--- Greece ---
+	ftp://ftp.ntua.gr/pub/net/samba/
 --- Japan ---  
 	ftp://ring.asahi-net.or.jp/archives/net/samba/
 	ftp://ring.aist.go.jp/archives/net/samba/
@@ -28,8 +33,12 @@ Source Only
 	ftp://ftp.gbnet.net/pub/samba/
 	ftp://ftp.ntrl.net/pub/mirror/samba/
 	ftp://despair.capecod.net/pub/Samba/
+--- Poland ---
+	ftp://giswitch.sggw.waw.pl/pub/unix/samba/
 --- Portugal ---  
 	ftp://ftp.ua.pt/pub/misc/samba/
+--- Romania ---
+	ftp.romus.ro/pub/Linux/Network/samba/
 --- Russian Federation ---  
 	ftp://ftp.uic.nsu.ru/pub/vendors/samba/
 --- United Kingdom ---  
@@ -75,7 +84,7 @@ There are several others. Give archie a try.
 
 Http sites include:
 ===================
-http://samba.canberra.edu.au/pub/samba
+http://samba.anu.edu.au/samba
 http://www.choc.satech.net.au/pub/samba/
 
 
diff --git a/docs/textdocs/UNIX_INSTALL.txt b/docs/textdocs/UNIX_INSTALL.txt
index c189482ca4..d78c36a4c9 100644
--- a/docs/textdocs/UNIX_INSTALL.txt
+++ b/docs/textdocs/UNIX_INSTALL.txt
@@ -15,7 +15,7 @@ try something like:
 
 Unfortunately, having said this, the man pages are sadly out of date and
 really need more effort to maintain them. Other sources of information 
-are pointed to by the Samba web site, http://samba.canberra.edu.au/pub/samba.
+are pointed to by the Samba web site, http://samba.anu.edu.au/samba.
 
 STEP 1. Building the binaries