18 files changed, 54 insertions, 108 deletions
diff --git a/docs/INSTALL.txt b/docs/INSTALL.txt
index 6f752b6397..1322047fd1 100644
--- a/docs/INSTALL.txt
+++ b/docs/INSTALL.txt
@@ -49,10 +49,11 @@ options.
 
 The simplest useful configuration file would be something like this:
 
-[homes]
-	workgroup = MYGROUP
-	guest ok = no
-	read only = no
+   workgroup = MYGROUP
+
+   [homes]
+      guest ok = no
+      read only = no
 
 which would allow connections by anyone with an account on the server,
 using either their login name or "homes" as the service name. (Note
@@ -230,8 +231,9 @@ CHOOSING THE PROTOCOL LEVEL
 The SMB protocol has many dialects. Currently Samba supports 5, called
 CORE, COREPLUS, LANMAN1, LANMAN2 and NT1.
 
-You can choose what protocols to support in the smb.conf file. The
-default is NT1 and that is the best for the vast majority of sites.
+You can choose what maximum protocol to support in the smb.conf
+file. The default is NT1 and that is the best for the vast majority of
+sites.
 
 In older versions of Samba you may have found it necessary to use
 COREPLUS. The limitations that led to this have mostly been fixed. It
@@ -310,7 +312,9 @@ compatability modes called DENY_FCB and DENY_DOS.
 
 You can disable share modes using "share modes = no". This may be
 useful on a heavily loaded server as the share modes code is very
-slow. 
+slow. See also the FAST_SHARE_MODES option in the Makefile for a way
+to do full share modes very fast using shared memory (if your OS
+supports it).
 
 
 MAPPING USERNAMES
diff --git a/docs/announce b/docs/announce
index 5740f37dc6..177286ff8e 100644
--- a/docs/announce
+++ b/docs/announce
@@ -129,5 +129,5 @@ newsgroup comp.protocols.smb.
 A WWW site with lots of Samba info can be found at 
 http://samba.canberra.edu.au/pub/samba/
 
-The Samba Team (Contact: samba-bugs@anu.edu.au)
+The Samba Team (Contact: samba-bugs@samba.anu.edu.au)
 June 1996
diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8
index d87ae75e73..942fb8920c 100644
--- a/docs/manpages/nmbd.8
+++ b/docs/manpages/nmbd.8
@@ -210,7 +210,7 @@ these to the address below for rectification.
 .BR testprns (1)
 .SH CREDITS
 The original Samba software and related utilities were created by 
-Andrew Tridgell (samba-bugs@anu.edu.au). Andrew is also the Keeper
+Andrew Tridgell (samba-bugs@samba.anu.edu.au). Andrew is also the Keeper
 of the Source for this project.
 
 This man page was originally written by Karl Auer (Karl.Auer@anu.edu.au).
diff --git a/docs/manpages/samba.7 b/docs/manpages/samba.7
index 1621f2e68c..3dd6253ebe 100644
--- a/docs/manpages/samba.7
+++ b/docs/manpages/samba.7
@@ -69,7 +69,7 @@ of the Samba mailing list, at http://samba.canberra.edu.au/pub/samba/
 .SH AUTHOR
 
 The main author of the Samba suite is Andrew Tridgell. He may be
-contacted via e-mail at samba-bugs@anu.edu.au.
+contacted via e-mail at samba-bugs@samba.anu.edu.au.
 
 There have also been an enormous number of contributors to Samba from
 all over the world. A partial list of these contributors is included
@@ -184,7 +184,7 @@ Contributors to the project are (in alphabetical order by email address):
  S{rkel{, Vesa
  	(vesku@rankki.kcl.fi)
  Tridgell, Andrew
- 	(samba-bugs@anu.edu.au)
+ 	(samba-bugs@samba.anu.edu.au)
  Troyer, Dean
  	(troyer@saifr00.ateng.az.honeywell.com)
  Wakelin, Ross
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 2103859903..6761445b89 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -2362,7 +2362,7 @@ You may find that on some systems Samba will say "Unknown socket
 option" when you supply an option. This means you either mis-typed it
 or you need to add an include file to includes.h for your OS. If the
 latter is the case please send the patch to me
-(samba-bugs@anu.edu.au).
+(samba-bugs@samba.anu.edu.au).
 
 Any of the supported socket options may be combined in any way you
 like, as long as your OS allows it.
@@ -2864,7 +2864,7 @@ None known.
 Please send bug reports, comments and so on to:
 
 .RS 3
-.B samba-bugs@anu.edu.au (Andrew Tridgell)
+.B samba-bugs@samba.anu.edu.au (Andrew Tridgell)
 
 .RS 3
 or to the mailing list:
@@ -2887,6 +2887,6 @@ Errors or suggestions for improvements to the Samba man pages should be
 mailed to:
 
 .RS 3
-.B samba-bugs@anu.edu.au (Andrew Tridgell)
+.B samba-bugs@samba.anu.edu.au (Andrew Tridgell)
 .RE
 
diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1
index 7482c7ca76..368c804032 100644
--- a/docs/manpages/smbclient.1
+++ b/docs/manpages/smbclient.1
@@ -1196,7 +1196,7 @@ diagnostics you are seeing.
 None known.
 .SH CREDITS
 The original Samba software and related utilities were created by 
-Andrew Tridgell (samba-bugs@anu.edu.au). Andrew is also the Keeper
+Andrew Tridgell (samba-bugs@samba.anu.edu.au). Andrew is also the Keeper
 of the Source for this project.
 
 This man page was written by Karl Auer (Karl.Auer@anu.edu.au).
diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8
index 7c513cc41e..116b24693d 100644
--- a/docs/manpages/smbd.8
+++ b/docs/manpages/smbd.8
@@ -409,7 +409,7 @@ diagnostics you are seeing.
 None known.
 .SH CREDITS
 The original Samba software and related utilities were created by 
-Andrew Tridgell (samba-bugs@anu.edu.au). Andrew is also the Keeper
+Andrew Tridgell (samba-bugs@samba.anu.edu.au). Andrew is also the Keeper
 of the Source for this project.
 
 This man page was written by Karl Auer (Karl.Auer@anu.edu.au).
diff --git a/docs/manpages/smbrun.1 b/docs/manpages/smbrun.1
index 05056e9720..3f04e3cd8b 100644
--- a/docs/manpages/smbrun.1
+++ b/docs/manpages/smbrun.1
@@ -63,7 +63,7 @@ commands to issue suitable diagnostics to aid trouble-shooting.
 None known.
 .SH CREDITS
 The original Samba software and related utilities were created by 
-Andrew Tridgell (samba-bugs@anu.edu.au). Andrew is also the Keeper
+Andrew Tridgell (samba-bugs@samba.anu.edu.au). Andrew is also the Keeper
 of the Source for this project.
 
 This man page was written by Karl Auer (Karl.Auer@anu.edu.au).
diff --git a/docs/manpages/smbtar.1 b/docs/manpages/smbtar.1
index f6716940ab..70a16afe6f 100644
--- a/docs/manpages/smbtar.1
+++ b/docs/manpages/smbtar.1
@@ -161,7 +161,7 @@ See diagnostics for
 command.
 .SH CREDITS
 The original Samba software and related utilities were created by 
-Andrew Tridgell (samba-bugs@anu.edu.au). Andrew is also the Keeper
+Andrew Tridgell (samba-bugs@samba.anu.edu.au). Andrew is also the Keeper
 of the Source for this project.
 
 Ricky Poulten (poultenr@logica.co.uk) wrote the tar extension and this
diff --git a/docs/manpages/testparm.1 b/docs/manpages/testparm.1
index 8deb1c38c2..a40de28611 100644
--- a/docs/manpages/testparm.1
+++ b/docs/manpages/testparm.1
@@ -95,7 +95,7 @@ Other messages are self-explanatory.
 None known.
 .SH CREDITS
 The original Samba software and related utilities were created by 
-Andrew Tridgell (samba-bugs@anu.edu.au). Andrew is also the Keeper
+Andrew Tridgell (samba-bugs@samba.anu.edu.au). Andrew is also the Keeper
 of the Source for this project.
 
 The
diff --git a/docs/manpages/testprns.1 b/docs/manpages/testprns.1
index 22e77567a7..623163ce58 100644
--- a/docs/manpages/testprns.1
+++ b/docs/manpages/testprns.1
@@ -98,7 +98,7 @@ Other messages are self-explanatory.
 None known.
 .SH CREDITS
 The original Samba software and related utilities were created by 
-Andrew Tridgell (samba-bugs@anu.edu.au). Andrew is also the Keeper
+Andrew Tridgell (samba-bugs@samba.anu.edu.au). Andrew is also the Keeper
 of the Source for this project.
 
 The
diff --git a/docs/samba.lsm b/docs/samba.lsm
index eacfda5ba0..36abbba769 100644
--- a/docs/samba.lsm
+++ b/docs/samba.lsm
@@ -7,9 +7,9 @@ Desc3        = SMB compatible clients such as WinNT, WfWg, OS/2
 Desc4        = and Pathworks. It also includes a ftp-style unix client
 Desc5        = and a netbios nameserver.
 Author       = Andrew Tridgell
-AuthorEmail  = samba-bugs@anu.edu.au
+AuthorEmail  = samba-bugs@samba.anu.edu.au
 Maintainer   = Andrew Tridgell
-MaintEmail   = samba-bugs@anu.edu.au
+MaintEmail   = samba-bugs@samba.anu.edu.au
 Site1        = samba.anu.edu.au
 Path1        = pub/samba/
 File1        = samba-latest.tar.gz
diff --git a/docs/textdocs/BROWSING.txt b/docs/textdocs/BROWSING.txt
index 05d2f96544..9d1e85f531 100644
--- a/docs/textdocs/BROWSING.txt
+++ b/docs/textdocs/BROWSING.txt
@@ -5,53 +5,17 @@ Samba now fully supports browsing. The browsing is supported by nmbd
 and is also controlled by options in the smb.conf file (see
 smb.conf(5)).
 
-Samba can act as a browse master for a workgroup and the ability for 
-samba to support domain logons and scripts is now available with features 
-still being added.  See DOMAIN.txt for more information .
+Samba can act as a browse master for a workgroup and the ability for
+samba to support domain logons and scripts is now available.  See
+DOMAIN.txt for more information on domain logons.
 
 To get browsing to work you need to run nmbd as usual, but will need
 to use the "workgroup" option in smb.conf to control what workgroup
 Samba becomes a part of.
 
-The -G option is most useful for simple setups where Samba is browsable
-in only one workgroup. In more complex cases the lmhosts file is
-better.
-
-Be very careful setting up your lmhosts file. An incorrectly setup
-lmhosts file can have disasterous results for your net!
-
-A simple lmhosts file might be:
-
-# This is a simple lmhosts file
-#
-# This is a host alias. Anyone querying this name
-# will get the specified IP
-192.0.2.17 SMBDATA
-#
-# first put ourselves in workgroup MYGROUP using
-# our own net address
-0.0.0.0 MYGROUP 255.255.255.0 G
-
-Note in the above that I overrode what workgroup Samba is in using the
-G flag. Also note that the 0.0.0.0 address is used, which will be
-automatically replaced with the broadcast address for groups, and with
-the local IP address for other entries.
-
 Samba also has a useful option for a Samba server to offer itself for
-browsing on another subnet.
-
-This works by the lmhosts file specifying a broadcast address on the
-other network to use to find a browse master for the workgroup.
-
-For example if you wanted yourself to appear in the workgroup STAFF on
-the network which has a broadcast of 192.0.3.255 then this entry would
-do the trick:
-
-# put ourselves in the STAFF workgroup on the other subnet
-192.0.3.255 STAFF 255.255.255.0 G
-
-Notice the G at the end! It is very important you include this as this
-entry without the G could cause a broadcast storm! 
+browsing on another subnet. See "remote announce" in the smb.conf man
+page. 
 
 If something doesn't work then hopefully the log.nmb file will
 help you track down the problem. Try a debug level of 2 or 3 for
@@ -74,8 +38,8 @@ are now far more likely to correctly find your broadcast and network
 addess, so in most cases these aren't needed.
 
 The other big problem people have is that their broadcast address,
-netmask or IP address is wrong (specified with the -B, -N and -I
-options to nmbd). 
+netmask or IP address is wrong (specified with the "interfaces" option
+in smb.conf)
 
 FORCING SAMBA TO BE THE MASTER
 ==============================
@@ -87,7 +51,7 @@ election. By default Samba uses a very low precedence and thus loses
 elections to just about anyone else.
 
 If you want Samba to win elections then just set the "os level" global
-option in smb.conf to a higher number. It defaults to 0. Using 33
+option in smb.conf to a higher number. It defaults to 0. Using 34
 would make it win all elections over every other system (except other
 samba systems!)
 
@@ -132,22 +96,9 @@ ends in a 0) then you will strike problems. Windows for Workgroups
 does not seem to support a 0's broadcast and you will probably find
 that browsing and name lookups won't work.
 
-You have a few options:
-
-1) change to a 1's broadcast on your unix server. These often end in
-.255 (check with your local network guru for details)
-
-2) set the nmbd broadcast to a 1's based address on the command line using
-the -B option. This only works if your network setup listens on both
-0s and 1s based broadcasts. The -B option can only control what
-address it sends to, not what it listens on.
-
 MULTIPLE INTERFACES
 ===================
 
 Samba now supports machines with multiple network interfaces. If you
 have multiple interfaces then you will need to use the "interfaces"
 option in smb.conf to configure them. See smb.conf(5) for details.
