docs: Remove most references to Samba-3 and change to just Samba

References are kept where the version number makes sense in the context.

Andrew Bartlett

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

24 files changed, 129 insertions, 129 deletions

diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml b/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml
index 6096975772..69ef78cfda 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-AccessControls.xml
@@ -54,7 +54,7 @@ decade-old MS Windows NT operating system.
 <para>
 <indexterm><primary>network administrator</primary></indexterm>
 The purpose of this chapter is to present each of the points of control that are possible with
-Samba-3 in the hope that this will help the network administrator to find the optimum method
+Samba in the hope that this will help the network administrator to find the optimum method
 for delivering the best environment for MS Windows desktop users.
 </para>
 
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-BDC.xml b/docs-xml/Samba3-HOWTO/TOSHARG-BDC.xml
index 9b69368614..18fdad0e77 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-BDC.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-BDC.xml
@@ -33,8 +33,8 @@ we will do our best to provide a solution.
 <indexterm><primary>BDC</primary></indexterm>
 <indexterm><primary>LDAP</primary><secondary>slave</secondary></indexterm>
 <indexterm><primary>scalability</primary></indexterm>
-Samba-3 can act as a Backup Domain Controller (BDC) to another Samba Primary Domain Controller (PDC). A
-Samba-3 PDC can operate with an LDAP account backend. The LDAP backend can be either a common master LDAP
+Samba can act as a Backup Domain Controller (BDC) to another Samba Primary Domain Controller (PDC). A
+Samba PDC can operate with an LDAP account backend. The LDAP backend can be either a common master LDAP
 server or a slave server. The use of a slave LDAP server has the benefit that when the master is down, clients
 may still be able to log onto the network.  This effectively gives Samba a high degree of scalability and is
 an effective solution for large organizations. If you use an LDAP slave server for a PDC, you will need to
@@ -47,7 +47,7 @@ you will have stability and operational problems.
 <indexterm><primary>replication</primary><secondary>SAM</secondary></indexterm>
 <indexterm><primary>non-LDAP</primary><secondary>backend</secondary></indexterm>
 <indexterm><primary>propagate</primary></indexterm>
-It is not possible to run a Samba-3 BDC with a non-LDAP backend, as that backend must allow some form of
+It is not possible to run a Samba BDC with a non-LDAP backend, as that backend must allow some form of
 "two-way" propagation of changes from the BDC to the master.  At this time only LDAP delivers the capability
 to propagate identity database changes from the BDC to the PDC. The BDC can use a slave LDAP server, while it
 is preferable for the PDC to use as its primary an LDAP master server.
@@ -175,8 +175,8 @@ trigger them to obtain the update and then apply that to their own copy of the S
 <indexterm><primary>SAM</primary><secondary>delta file</secondary></indexterm>
 <indexterm><primary>PDC</primary></indexterm>
 <indexterm><primary>BDC</primary></indexterm>
-Samba-3 cannot participate in true SAM replication and is therefore not able to
-employ precisely the same protocols used by MS Windows NT4. A Samba-3 BDC will
+Samba cannot participate in true SAM replication and is therefore not able to
+employ precisely the same protocols used by MS Windows NT4. A Samba BDC will
 not create SAM update delta files. It will not interoperate with a PDC (NT4 or Samba)
 to synchronize the SAM from delta files that are held by BDCs.
 </para>
@@ -184,8 +184,8 @@ to synchronize the SAM from delta files that are held by BDCs.
 <para>
 <indexterm><primary>PDC</primary></indexterm>
 <indexterm><primary>BDC</primary></indexterm>
-Samba-3 cannot function as a BDC to an MS Windows NT4 PDC, and Samba-3 cannot
-function correctly as a PDC to an MS Windows NT4 BDC. Both Samba-3 and MS Windows
+Samba cannot function as a BDC to an MS Windows NT4 PDC, and Samba-3 cannot
+function correctly as a PDC to an MS Windows NT4 BDC. Both Samba and MS Windows
 NT4 can function as a BDC to its own type of PDC.
 </para>
 
@@ -208,7 +208,7 @@ maintenance of domain security as well as in network integrity.
 In the event that the NT4 PDC should need to be taken out of service, or if it dies, one of the NT4 BDCs can
 be promoted to a PDC. If this happens while the original NT4 PDC is online, it is automatically demoted to an
 NT4 BDC. This is an important aspect of domain controller management. The tool that is used to effect a
-promotion or a demotion is the Server Manager for Domains. It should be noted that Samba-3 BDCs cannot be
+promotion or a demotion is the Server Manager for Domains. It should be noted that Samba BDCs cannot be
 promoted in this manner because reconfiguration of Samba requires changes to the &smb.conf; file. It is easy
 enough to manuall change the &smb.conf; file and then restart relevant Samba network services.
 </para>
@@ -619,7 +619,7 @@ shared. The BDC will however depend on local resolution of UIDs and GIDs via NSS
 <indexterm><primary>ID mapping</primary></indexterm>
 <indexterm><primary>domain member server</primary></indexterm>
 <indexterm><primary>idmap backend</primary></indexterm>
-Samba-3 has introduced a new ID mapping facility. One of the features of this facility is that it
+Samba has introduced a new ID mapping facility. One of the features of this facility is that it
 allows greater flexibility in how user and group IDs are handled in respect to NT domain user and group
 SIDs. One of the new facilities provides for explicitly ensuring that UNIX/Linux UID and GID values
 will be consistent on the PDC, all BDCs, and all domain member servers. The parameter that controls this
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-ConfigSmarts.xml b/docs-xml/Samba3-HOWTO/TOSHARG-ConfigSmarts.xml
index f46cc8e181..0352c06972 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-ConfigSmarts.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-ConfigSmarts.xml
@@ -120,7 +120,7 @@ Those who elect to create multiple Samba servers should have the ability to read
 the Samba source code, and to modify it as needed. This mode of deployment is considered beyond the scope of
 this book. However, if someone will contribute more comprehensive documentation we will gladly review it, and
 if it is suitable extend this section of this chapter. Until such documentation becomes available the hosting
-of multiple samba servers on a single host is considered not supported for Samba-3 by the Samba Team.
+of multiple samba servers on a single host is considered not supported for Samba by the Samba Team.
 </para>
 
 </sect2>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-DomainMember.xml b/docs-xml/Samba3-HOWTO/TOSHARG-DomainMember.xml
index 11f79f7e4d..1c2d5c2b5d 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-DomainMember.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-DomainMember.xml
@@ -55,7 +55,7 @@ server) or a Samba server a member of an MS Windows domain security context.
 <indexterm><primary>ADS</primary></indexterm>
 <indexterm><primary>domain control</primary></indexterm>
 <indexterm><primary>Server Type</primary><secondary>Domain Member</secondary></indexterm>
-Samba-3 can join an MS Windows NT4-style domain as a native member server, an 
+Samba can join an MS Windows NT4-style domain as a native member server, an
 MS Windows Active Directory domain as a native member server, or a Samba domain
 control network. Domain membership has many advantages:
 </para>
@@ -193,7 +193,7 @@ as follows:
 	<indexterm><primary>/etc/passwd</primary></indexterm>
 	A corresponding UNIX account, typically stored in <filename>/etc/passwd</filename>. Work is in progress to
 	allow a simplified mode of operation that does not require UNIX user accounts, but this has not been a feature
-	of the early releases of Samba-3, and is not currently planned for release either.
+	of the early releases of Samba, and is not currently planned for release either.
 	</para></listitem>
 </itemizedlist>
 </para>
@@ -606,7 +606,7 @@ and be fully trusted by it.
 </para>
 
 <sect2>
-<title>Joining an NT4-type Domain with Samba-3</title>
+<title>Joining an NT4-type Domain with Samba</title>
 
 <para><link linkend="assumptions">Assumptions</link> lists names that are used in the remainder of this chapter.</para>
 
@@ -807,7 +807,7 @@ but in most cases the following will suffice:
 <indexterm significance="preferred"><primary>ADS</primary><see>Active Directory</see></indexterm>
 <indexterm><primary>KDC</primary></indexterm>
 <indexterm><primary>Kerberos</primary></indexterm>
