smb.conf.5: Added netbios aliases entry.

Support.txt: One more USA consultant.
Jeremy (jallison@whistle.com)
(This used to be commit df99a780daedf138df82241d4534f103ce9729b1)

diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 49206230da5a9444c18ed32cd6b8f9b286052a3d..938c1ffa7b08d1aa17c85c24d8df6c450d8e03ea 100644 (file)
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -401,6 +401,8 @@ max xmit
 
 message command
 
+netbios aliases
+
 netbios name
 
 nis homedir
@@ -2118,10 +2120,33 @@ kilobytes. The default is 0, which means no limit.
 .B Example:
        min print space = 2000
 
+.SS netbios aliases (G)
+
+This is a list of names that nmbd will advertise as additional
+names by which the Samba server is known. This allows one machine
+to appear in browse lists under multiple names. If a machine is
+acting as a browse server or logon server none of these names
+will be advertised as either browse server or logon servers, only
+the primary name of the machine will be advertised with these
+capabilities.
+
+See also 'netbios name'.
+
+.B Example:
+   netbios aliases = TEST TEST1 TEST2
+
 .SS netbios name (G)
 
 This sets the NetBIOS name by which a Samba server is known. By
 default it is the same as the first component of the host's DNS name.
+If a machine is a browse server or logon server this name (or the
+first component of the hosts DNS name) will be the name that these
+services are advertised under.
+
+See also 'netbios aliases'.
+
+.B Example:
+   netbios name = MYNAME
 
 .SS nis homedir (G)
 Get the home share server from a NIS (or YP) map. For unix systems that

diff --git a/docs/textdocs/Support.txt b/docs/textdocs/Support.txt
index b10a299823a1d7238d1a4a97fce01430b5b3be73..8bbfcca890342c58aed08501f9ecca07040d11f3 100644 (file)
--- a/docs/textdocs/Support.txt
+++ b/docs/textdocs/Support.txt
@@ -27,7 +27,7 @@ Region                             Number of entries
 ----------------------------------------------------
     AFRICA                                        2
     AMERICA - CENTRAL & SOUTH                     3
-    AMERICA - USA                                27
+    AMERICA - USA                                28
     ASIA                                          1
     AUSTRALIA & NEW ZEALAND                      18
     CANADA                                        8
@@ -602,6 +602,20 @@ medium to large Unix systems.  More information is available on our
 web site, http://www.celestial.com/.
 ------------------------------------------------------------------------------
 
+------------------------------------------------------------------------------
+WASHINGTON STATE - USA
+
+Jeff Clithero              jeff@octopi.com     APPGEN Vertical
+Interstellar Octopus, Ltd. Voice 360-379-1754  Accounting Solutions
+1829 Lincoln St.           PgVm  800-893-9517  Integration Services
+Port Townsend, WA USA      FAX   360-379-1753  Sales and Support
+
+We support SAMBA commercially.
+
+In the US/Canada we provide 800 number for our clients and can go
+onsite to customers in the Northwest US and Vancouver, BC areas.
+------------------------------------------------------------------------------
+
 
 \f
 ASIA