-
-
-
diff --git a/docs/textdocs/BUGS.txt b/docs/textdocs/BUGS.txt
index 8cccfcf449..099791c156 100644
--- a/docs/textdocs/BUGS.txt
+++ b/docs/textdocs/BUGS.txt
@@ -1,6 +1,6 @@
 This file describes how to report Samba bugs. 
 
->> The email address for bug reports is samba-bugs@anu.edu.au <<
+>> The email address for bug reports is samba-bugs@samba.anu.edu.au <<
 
 Please take the time to read this file before you submit a bug
 report. Also, please see if it has changed between releases, as I
diff --git a/docs/textdocs/DIAGNOSIS.txt b/docs/textdocs/DIAGNOSIS.txt
index 34099e6a16..740f417ed3 100644
--- a/docs/textdocs/DIAGNOSIS.txt
+++ b/docs/textdocs/DIAGNOSIS.txt
@@ -11,7 +11,7 @@ carefully choose them so later tests only use capabilities verified in
 the earlier tests.
 
 I would welcome additions to this set of tests. Please mail them to
-samba-bugs@anu.edu.au
+samba-bugs@samba.anu.edu.au
 
 If you send me an email saying "it doesn't work" and you have not
 followed this test procedure then you should not be surprised if I
@@ -36,7 +36,7 @@ smb.conf. I will assume this share is called "tmp". You can add a
  read only = yes
 
 