-This is a rough guide to setting up Samba-3 with Kerberos authentication against a
+This is a rough guide to setting up Samba with Kerberos authentication against a
 Windows 200x KDC. A familiarity with Kerberos is assumed.
 </para> 
 
@@ -1007,7 +1007,7 @@ On the UNIX/Linux system, this command must be executed by an account that has U
 <indexterm><primary>kinit</primary></indexterm>
 <indexterm><primary>net</primary><secondary>ads</secondary><tertiary>join</tertiary></indexterm>
 When making a Windows client a member of an ADS domain within a complex organization, you
-may want to create the machine trust account within a particular organizational unit. Samba-3 permits
+may want to create the machine trust account within a particular organizational unit. Samba permits
 this to be done using the following syntax:
 <screen>
 &rootprompt; <userinput>kinit Administrator@your.kerberos.REALM</userinput>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-FastStart.xml b/docs-xml/Samba3-HOWTO/TOSHARG-FastStart.xml
index 13a212b385..913022e730 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-FastStart.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-FastStart.xml
@@ -875,16 +875,16 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false
 
 	<para>
 	A more scalable domain control authentication backend option might use
-	Microsoft Active Directory or an LDAP-based backend. Samba-3 provides
-	for both options as a domain member server. As a PDC, Samba-3 is not able to provide
+	Microsoft Active Directory or an LDAP-based backend. Samba provides
+	for both options as a domain member server. As a PDC, Samba is not able to provide
 	an exact alternative to the functionality that is available with Active Directory.
-	Samba-3 can provide a scalable LDAP-based PDC/BDC solution.
+	Samba can provide a scalable LDAP-based PDC/BDC solution.
 	</para>
 
 	<para>
 	The tdbsam authentication backend provides no facility to replicate
 	the contents of the database, except by external means (i.e., there is no self-contained protocol
-	in Samba-3 for Security Account Manager database [SAM] replication).
+	in Samba for Security Account Manager database [SAM] replication).
 	</para>
 
 	<note><para>
@@ -897,7 +897,7 @@ maryo:x:15000:15003:Mary Orville:/home/MIDEARTH/maryo:/bin/false
 		<para>
 		The engineering office network server we present here is designed to demonstrate use
 		of the new tdbsam password backend. The tdbsam
-		facility is new to Samba-3. It is designed to provide many user and machine account controls
+		facility is new to Samba. It is designed to provide many user and machine account controls
 		that are possible with Microsoft Windows NT4. It is safe to use this in smaller networks.
 		</para>
 
@@ -1047,7 +1047,7 @@ net groupmap add ntgroup="QA Team"   unixgroup=qateam    type=d
 		<title>A Big Organization</title>
 
 		<para>
-		In this section we finally get to review in brief a Samba-3 configuration that
+		In this section we finally get to review in brief a Samba configuration that
 		uses a Lightweight Directory Access (LDAP)-based authentication backend. The
 		main reasons for this choice are to provide the ability to host primary
 		and Backup Domain Control (BDC), as well as to enable a higher degree of
@@ -1058,7 +1058,7 @@ net groupmap add ntgroup="QA Team"   unixgroup=qateam    type=d
 			<title>The Primary Domain Controller</title>
 
 			<para>
-			This is an example of a minimal configuration to run a Samba-3 PDC
+			This is an example of a minimal configuration to run a Samba PDC
 			using an LDAP authentication backend. It is assumed that the operating system
 			has been correctly configured.
 			</para>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Group-Mapping.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Group-Mapping.xml
index e2a0abcfd8..300534353c 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Group-Mapping.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Group-Mapping.xml
@@ -406,7 +406,7 @@
 	</para>
 
 	<orderedlist>
-		<listitem><para>For Samba-3 domain controllers and domain member servers/clients.</para></listitem>
+		<listitem><para>For Samba domain controllers and domain member servers/clients.</para></listitem>
 		<listitem><para>To manage domain member Windows workstations.</para></listitem>
 	</orderedlist>
 
@@ -489,7 +489,7 @@
 	When first installed, Windows NT4/200x/XP are preconfigured with certain user, group, and
 	alias entities. Each has a well-known RID. These must be preserved for continued
 	integrity of operation. Samba must be provisioned with certain essential domain groups that require
-	the appropriate RID value. When Samba-3 is configured to use <constant>tdbsam</constant>, the essential
+	the appropriate RID value. When Samba is configured to use <constant>tdbsam</constant>, the essential
 	domain groups are automatically created. It is the LDAP administrator's responsibility to create
 	(provision) the default NT groups.
 	</para>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-IDMAP.xml b/docs-xml/Samba3-HOWTO/TOSHARG-IDMAP.xml
index 89bdec7f6d..91f7a66ad0 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-IDMAP.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-IDMAP.xml
@@ -17,7 +17,7 @@
 <indexterm><primary>GID</primary></indexterm>
 The Microsoft Windows operating system has a number of features that impose specific challenges
 to interoperability with the operating systems on which Samba is implemented. This chapter deals
-explicitly with the mechanisms Samba-3 (version 3.0.8 and later) uses to overcome one of the
+explicitly with the mechanisms Samba (version 3.0.8 and later) uses to overcome one of the
 key challenges in the integration of Samba servers into an MS Windows networking environment.
 This chapter deals with identity mapping (IDMAP) of Windows security identifiers (SIDs)
 to UNIX UIDs and GIDs.
@@ -120,8 +120,8 @@ on Server Types and Security Modes</link>.
 	<indexterm><primary>NT4</primary></indexterm>
 	<indexterm><primary>SID</primary></indexterm>
 	<indexterm><primary>Active Directory</primary></indexterm>
-	Samba-3 can act as a Windows NT4 PDC or BDC, thereby providing domain control protocols that
-	are compatible with Windows NT4. Samba-3 file and print sharing protocols are compatible with
+	Samba can act as a Windows NT4 PDC or BDC, thereby providing domain control protocols that
+	are compatible with Windows NT4. Samba file and print sharing protocols are compatible with
 	all versions of MS Windows products. Windows NT4, as with MS Active Directory,
 	extensively makes use of Windows SIDs.
 	</para>
@@ -130,7 +130,7 @@ on Server Types and Security Modes</link>.
 	<indexterm><primary>MS Windows SID</primary></indexterm>
 	<indexterm><primary>UID</primary></indexterm>
 	<indexterm><primary>GID</primary></indexterm>
-	Samba-3 domain member servers and clients must interact correctly with MS Windows SIDs. Incoming
+	Samba domain member servers and clients must interact correctly with MS Windows SIDs. Incoming
 	Windows SIDs must be translated to local UNIX UIDs and GIDs. Outgoing information from the Samba
 	server must provide to MS Windows clients and servers appropriate SIDs.
 	</para>
@@ -235,7 +235,7 @@ on Server Types and Security Modes</link>.
 				server that is a member of a Windows NT4 domain or an ADS domain. A typical example
 				is an appliance like file server on which no local accounts are configured and
 				winbind is used to obtain account credentials from the domain controllers for the
-				domain. The domain control can be provided by Samba-3, MS Windows NT4, or MS Windows
+				domain. The domain control can be provided by Samba, MS Windows NT4, or MS Windows
 				Active Directory.
 				</para>
 
@@ -452,7 +452,7 @@ on Server Types and Security Modes</link>.
 
 	<para>
 	IDMAP information can be written directly to the LDAP server so long as all domain controllers
-	have access to the master (writable) LDAP server. Samba-3 at this time does not handle LDAP redirects
+	have access to the master (writable) LDAP server. Samba at this time does not handle LDAP redirects
 	in the IDMAP backend. This means that it is is unsafe to use a slave (replicate) LDAP server with
 	the IDMAP facility.
 	</para>
@@ -819,7 +819,7 @@ administrator:x:1000:1013:Administrator:/home/BE/administrator:/bin/bash
 	<para>
 	<indexterm><primary>ADAM</primary></indexterm>
 	<indexterm><primary>ADS</primary></indexterm>
-	The storage of IDMAP information in LDAP can be used with both NT4/Samba-3-style domains and
+	The storage of IDMAP information in LDAP can be used with both NT4/Samba-style domains and
 	ADS domains. OpenLDAP is a commonly used LDAP server for this purpose, although any
 	standards-complying LDAP server can be used. It is therefore possible to deploy this IDMAP
 	configuration using the Sun iPlanet LDAP server, Novell eDirectory, Microsoft ADS plus ADAM,