-THESE TESTS ASSUME VERSION 1.9.15 OR LATER OF THE SAMBA SUITE. SOME
+THESE TESTS ASSUME VERSION 1.9.16 OR LATER OF THE SAMBA SUITE. SOME
 COMMANDS SHOWN DID NOT EXIST IN EARLIER VERSIONS
 
 
@@ -66,7 +66,7 @@ you do have correct entries for the remainder of these tests.
 TEST 3:
 -------
 
-run the command "smbclient -L BIGSERVER -U%" on the unix box. You
+run the command "smbclient -L BIGSERVER" on the unix box. You
 should get a list of available shares back. 
 
 If you get a error message containing the string "Bad password" then
@@ -86,7 +86,8 @@ If you get a "session request failed" then the server refused the
 connection. If it says "your server software is being unfriendly" then
 its probably because you have invalid command line parameters to smbd,
 or a similar fatal problem with the initial startup of smbd. Also
-check your config file for syntax errors with "testparm". 
+check your config file for syntax errors with "testparm" and that the
+various directories where samba keeps its log and lock files exist.
 
 Another common cause of these two errors is having something already running 
 on port 139, such as Samba (ie smbd is running from inetd already) or something
@@ -101,7 +102,7 @@ run the command "nmblookup -B BIGSERVER __SAMBA__". You should get the
 IP address of your Samba server back.
 
 If you don't then nmbd is incorrectly installed. Check your inetd.conf
-if yu run it from there, or that the daemon is running and listening
+if you run it from there, or that the daemon is running and listening
 to udp port 137.
 
 One common problem is that many inetd implementations can't take many
@@ -116,9 +117,7 @@ run the command "nmblookup -B ACLIENT '*'"
 
 You should get the PCs IP address back. If you don't then the client
 software on the PC isn't installed correctly, or isn't started, or you
-got the name of the PC wrong. Note that you probably won't get a "node
-status response" from the PC due to a bug in the microsoft netbios
-nameserver implementation (it responds to the wrong port number).
+got the name of the PC wrong. 
 
 TEST 6:
 -------
@@ -134,20 +133,9 @@ hosts.
 
 If this doesn't give a similar result to the previous test then
 nmblookup isn't correctly getting your broadcast address through its
-automatic mechanism. In this case you should experiment with the -B
-option which allows you to manually specify the broadcast address,
-overriding the automatic detection. You should try different broadcast
-addresses until your find the one that works. It will most likely be
-something like a.b.c.255 as microsoft tcpip stacks only listen on 1's
-based broadcast addresses. If you get stuck then ask your local
-networking guru for help (and show them this paragraph).
-
-If you find you do need the -B option (ie. the automatic detection
-doesn't work) then you should add the -B option with the right
-broadcast address for your network to the command line of nmbd in
-inetd.conf or in the script you use to start nmbd as a daemon. Once
-you do this go back to the "nmblookup __SAMBA__ -B BIGSERVER" test to
-make sure you have it running properly.
+automatic mechanism. In this case you should experiment use the
+"interfaces" option in smb.conf to manually configure your IP
+address, broadcast and netmask. 
 
 If your PC and server aren't on the same subnet then you will need to
 use the -B option to set the broadcast address to the that of the PCs
@@ -174,6 +162,8 @@ compile in support for them in smbd
 - you have a mixed case password and you haven't enabled the "password
 level" option at a high enough level
 - the "path =" line in smb.conf is incorrect. Check it with testparm
+- you enabled password encryption but didn't create the SMB encrypted
+password file
 
 Once connected you should be able to use the commands "dir" "get"
 "put" etc. Type "help <command>" for instructions. You should
@@ -227,8 +217,8 @@ TEST 10:
 
 From file manager try to browse the server. Your samba server should
 appear in the browse list of your local workgroup (or the one you
-specified in the Makefile). You should be able to double click on the
-name of the server and get a list of shares. If you get a "invalid
+specified in smb.conf). You should be able to double click on the name
+of the server and get a list of shares. If you get a "invalid
 password" error when you do then you are probably running WinNT and it
 is refusing to browse a server that has no encrypted password
 capability and is in user level security mode.