@@ -855,7 +855,7 @@ administrator:x:1000:1013:Administrator:/home/BE/administrator:/bin/bash
 
 	<para>
 	<indexterm><primary>realm</primary></indexterm>
-	In the case of an NT4 or Samba-3-style domain the <parameter>realm</parameter> is not used, and the
+	In the case of an NT4 or Samba-style domain the <parameter>realm</parameter> is not used, and the
 	command used to join the domain is <command>net rpc join</command>. The above example also demonstrates
 	advanced error-reporting techniques that are documented in <link linkend="dbglvl">Reporting Bugs</link>.
 	</para>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml
index 88e0ed8e13..3209266602 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Install.xml
@@ -123,12 +123,12 @@
 	<title>TDB Database File Information</title>
 
 	<para>
-	This section contains brief descriptions of the databases that are used by Samba-3.
+	This section contains brief descriptions of the databases that are used by Samba.
 	</para>
 
 	<para>
 <indexterm><primary>tdb file locations</primary></indexterm>
-	The directory in which Samba stores the tdb files is determined by compile-time directives. Samba-3 stores
+	The directory in which Samba stores the tdb files is determined by compile-time directives. Samba stores
 	tdb files in two locations. The best way to determine these locations is to execute the following
 	command:
 <screen>
@@ -136,7 +136,7 @@
    PRIVATE_DIR: /etc/samba/private
 </screen>
 	This means that the confidential tdb files are stored in the <filename>/etc/samba/private</filename>
-	directory. Samba-3 also uses a number of tdb files that contain more mundane data. The location of
+	directory. Samba also uses a number of tdb files that contain more mundane data. The location of
 	these files can be found by executing:
 <screen>
 &rootprompt; smbd -b | grep LOCKDIR
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-InterdomainTrusts.xml b/docs-xml/Samba3-HOWTO/TOSHARG-InterdomainTrusts.xml
index 3ea527ba5e..7f9a1c82fa 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-InterdomainTrusts.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-InterdomainTrusts.xml
@@ -27,11 +27,11 @@
 <indexterm><primary>trust relationships</primary></indexterm>
 <indexterm><primary>ADS</primary></indexterm>
 <indexterm><primary>LDAP-based</primary></indexterm>
-Samba-3 supports NT4-style domain trust relationships. This is a feature that many sites
-will want to use if they migrate to Samba-3 from an NT4-style domain and do not want to
+Samba supports NT4-style domain trust relationships. This is a feature that many sites
+will want to use if they migrate to Samba from an NT4-style domain and do not want to
 adopt Active Directory or an LDAP-based authentication backend. This chapter explains
 some background information regarding trust relationships and how to create them. It is now
-possible for Samba-3 to trust NT4 (and vice versa), as well as to create Samba-to-Samba 
+possible for Samba to trust NT4 (and vice versa), as well as to create Samba-to-Samba
 trusts.
 </para>
 
@@ -74,7 +74,7 @@ trusted domain.
 <para>
 <indexterm><primary>scalability</primary></indexterm>
 <indexterm><primary>trust relationships</primary></indexterm>
-Samba-3 can participate in Samba-to-Samba as well as in Samba-to-MS Windows NT4-style
+Samba can participate in Samba-to-Samba as well as in Samba-to-MS Windows NT4-style
 trust relationships. This imparts to Samba scalability similar to that with MS Windows NT4.
 </para>
 
@@ -84,7 +84,7 @@ trust relationships. This imparts to Samba scalability similar to that with MS W
 <indexterm><primary>LDAP</primary></indexterm>
 <indexterm><primary>interdomain trusts</primary></indexterm>
 <indexterm><primary>ADS</primary></indexterm>
-Given that Samba-3 can function with a scalable backend authentication database such as LDAP, and given its
+Given that Samba can function with a scalable backend authentication database such as LDAP, and given its
 ability to run in primary as well as backup domain control modes, the administrator would be well-advised to
 consider alternatives to the use of interdomain trusts simply because, by the very nature of how trusts
 function, this system is fragile.  That was, after all, a key reason for the development and adoption of
@@ -165,7 +165,7 @@ Relationships are explicit and not transitive.
 New to MS Windows 2000 ADS security contexts is the fact that trust relationships are two-way by default.
 Also, all inter-ADS domain trusts are transitive. In the case of the red, white, and blue domains, with
 Windows 2000 and ADS, the red and blue domains can trust each other. This is an inherent feature of ADS
-domains. Samba-3 implements MS Windows NT4-style interdomain trusts and interoperates with MS Windows 200x ADS
+domains. Samba implements MS Windows NT4-style interdomain trusts and interoperates with MS Windows 200x ADS
 security domains in similar manner to MS Windows NT4-style domains.
 </para>
 
@@ -339,7 +339,7 @@ is at an early stage, so do not be surprised if something does not function as i
 <indexterm><primary>Windows NT4 Server</primary></indexterm>
 <indexterm><primary>between domains</primary></indexterm>
 Each of the procedures described next assumes the peer domain in the trust relationship is controlled by a
-Windows NT4 server. However, the remote end could just as well be another Samba-3  domain. It can be clearly
+Windows NT4 server. However, the remote end could just as well be another Samba  domain. It can be clearly
 seen, after reading this document, that combining Samba-specific parts of what's written in the following
 sections leads to trust between domains in a purely Samba environment.
 </para>
@@ -590,7 +590,7 @@ Create a single-sided trust under the NT4 Domain User Manager, then execute:
 </para>
 
 <para>
-It works with Samba-3  and NT4 domains, and also with Samba-3 and Windows 200x ADS in mixed mode.
+It works with Samba  and NT4 domains, and also with Samba-3 and Windows 200x ADS in mixed mode.
 Both domain controllers, Samba and NT must have the same WINS server; otherwise,
 the trust will never work. 
 </para>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-IntroSMB.xml b/docs-xml/Samba3-HOWTO/TOSHARG-IntroSMB.xml
index dec4638e5b..4b259057ed 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-IntroSMB.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-IntroSMB.xml
@@ -72,7 +72,7 @@ should have no difficulty finding answers to your current concerns also.
 	<para>
 	The real people behind Samba are users like you. You have inspired the
 	developers (the Samba Team) to do more than any of them imagined could or should
-	be done. User feedback drives Samba development. Samba-3 in particular incorporates
+	be done. User feedback drives Samba development. Samba in particular incorporates
 	a huge amount of work done as a result of user requests, suggestions and direct
 	code contributions.
 	</para>
@@ -132,7 +132,7 @@ should have no difficulty finding answers to your current concerns also.
 	<para>
 	Existing Samba books are largely addressed to the UNIX administrator.
 	From the perspective of this target group the existing books serve
-	an adequate purpose, with one exception &smbmdash; now that Samba-3 is out
+	an adequate purpose, with one exception &smbmdash; now that Samba is out
 	they need to be updated!
 	</para>
 
@@ -162,7 +162,7 @@ should have no difficulty finding answers to your current concerns also.
 	<variablelist>
 		<varlistentry><term>General Installation</term>
 			<listitem><para>
-			Designed to help you get Samba-3 running quickly.
+			Designed to help you get Samba running quickly.
 			The Fast Start chapter is a direct response to requests from
 			Microsoft network administrators for some sample configurations
 			that <emphasis>just work</emphasis>.
@@ -181,7 +181,7 @@ should have no difficulty finding answers to your current concerns also.
 		<varlistentry><term>Advanced Configuration</term>
 			<listitem><para>
 			The mechanics of network browsing have long been the Achilles heel of
-			all Microsoft Windows users. Samba-3 introduces new user and machine
+			all Microsoft Windows users. Samba introduces new user and machine
 			account management facilities, a new way to map UNIX groups and Windows
 			groups, Interdomain trusts, new loadable file system drivers (VFS), and
 			more. New with this document is expanded printing documentation, as well
@@ -215,7 +215,7 @@ should have no difficulty finding answers to your current concerns also.
 	</variablelist>
 		
 <para>
-Welcome to Samba-3 and the first published document to help you and your users to enjoy a whole
+Welcome to Samba and the first published document to help you and your users to enjoy a whole
 new world of interoperability between Microsoft Windows and the rest of the world.
 </para>
 
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-NT4Migration.xml b/docs-xml/Samba3-HOWTO/TOSHARG-NT4Migration.xml
index 2688e060ac..698ff75f06 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-NT4Migration.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-NT4Migration.xml
@@ -6,13 +6,13 @@
 	<pubdate>April 3, 2003</pubdate>
 </chapterinfo>
 
-<title>Migration from NT4 PDC to Samba-3 PDC</title>
+<title>Migration from NT4 PDC to Samba PDC</title>
 
 <para>
 <indexterm><primary>migrate</primary></indexterm>
 <indexterm><primary>domain control</primary></indexterm>
 This is a rough guide to assist those wishing to migrate from NT4 domain control to
-Samba-3-based domain control.
+Samba-based domain control.
 </para>
 
 <sect1>
@@ -27,7 +27,7 @@ and planned for. Then again, good planning will anticipate most show-stopper-typ
 
 <para>
 <indexterm><primary>migration plan</primary></indexterm>
-Those wishing to migrate from MS Windows NT4 domain control to a Samba-3 domain control
+Those wishing to migrate from MS Windows NT4 domain control to a Samba domain control
 environment would do well to develop a detailed migration plan. So here are a few pointers to
 help migration get underway.
 </para>
@@ -38,7 +38,7 @@ help migration get underway.
 <para>
 <indexterm><primary>migration process</primary></indexterm>
 The key objective for most organizations is to make the migration from MS Windows NT4 
-to Samba-3 domain control as painless as possible. One of the challenges you may experience
+to Samba domain control as painless as possible. One of the challenges you may experience
 in your migration process may well be convincing management that the new environment
 should remain in place. Many who have introduced open source technologies have experienced
 pressure to return to a Microsoft-based platform solution at the first sign of trouble. 
@@ -46,7 +46,7 @@ pressure to return to a Microsoft-based platform solution at the first sign of t
 
 <para>
 <indexterm><primary>change motivations</primary></indexterm>
-Before attempting a migration to a Samba-3-controlled network, make every possible effort to
+Before attempting a migration to a Samba-controlled network, make every possible effort to
 gain all-round commitment to the change. Know precisely <emphasis>why</emphasis> the change
 is important for the organization. Possible motivations to make a change include:
 </para>
@@ -73,15 +73,15 @@ is important for the organization. Possible motivations to make a change include
 <indexterm><primary>migration</primary></indexterm>
 <indexterm><primary>ADS</primary></indexterm>
 <indexterm><primary>without ADS</primary></indexterm>
-Make sure everyone knows that Samba-3 is not MS Windows NT4. Samba-3 offers
+Make sure everyone knows that Samba is not MS Windows NT4. Samba-3 offers
 an alternative solution that is both different from MS Windows NT4 and offers 
-advantages compared with it. Gain recognition that Samba-3 lacks many of the
+advantages compared with it. Gain recognition that Samba lacks many of the
 features that Microsoft has promoted as core values in migration from MS Windows NT4 to 
 MS Windows 2000 and beyond (with or without Active Directory services).
 </para>
 
 <para>
-What are the features that Samba-3 cannot provide?
+What are the features that Samba cannot provide?
 </para>
 
 <indexterm><primary>Active Directory Server</primary></indexterm>
@@ -99,7 +99,7 @@ What are the features that Samba-3 cannot provide?
 </itemizedlist>
 
 <para>
-The features that Samba-3 does provide and that may be of compelling interest to your site
+The features that Samba does provide and that may be of compelling interest to your site
 include:
 </para>
 
@@ -134,7 +134,7 @@ include:
 
 <para>
 <indexterm><primary>successful migration</primary></indexterm>
-Before migrating a network from MS Windows NT4 to Samba-3, consider all necessary factors. Users
+Before migrating a network from MS Windows NT4 to Samba, consider all necessary factors. Users
 should be educated about changes they may experience so the change will be a welcome one
 and not become an obstacle to the work they need to do. The following sections explain factors that will 
 help ensure a successful migration.
@@ -160,11 +160,11 @@ help ensure a successful migration.
 <indexterm><primary>master server</primary></indexterm>
 <indexterm><primary>slave servers</primary></indexterm>
 <indexterm><primary>multiple domains</primary></indexterm>