diff --git a/docs/textdocs/DOMAIN.txt b/docs/textdocs/DOMAIN.txt
index 31e19675fa..ee086b0e23 100644
--- a/docs/textdocs/DOMAIN.txt
+++ b/docs/textdocs/DOMAIN.txt
@@ -7,7 +7,8 @@ administration. Support for these kind of things should be added
 sometime in the future.
 
 The domain support only works for WfWg and Win95 clients. Support for
-NT and OS/2 clients is still being worked on.
+NT and OS/2 clients is still being worked on and currently does not
+work. 
 
 Using these features you can make your clients verify their logon via
 the Samba server and make clients run a batch file when they logon to
@@ -39,7 +40,7 @@ For example I have used:
 the choice of batch file is, of course, up to you. The above would
 give each user a separate batch file as the %U will be changed to
 their username automatically. The other standard % macros may also be
-used. You can make the btch files come from a subdirectory by using
+used. You can make the batch files come from a subdirectory by using
 soemthing like:
 
    logon script = scripts\%U.bat
diff --git a/docs/textdocs/PROJECTS b/docs/textdocs/PROJECTS
index cf903f2c6d..d3b2b741e4 100644
--- a/docs/textdocs/PROJECTS
+++ b/docs/textdocs/PROJECTS
@@ -14,7 +14,7 @@ then please let me know! Also, if you are listed below and you have
 any corrections or updates then please let me know.
 
 Email contact:
-samba-bugs@anu.edu.au
+samba-bugs@samba.anu.edu.au
 
 ========================================================================
 Documentation and FAQ
diff --git a/docs/textdocs/Speed.txt b/docs/textdocs/Speed.txt
index 583076a6e3..28bceb658f 100644
--- a/docs/textdocs/Speed.txt
+++ b/docs/textdocs/Speed.txt
@@ -273,4 +273,4 @@ COMMENTS
 If you've read this far then please give me some feedback! Which of
 the above suggestions worked for you?
 
-Mail the samba mailing list or samba-bugs@anu.edu.au
+Mail the samba mailing list or samba-bugs@samba.anu.edu.au