-Samba-3 can be configured as a domain controller, a backup domain controller (probably best called
+Samba can be configured as a domain controller, a backup domain controller (probably best called
 a secondary controller), a domain member, or a standalone server. The Windows network security
 domain context should be sized and scoped before implementation. Particular attention needs to be
 paid to the location of the Primary Domain Controller (PDC) as well as backup controllers (BDCs).
-One way in which Samba-3 differs from Microsoft technology is that if one chooses to use an LDAP
+One way in which Samba differs from Microsoft technology is that if one chooses to use an LDAP
 authentication backend, then the same database can be used by several different domains. In a
 complex organization, there can be a single LDAP database, which itself can be distributed (have
 a master server and multiple slave servers) that can simultaneously serve multiple domains.
@@ -281,9 +281,9 @@ Management.
 <para>
 <indexterm><primary>SID</primary></indexterm>
 <indexterm><primary>NTuser.DAT</primary></indexterm>
-Profiles may also be managed using the Samba-3 tool <command>profiles</command>. This tool allows the MS
+Profiles may also be managed using the Samba tool <command>profiles</command>. This tool allows the MS
 Windows NT-style security identifiers (SIDs) that are stored inside the profile
-<filename>NTuser.DAT</filename> file to be changed to the SID of the Samba-3 domain.
+<filename>NTuser.DAT</filename> file to be changed to the SID of the Samba domain.
 </para>
 </sect3>
 
@@ -295,8 +295,8 @@ Windows NT-style security identifiers (SIDs) that are stored inside the profile
 <indexterm><primary>migrate user</primary></indexterm>
 <indexterm><primary>migrate group</primary></indexterm>
 <indexterm><primary>map</primary></indexterm>
-It is possible to migrate all account settings from an MS Windows NT4 domain to Samba-3. Before
-attempting to migrate user and group accounts, you are STRONGLY advised to create in Samba-3 the
+It is possible to migrate all account settings from an MS Windows NT4 domain to Samba. Before
+attempting to migrate user and group accounts, you are STRONGLY advised to create in Samba the
 groups that are present on the MS Windows NT4 domain <emphasis>AND</emphasis> to map them to
 suitable UNIX/Linux groups. By following this simple advice, all user and group attributes
 should migrate painlessly.
@@ -321,7 +321,7 @@ The approximate migration process is described below.
 <indexterm><primary>domain controller</primary></indexterm>
 <indexterm><primary>netlogon share</primary></indexterm>
 <indexterm><primary>BDC</primary></indexterm>
-	Samba-3 is set up as a domain controller with netlogon share, profile share, and so on. Configure the &smb.conf; file
+	Samba is set up as a domain controller with netlogon share, profile share, and so on. Configure the &smb.conf; file
 	to function as a BDC: <parameter>domain master = No</parameter>.
 	</para></listitem>
 </itemizedlist>
@@ -414,7 +414,7 @@ generally fit into three basic categories. <link linkend="majtypes">Following ta
 
 <para>
 There are three basic choices for sites that intend to migrate from MS Windows NT4
-to Samba-3:
+to Samba:
 </para>
 
 <itemizedlist>
@@ -472,7 +472,7 @@ being contemplated.
 	<entry><para>Improve on NT4 functionality, enhance management capabilities</para></entry>
 	</row>
 	<row>
-	<entry><para>Move all accounts from NT4 into Samba-3</para></entry>
+	<entry><para>Move all accounts from NT4 into Samba</para></entry>
 	<entry><para>Copy and improve</para></entry>
 	<entry><para>Authentication regime (database location and access)</para></entry>
 	</row>
@@ -492,7 +492,7 @@ being contemplated.
 	<entry><para>Identify Needs for: <emphasis>Manageability, Scalability, Security, Availability</emphasis></para></entry>
 	</row>
 	<row>
-	<entry><para>Integrate Samba-3, then migrate while users are active, then change of control (swap out)</para></entry>
+	<entry><para>Integrate Samba, then migrate while users are active, then change of control (swap out)</para></entry>
 	<entry><para>Take advantage of lower maintenance opportunity</para></entry>
 	<entry><para></para></entry>
 	</row>
@@ -502,12 +502,12 @@ being contemplated.
 </sect2>
 
 <sect2>
-<title>Samba-3 Implementation Choices</title>
+<title>Samba Implementation Choices</title>
 
 <variablelist>
 		<varlistentry><term>Authentication Database/Backend</term><listitem>
 		<para>
-		Samba-3 can use an external authentication backend:
+		Samba can use an external authentication backend:
 		</para>
 
 		<para>
@@ -515,7 +515,7 @@ being contemplated.
 			<listitem><para>Winbind (external Samba or NT4/200x server).</para></listitem>
 			<listitem><para>External server could use Active Directory or NT4 domain.</para></listitem>
 			<listitem><para>Can use pam_mkhomedir.so to autocreate home directories.</para></listitem>
-			<listitem><para> Samba-3 can use a local authentication backend: <parameter>smbpasswd</parameter>,
+			<listitem><para> Samba can use a local authentication backend: <parameter>smbpasswd</parameter>,
 				<parameter>tdbsam</parameter>, <parameter>ldapsam</parameter>
 			</para></listitem>
 		</itemizedlist></para></listitem>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml b/docs-xml/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml
index d732f3a31d..8743079bd2 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-NetworkBrowsing.xml
@@ -43,7 +43,7 @@ Dynamic-DNS service for NetBIOS networking names.
 <indexterm><primary>DNS</primary></indexterm>
 <indexterm><primary>ADS</primary></indexterm>
 MS Windows 2000 and later versions can be configured to operate with no NetBIOS
-over TCP/IP. Samba-3 and later versions also support this mode of operation.
+over TCP/IP. Samba and later versions also support this mode of operation.
 When the use of NetBIOS over TCP/IP has been disabled, the primary
 means for resolution of MS Windows machine names is via DNS and Active Directory.
 The following information assumes that your site is running NetBIOS over TCP/IP.
@@ -1562,7 +1562,7 @@ document.
 <indexterm><primary>NetBIOS over TCP/IP</primary></indexterm>
 <indexterm><primary>DNS/LDAP/ADS</primary></indexterm>
 <indexterm><primary>name resolution</primary></indexterm>
-MS Windows 2000 and later versions, as with Samba-3 and later versions, can be
+MS Windows 2000 and later versions, as with Samba and later versions, can be
 configured to not use NetBIOS over TCP/IP. When configured this way,
 it is imperative that name resolution (using DNS/LDAP/ADS) be correctly
 configured and operative. Browsing will not work if name resolution
@@ -1745,7 +1745,7 @@ settings; for Samba, this is in the &smb.conf; file.
 <indexterm><primary>NetBIOS over TCP/IP</primary></indexterm>
 <indexterm><primary>ADS</primary></indexterm>
 <indexterm><primary>DNS</primary></indexterm>
-It is possible to operate Samba-3 without NetBIOS over TCP/IP. If you do this, be warned that if used outside
+It is possible to operate Samba without NetBIOS over TCP/IP. If you do this, be warned that if used outside
 of MS ADS, this will forgo network browsing support. ADS permits network browsing support through DNS,
 providing appropriate DNS records are inserted for all Samba servers.
 </para>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml b/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml
index 2b12e11f19..bc5f61489a 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-PDC.xml
@@ -240,7 +240,7 @@ The following functionalities are not provided by Samba-4:
 
 <para>
 <indexterm><primary>group</primary><secondary>mapping</secondary></indexterm>
-Samba-3 implements group mapping between Windows NT groups and UNIX groups (this is really quite complicated
+Samba implements group mapping between Windows NT groups and UNIX groups (this is really quite complicated
 to explain in a short space). This is discussed more fully in <link linkend="groupmapping">Group Mapping: MS
 Windows and UNIX</link>.
 </para>
@@ -412,7 +412,7 @@ sustainable choice and competition in the FIM market place.
 <indexterm><primary>identity information</primary></indexterm>
 Primary domain control, if it is to be scalable to meet the needs of large sites, must therefore be capable of
 using LDAP. The rapid adoption of OpenLDAP, and Samba configurations that use it, is ample proof that the era
-of the directory has started. Samba-3 does not demand the use of LDAP, but the demand for a mechanism by which
+of the directory has started. Samba does not demand the use of LDAP, but the demand for a mechanism by which
 user and group identity information can be distributed makes it an an unavoidable option.
 </para>
 
@@ -511,7 +511,7 @@ particular logon authentication request.
 <indexterm><primary>promote</primary></indexterm>
 <indexterm><primary>demote</primary></indexterm>
 A Windows NT4 BDC can be promoted to a PDC. If the PDC is online at the time that a BDC is promoted to PDC,
-the previous PDC is automatically demoted to a BDC. With Samba-3, this is not an automatic operation; the PDC
+the previous PDC is automatically demoted to a BDC. With Samba, this is not an automatic operation; the PDC
 and BDC must be manually configured, and other appropriate changes also need to be made.
 </para>
 
@@ -535,8 +535,8 @@ time choices offered are:
 <para>
 <indexterm><primary>domain</primary><secondary>control</secondary><tertiary>role</tertiary></indexterm>
 <indexterm><primary>native member</primary></indexterm>
-Samba-3 servers can readily be converted to and from domain controller roles through simple changes to the
-&smb.conf; file. Samba-3 is capable of acting fully as a native member of a Windows 200x server Active
+Samba servers can readily be converted to and from domain controller roles through simple changes to the
+&smb.conf; file. Samba is capable of acting fully as a native member of a Windows 200x server Active
 Directory domain.
 </para>
 
@@ -550,8 +550,8 @@ domain member server to or from a domain control, and to install or remove activ
 <para>
 <indexterm><primary>replication</primary><secondary>SAM</secondary></indexterm>
 <indexterm><primary>SAM</primary><secondary>replication</secondary></indexterm>
-New to Samba-3 is the ability to function fully as an MS Windows NT4-style domain controller,
-excluding the SAM replication components. However, please be aware that Samba-3 also supports the
+New to Samba is the ability to function fully as an MS Windows NT4-style domain controller,
+excluding the SAM replication components. However, please be aware that Samba also supports the
 MS Windows 200x domain control protocols.
 </para>
 
@@ -604,7 +604,7 @@ information regarding domain membership.
 </para></note>
 
 <para>
-The following are necessary for configuring Samba-3 as an MS Windows NT4-style PDC for MS Windows
+The following are necessary for configuring Samba as an MS Windows NT4-style PDC for MS Windows
 NT4/200x/XP clients:
 </para>
 
@@ -666,7 +666,7 @@ A domain controller is an SMB/CIFS server that:
 <indexterm><primary>browse list</primary></indexterm>
 It is rather easy to configure Samba to provide these. Each Samba domain controller must provide the NETLOGON
 service that Samba calls the <smbconfoption name="domain logons"/> functionality (after the name of the
-parameter in the &smb.conf; file). Additionally, one server in a Samba-3 domain must advertise itself as the
+parameter in the &smb.conf; file). Additionally, one server in a Samba domain must advertise itself as the
 domain master browser.<footnote><para>See <link linkend="NetworkBrowsing">Network
 Browsing</link>.</para></footnote> This causes the PDC to claim a domain-specific NetBIOS name that identifies
 it as a DMB for its given domain or workgroup. Local master browsers (LMBs) in the same domain or workgroup on
@@ -789,7 +789,7 @@ The basic options shown in <link linkend="pdc-example">this example</link> are e
 		<indexterm><primary></primary></indexterm>
 		This share is used to store user desktop profiles. Each user must have a directory at the root
 		of this share. This directory must be write-enabled for the user and must be globally read-enabled.
-		Samba-3 has a VFS module called <quote>fake_permissions</quote> that may be installed on this share. This will
+		Samba has a VFS module called <quote>fake_permissions</quote> that may be installed on this share. This will
 		allow a Samba administrator to make the directory read-only to everyone. Of course this is useful
 		only after the profile has been properly created.
 		</para></listitem>
@@ -1092,7 +1092,7 @@ sure that you have the entry correct for the Machine Trust Account in <filename>
 the Samba PDC.  If you added the account using an editor rather than using the smbpasswd utility, make sure
 that the account name is the machine NetBIOS name with a <quote>$</quote> appended to it (i.e.,
 computer_name$). There must be an entry in both the POSIX UNIX system account backend as well as in the
-SambaSAMAccount backend. The default backend for Samba-3 (i.e., the parameter <parameter>passdb
+SambaSAMAccount backend. The default backend for Samba (i.e., the parameter <parameter>passdb
 backend</parameter> is not specified in the &smb.conf; file, or if specified is set to
 <literal>smbpasswd</literal>, are respectively the <filename>/etc/passwd</filename> and
 <filename>/etc/samba/smbpasswd</filename> (or <filename>/usr/local/samba/lib/private/smbpasswd</filename> if
@@ -1139,7 +1139,7 @@ then try again.
 After successfully joining the domain, user logons fail with one of two messages: one to the
 effect that the domain controller cannot be found; the other claims that the account does not
 exist in the domain or that the password is incorrect. This may be due to incompatible
-settings between the Windows client and the Samba-3 server for <emphasis>schannel</emphasis>
+settings between the Windows client and the Samba server for <emphasis>schannel</emphasis>
 (secure channel) settings or <emphasis>smb signing</emphasis> settings. Check your Samba
 settings for <emphasis>client schannel</emphasis>, <emphasis>server schannel</emphasis>,
 <emphasis>client signing</emphasis>, <emphasis>server signing</emphasis> by executing:
@@ -1155,7 +1155,7 @@ Control Panel. The Policy settings are found in the Local Policies/Security Opti
 </para>
 
 <para>
-It is important that these be set consistently with the Samba-3 server settings.
+It is important that these be set consistently with the Samba server settings.
 </para>
 
 </sect2>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Passdb.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Passdb.xml
index 456c7ceab4..e301489a25 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Passdb.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Passdb.xml
@@ -110,7 +110,7 @@ entities.
 <title>New Account Storage Systems</title>
 
 <para>
-Samba-3 introduces a number of new password backend capabilities.
+Samba introduces a number of new password backend capabilities.
 <indexterm><primary>SAM backend</primary><secondary>tdbsam</secondary></indexterm>
 <indexterm><primary>SAM backend</primary><secondary>ldapsam</secondary></indexterm>
 </para>
@@ -137,7 +137,7 @@ Samba-3 introduces a number of new password backend capabilities.
 			The <emphasis>tdbsam</emphasis> password backend stores the old <emphasis>
 			smbpasswd</emphasis> information plus the extended MS Windows NT/200x
 			SAM information into a binary format TDB (trivial database) file.
-			The inclusion of the extended information makes it possible for Samba-3
+			The inclusion of the extended information makes it possible for Samba
 			to implement the same account and system access controls that are possible
 			with MS Windows NT4/200x-based systems.
 			</para>
@@ -169,7 +169,7 @@ Samba-3 introduces a number of new password backend capabilities.
 <indexterm><primary>Samba schema</primary></indexterm>
 <indexterm><primary>schema file</primary></indexterm>
 <indexterm><primary>examples/LDAP</primary></indexterm>
-			Samba-3 has a new and extended LDAP implementation that requires configuration
+			Samba has a new and extended LDAP implementation that requires configuration
 			of OpenLDAP with a new format Samba schema. The new format schema file is
 			included in the <filename class="directory">examples/LDAP</filename> directory of the Samba distribution.
 			</para>
@@ -480,7 +480,7 @@ Samba-3 introduces a number of new password backend capabilities.
 <indexterm><primary>domain member servers</primary></indexterm>
 <indexterm><primary>NFS</primary></indexterm>
 <indexterm><primary>rsync</primary></indexterm>
-	Samba-3 has a special facility that makes it possible to maintain identical UIDs and GIDs
+	Samba has a special facility that makes it possible to maintain identical UIDs and GIDs
 	on all servers in a distributed network. A distributed network is one where there exists
 	a PDC, one or more BDCs, and/or one or more domain member servers. Why is this important?
 	This is important if files are being shared over more than one protocol (e.g., NFS) and where
@@ -974,7 +974,7 @@ is being added to the <command>net</command> toolset (see <link linkend="NetComm
 		The need to be familiar with the Samba tools and facilities that permit information systems operation
 		in compliance with government laws and regulations is clear to all. The <command>pdbedit</command> is
 		currently the only Samba tool that provides the capacity to manage account and systems access controls
-		and policies. During the remaining life-cycle of the Samba-3 series it is possible the new tools may
+		and policies. During the remaining life-cycle of the Samba series it is possible the new tools may
 		be implemented to aid in this important area.
 		</para>
 
@@ -1600,7 +1600,7 @@ To set the maximum (infinite) lockout time use the value of -1.
 <warning><para>
 Account policies must be set individually on each PDC and BDC. At this time (Samba 3.0.11 to Samba 3.0.14a)
 account policies are not replicated automatically. This may be fixed before Samba 3.0.20 ships or some
-time there after. Please check the WHATSNEW.txt file in the Samba-3 tarball for specific update notiations
+time there after. Please check the WHATSNEW.txt file in the Samba tarball for specific update notiations
 regarding this facility.
 </para></warning>
 
@@ -2063,7 +2063,7 @@ objectclass: dcObject
 objectclass: organization
 dc: quenya
 o: Quenya Org Network
-description: The Samba-3 Network LDAP Example
+description: The Samba Network LDAP Example
 
 # Organizational Role for Directory Management
 dn: cn=Manager,dc=quenya,dc=org
@@ -2140,7 +2140,7 @@ userPassword: {SSHA}c3ZM9tBaBo9autm1dL3waDS21+JSfQVz
 		<note><para>
 <indexterm><primary>secrets.tdb</primary></indexterm>
 		Before Samba can access the LDAP server, you need to store the LDAP admin password
-		in the Samba-3 <filename>secrets.tdb</filename> database by:
+		in the Samba <filename>secrets.tdb</filename> database by:
 <indexterm><primary>smbpasswd</primary></indexterm>
 <screen>
 &rootprompt;<userinput>smbpasswd -w <replaceable>secret</replaceable></userinput>
@@ -2270,11 +2270,11 @@ userPassword: {SSHA}c3ZM9tBaBo9autm1dL3waDS21+JSfQVz
 <indexterm><primary>posixGroup</primary></indexterm>
 <indexterm><primary>Domain Groups</primary></indexterm>
 <indexterm><primary>ADS</primary></indexterm>
-			In Samba-3, the group management system is based on POSIX
+			In Samba, the group management system is based on POSIX
 			groups. This means that Samba makes use of the posixGroup ObjectClass.
 			For now, there is no NT-like group system management (global and local
-			groups). Samba-3 knows only about <constant>Domain Groups</constant>
-			and, unlike MS Windows 2000 and Active Directory, Samba-3 does not
+			groups). Samba knows only about <constant>Domain Groups</constant>
+			and, unlike MS Windows 2000 and Active Directory, Samba does not
 			support nested groups.
 			</para>
 
@@ -2537,7 +2537,7 @@ sambaNTPassword: 878D8014606CDA29677A44EFA1353FC7
 		<title>Password Synchronization</title>
 
 		<para>
-		Samba-3 and later can update the non-Samba (LDAP) password stored with an account. When
+		Samba and later can update the non-Samba (LDAP) password stored with an account. When
 		using pam_ldap, this allows changing both UNIX and Windows passwords at once.
 		</para>
 
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Printing.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Printing.xml
index 6d4624c86d..ede13c455f 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Printing.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Printing.xml
@@ -564,7 +564,7 @@ globally set share settings and specify other values).
 <indexterm><primary>SOFTQ printing system</primary></indexterm>
 		The <smbconfoption name="printing"/> parameter is normally a service-level parameter. Since it is included
 		here in the <smbconfsection name="[global]"/> section, it will take effect for all printer shares that are not
-		defined differently. Samba-3 no longer supports the SOFTQ printing system.
+		defined differently. Samba no longer supports the SOFTQ printing system.
 		</para></caution>
 	</listitem></varlistentry>
 
@@ -1092,7 +1092,7 @@ The additional functionality provided by the new SPOOLSS support includes:
 <para>
 <indexterm><primary>ADS</primary></indexterm>
 <indexterm><primary>LDAP</primary></indexterm>
-A benefit of updating is that Samba-3 is able to publish its printers to Active Directory (or LDAP).
+A benefit of updating is that Samba is able to publish its printers to Active Directory (or LDAP).
 </para>
 
 <para>
@@ -1197,7 +1197,7 @@ system, which is responsible for all further processing, as needed.
 <indexterm><primary>read-write access</primary></indexterm>
 <indexterm><primary>ACLs</primary></indexterm>
 	These parameters, including the <parameter>printer driver file</parameter> parameter,
-	are now removed and cannot be used in installations of Samba-3. The share name
+	are now removed and cannot be used in installations of Samba. The share name
 	<smbconfsection name="[print$]"/> is now used for the location of downloadable printer
 	drivers. It is taken from the <smbconfsection name="[print$]"/> service created
 	by Windows NT PCs when a printer is shared by them. Windows NT print servers always have a
@@ -3157,7 +3157,7 @@ follow several paths. Here are possible scenarios for migration:
 
 	<listitem><para>
 	An existing <filename>printers.def</filename> file (the one specified in the now removed parameter
-	<parameter>printer driver file</parameter>) will no longer work with Samba-3. In 3.0, smbd attempts
+	<parameter>printer driver file</parameter>) will no longer work with Samba. In 3.0, smbd attempts
 	to locate Windows 9x/Me driver files for the printer in <smbconfsection name="[print$]"/>
 	and additional settings in the TDB and only there; if it fails, it will <emphasis>not</emphasis>
 	(as 2.2.x used to do) drop down to using a <filename>printers.def</filename> (and all associated
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml b/docs-xml/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml
index 48c99c542c..ff762ad34d 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-ProfileMgmt.xml
@@ -1174,7 +1174,7 @@ it is necessary to disable roaming profile handling in the registry of each such
 </para>
 
 <para>
-With Samba-3, you can have a global profile setting in &smb.conf;, and you can override this by
+With Samba, you can have a global profile setting in &smb.conf;, and you can override this by
 per-user settings using the Domain User Manager (as with MS Windows NT4/200x). </para>
 
 <para> In any case, you can configure only one profile per user. That profile can be either: </para>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-RightsAndPriviliges.xml b/docs-xml/Samba3-HOWTO/TOSHARG-RightsAndPriviliges.xml
index dc6125e1d6..94f535e3e1 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-RightsAndPriviliges.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-RightsAndPriviliges.xml
@@ -110,7 +110,7 @@ must be defined in the <smbconfsection name="global"/> section of the &smb.conf;
 <indexterm><primary>rights</primary></indexterm>
 <indexterm><primary>privileges</primary></indexterm>
 <indexterm><primary>manage privileges</primary></indexterm>
-Currently, the rights supported in Samba-3 are listed in <link linkend="rp-privs"/>.
+Currently, the rights supported in Samba are listed in <link linkend="rp-privs"/>.
 The remainder of this chapter explains how to manage and use these privileges on Samba servers.
 </para>
 
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-ServerType.xml b/docs-xml/Samba3-HOWTO/TOSHARG-ServerType.xml
index 4d672c6dd1..8fc837de92 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-ServerType.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-ServerType.xml
@@ -64,18 +64,18 @@ So, what are the benefits of the features mentioned in this chapter?
 <itemizedlist>
 	<listitem><para>
 	<indexterm><primary>domain</primary><secondary>controller</secondary></indexterm>
-	Samba-3 can replace an MS Windows NT4 domain controller.
+	Samba can replace an MS Windows NT4 domain controller.
 	</para></listitem>
 
 	<listitem><para>
 	<indexterm><primary>active directory</primary></indexterm>
-	Samba-3 offers excellent interoperability with MS Windows NT4-style
+	Samba offers excellent interoperability with MS Windows NT4-style
 	domains as well as natively with Microsoft Active Directory domains.
 	</para></listitem>
 
 	<listitem><para>
 	<indexterm><primary>interdomain</primary><secondary>trustrs</secondary></indexterm>
-	Samba-3 permits full NT4-style interdomain trusts.
+	Samba permits full NT4-style interdomain trusts.
 	</para></listitem>
 
 	<listitem><para>
@@ -88,7 +88,7 @@ So, what are the benefits of the features mentioned in this chapter?
 	<listitem><para>
 	<indexterm><primary>account</primary><secondary>database</secondary><tertiary>backends</tertiary></indexterm>
 	<indexterm><primary>encrypted</primary></indexterm>
-	Samba-3 permits use of multiple concurrent account database backends.
+	Samba permits use of multiple concurrent account database backends.
 	(Encrypted passwords that are stored in the account database are in
 	formats that are unique to Windows networking).
 	</para></listitem>
@@ -96,7 +96,7 @@ So, what are the benefits of the features mentioned in this chapter?
 	<listitem><para>
 	<indexterm><primary>replicated</primary></indexterm>
 	The account database backends can be distributed
-	and replicated using multiple methods. This gives Samba-3
+	and replicated using multiple methods. This gives Samba
 	greater flexibility than MS Windows NT4 and in many cases a
 	significantly higher utility than Active Directory domains
 	with MS Windows 200x.
@@ -388,7 +388,7 @@ domain members. This is contrary to popular belief.
 </para>
 
 <para>
-If you are using Active Directory, starting with Samba-3 you can join as a native AD member. Why would you
+If you are using Active Directory, starting with Samba you can join as a native AD member. Why would you
 want to do that?  Your security policy might prohibit the use of NT-compatible authentication protocols. All
 your machines are running Windows 2000 and above and all use Kerberos. In this case, Samba, as an NT4-style
 domain, would still require NT-compatible authentication data. Samba in AD-member mode can accept Kerberos
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml b/docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml
index 6e96ad1e1a..50c0760f0f 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-TheNetCommand.xml
@@ -16,7 +16,7 @@
 <indexterm><primary>remote management</primary></indexterm>
 <indexterm><primary>command-line</primary></indexterm>
 <indexterm><primary>scripted control</primary></indexterm>
-The <command>net</command> command is one of the new features of Samba-3 and is an attempt to provide a useful
+The <command>net</command> command is one of the new features of Samba and is an attempt to provide a useful
 tool for the majority of remote management operations necessary for common tasks. The <command>net</command>
 tool is flexible by design and is intended for command-line use as well as for scripted control application.
 </para>
@@ -37,7 +37,7 @@ provided should look at the <command>net</command> command before searching else
 </para>
 
 <para>
-A Samba-3 administrator cannot afford to gloss over this chapter because to do so will almost certainly cause
+A Samba administrator cannot afford to gloss over this chapter because to do so will almost certainly cause
 the infliction of self-induced pain, agony, and desperation. Be warned: this is an important chapter.
 </para>
 
@@ -51,7 +51,7 @@ the infliction of self-induced pain, agony, and desperation. Be warned: this is
 <indexterm><primary>BDC</primary></indexterm>
 <indexterm><primary>DMS</primary></indexterm>
 <indexterm><primary>authentication</primary></indexterm>
-	The tasks that follow the installation of a Samba-3 server, whether standalone or domain member, of a
+	The tasks that follow the installation of a Samba server, whether standalone or domain member, of a
 	domain controller (PDC or BDC) begins with the need to create administrative rights. Of course, the
 	creation of user and group accounts is essential for both a standalone server and a PDC.
 	In the case of a BDC or a Domain Member server (DMS), domain user and group accounts are obtained from
@@ -83,7 +83,7 @@ the infliction of self-induced pain, agony, and desperation. Be warned: this is
 <indexterm><primary>domain authentication</primary></indexterm>
 <indexterm><primary>trust accounts</primary></indexterm>
 <indexterm><primary>net</primary></indexterm>
-	UNIX systems that are hosting a Samba-3 server that is running as a member (PDC, BDC, or DMS) must have
+	UNIX systems that are hosting a Samba server that is running as a member (PDC, BDC, or DMS) must have
 	a machine security account in the domain authentication database (or directory). The creation of such
 	security (or trust) accounts is also handled using the <command>net</command> command.
 	</para>
@@ -107,7 +107,7 @@ the infliction of self-induced pain, agony, and desperation. Be warned: this is
 <indexterm><primary>net</primary></indexterm>
 <indexterm><primary>man pages</primary></indexterm>
 	The overall picture should be clear now: the <command>net</command> command plays a central role
-	on the Samba-3 stage. This role will continue to be developed. The inclusion of this chapter is
+	on the Samba stage. This role will continue to be developed. The inclusion of this chapter is
 	evidence of its importance, one that has grown in complexity to the point that it is no longer considered
 	prudent to cover its use fully in the online UNIX man pages.
 	</para>
@@ -165,7 +165,7 @@ the infliction of self-induced pain, agony, and desperation. Be warned: this is
 <indexterm><primary>domain</primary><secondary>groups</secondary></indexterm>
 <indexterm><primary>local</primary><secondary>groups</secondary></indexterm>
 <indexterm><primary>domain user accounts</primary></indexterm>
-	Samba-3 recognizes two types of groups: <emphasis>domain groups</emphasis> and <emphasis>local
+	Samba recognizes two types of groups: <emphasis>domain groups</emphasis> and <emphasis>local
 	groups</emphasis>. Domain groups can contain (have as members) only domain user accounts. Local groups
 	can contain local users, domain users, and domain groups as members.
 	</para>
@@ -1069,7 +1069,7 @@ Deleted user account.
 	</para>
 
 	<para>
-	A Samba-3 server that is a Windows ADS domain member can execute the following command to detach from the
+	A Samba server that is a Windows ADS domain member can execute the following command to detach from the
 	domain:
 <indexterm><primary>net</primary><secondary>ads</secondary><tertiary>leave</tertiary></indexterm>
 <screen>
@@ -1760,7 +1760,7 @@ Computer             User name            Client Type        Opens Idle time
 	<title>Printers and ADS</title>
 
 	<para>
-	When Samba-3 is used within an MS Windows ADS environment, printers shared via Samba will not be browseable
+	When Samba is used within an MS Windows ADS environment, printers shared via Samba will not be browseable
 	until they have been published to the ADS domain. Information regarding published printers may be obtained
 	from the ADS server by executing the <command>net ads print info</command> command following this syntax:
 <indexterm><primary>net</primary><secondary>ads</secondary><tertiary>printer info</tertiary></indexterm>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Unicode.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Unicode.xml
index 440498f53b..145f6d31a6 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Unicode.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Unicode.xml
@@ -38,7 +38,7 @@ is deserving of special mention.
 <para>
 <indexterm><primary>codepages</primary></indexterm>
 Samba-2.x supported a single locale through a mechanism called 
-<emphasis>codepages</emphasis>. Samba-3 is destined to become a truly transglobal
+<emphasis>codepages</emphasis>. Samba is destined to become a truly transglobal
 file- and printer-sharing platform.
 </para>
 
@@ -421,7 +421,7 @@ Setting up Japanese charsets is quite difficult. This is mainly because:
 			</para>
 
 			<para>
-			To use CAP encoding on Samba-3, you should use the unix charset parameter and VFS 
+			To use CAP encoding on Samba, you should use the unix charset parameter and VFS
 			as in <link linkend="vfscap-intl">the VFS CAP smb.conf file</link>.
 			</para>
 
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml b/docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml
index 84ee82db57..8b3b835f90 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-VFS.xml
@@ -126,7 +126,7 @@ shown in <link linkend="multimodule">the smb.conf with multiple VFS modules</lin
 	<title>default_quota</title>
 
 	<para>
-	This module allows the default quota values, in the windows explorer GUI, to be stored on a Samba-3 server.
+	This module allows the default quota values, in the windows explorer GUI, to be stored on a Samba server.
 	The challenge is that linux filesystems only store quotas for users and groups, but no default quotas.
 	</para>
 
@@ -556,7 +556,7 @@ quotasettings:	gid nolimit = no
 <indexterm><primary>Debian Sarge</primary></indexterm>
 	At the time of this writing, not much testing has been done.  I tested the shadow copy VFS module with a
 	specific scenario which was not deployed in a production environment, but more as a proof of concept.  The
-	scenario involved a Samba-3 file server on Debian Sarge with an XFS file system and LVM1.  I do NOT recommend
+	scenario involved a Samba file server on Debian Sarge with an XFS file system and LVM1.  I do NOT recommend
 	you use this as a solution without doing your own due diligence with regard to all the components presented
 	here.  That said, following is an basic outline of how I got things going.
 	</para>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-Winbind.xml b/docs-xml/Samba3-HOWTO/TOSHARG-Winbind.xml
index b7eaa06b53..ae7700fd48 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-Winbind.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-Winbind.xml
@@ -589,7 +589,7 @@ way things are going.
 <para>
 <indexterm><primary>winbindd</primary></indexterm>
 <indexterm><primary>daemon</primary></indexterm>
-The latest version of Samba-3 includes a functioning winbindd daemon. Please refer to the <ulink
+The latest version of Samba includes a functioning winbindd daemon. Please refer to the <ulink
 url="http://samba.org/">main Samba Web page</ulink>, or better yet, your closest Samba mirror site for
 instructions on downloading the source code.
 </para>
@@ -633,7 +633,7 @@ needed to compile PAM-aware applications.
 <indexterm><primary>Winbind</primary></indexterm>
 <indexterm><primary>/etc/nsswitch.conf</primary></indexterm>
 PAM is a standard component of most current generation UNIX/Linux systems. Unfortunately, few systems install
-the <filename>pam-devel</filename> libraries that are needed to build PAM-enabled Samba. Additionally, Samba-3
+the <filename>pam-devel</filename> libraries that are needed to build PAM-enabled Samba. Additionally, Samba
 may auto-install the Winbind files into their correct locations on your system, so before you get too far down
 the track, be sure to check if the following configuration is really
 necessary. You may only need to configure
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-WindowsClientConfig.xml b/docs-xml/Samba3-HOWTO/TOSHARG-WindowsClientConfig.xml
index 3facb2c35c..854c58c279 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-WindowsClientConfig.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-WindowsClientConfig.xml
@@ -432,7 +432,7 @@ that are in common use today. These are:
 <indexterm><primary>Network ID</primary></indexterm>
 <indexterm><primary>configuration wizard</primary></indexterm>
 		Clicking the <guimenu>Network ID</guimenu> button will launch the configuration wizard. Do not use this with
-		Samba-3. If you wish to change the computer name or join or leave the domain, click the <guimenu>Change</guimenu> button.
+		Samba. If you wish to change the computer name or join or leave the domain, click the <guimenu>Change</guimenu> button.
 		See <link linkend="wxpp004"></link>.
 		<figure id="wxpp004"><title>The Computer Name Panel.</title><imagefile>wxpp004</imagefile></figure>
 		</para></step>
@@ -463,7 +463,7 @@ that are in common use today. These are:
 
         <para>
 <indexterm><primary>root</primary></indexterm>
-		Enter the name <quote>root</quote> and the root password from your Samba-3 server. See <link linkend="wxpp008"></link>.
+		Enter the name <quote>root</quote> and the root password from your Samba server. See <link linkend="wxpp008"></link>.
 		<figure id="wxpp008">
 			<title>Computer Name Changes &smbmdash; Username and Password Panel.</title><imagefile>wxpp008</imagefile>
 		</figure>
diff --git a/docs-xml/Samba3-HOWTO/TOSHARG-preface.xml b/docs-xml/Samba3-HOWTO/TOSHARG-preface.xml
index 43df53e523..cda13acdad 100644
--- a/docs-xml/Samba3-HOWTO/TOSHARG-preface.xml
+++ b/docs-xml/Samba3-HOWTO/TOSHARG-preface.xml
@@ -26,7 +26,7 @@ gain more contented network users.
 <para>
 This book provides example configurations, it documents key aspects of Microsoft
 Windows networking, provides in-depth insight into the important configuration of
-Samba-3, and helps to put all of these into a useful framework.
+Samba, and helps to put all of these into a useful framework.
 </para>
 
 <para>