Editors updates.

(This used to be commit 6d4f8adafb72fef9622e3b03d68b51fd5c28e5ca)

6 files changed, 64 insertions, 47 deletions

diff --git a/docs/Samba3-ByExample/SBE-acknowledgements.xml b/docs/Samba3-ByExample/SBE-acknowledgements.xml
index f88001cbb0..4cbac7fc26 100644
--- a/docs/Samba3-ByExample/SBE-acknowledgements.xml
+++ b/docs/Samba3-ByExample/SBE-acknowledgements.xml
@@ -23,7 +23,7 @@
 	<para>
 	Samba would not have come into existence if Andrew Tridgell had not taken
 	the first steps. He continues to lead the project. Under the shadow of his
-	mantle are some great guys who never give up and are always ready to help.
+	mantle are some great folks who never give up and are always ready to help.
 	Thank you to: Jeremy Allison, Jerry Carter, Andrew Bartlett, Jelmer Vernooij,
 	Alexander Bokovoy, Volker Lendecke, and other team members who answered my 
 	continuous stream of questions &smbmdash; all of which resulted in improved content 
@@ -34,19 +34,19 @@
 	My heartfelt thanks go out also to a small set of reviewers (alphabetically 
 	listed) who gave substantial feedback and significant suggestions for improvement:
 	Tony Earnshaw, William Enestvedt, Eric Hines, Roland Gruber, Gavin Henry, 
-	Steven Henry, Luke Howard, Jon Johnston, Alan Munter, Tarjei Huse, Mike MacIsaac,
+	Steven Henry, Luke Howard, Tarjei Huse, Jon Johnston, Alan Munter, Mike MacIsaac,
 	Scott Mann, Ed Riddle, Geoff Scott, Santos Soler, Misty Stanley-Jones, Mark Taylor,
 	and Jérôme Tournier.
 	</para>
 
 	<para>
-	My appreciation is extended to a team of over 30 additional reviewers who
+	My appreciation is extended to a team of more than 30 additional reviewers who
 	helped me to find my way around dark corners.
 	</para>
 
 	<para>
-	Particular mention is due to Lyndell, Amos and Melissa who gave me the 
-	latitude necessary to spend nearly a entire year writing Samba documentation,
+	Particular mention is due to Lyndell, Amos, and Melissa who gave me the 
+	latitude necessary to spend nearly an entire year writing Samba documentation,
 	and then gave more so this second edition could be created.
 	</para>
 
diff --git a/docs/Samba3-ByExample/SBE-foreword.xml b/docs/Samba3-ByExample/SBE-foreword.xml
index d90aead066..08c1644df9 100644
--- a/docs/Samba3-ByExample/SBE-foreword.xml
+++ b/docs/Samba3-ByExample/SBE-foreword.xml
@@ -4,38 +4,35 @@
 <preface lang="en-US">
 <title>Foreword</title>
 
-<sect1><title>By John M. Weathersby, OSSI</title>
+<sect1><title>By John M. Weathersby, Executive Director, OSSI</title>
 <blockquote>
-<attribution>
-Executive Director, Open Source Software Institute
-</attribution>
 
 <para>
 The Open Source Software Institute (OSSI) is comprised of representatives from a broad spectrum of business and
 non-business organizations that share a common interest in the promotion of development and implementation
-of open-source software solutions globally, and in particular within the United States of America.
+of open source software solutions globally, and in particular within the United States of America.
 </para>
 
 <para>
 The OSSI has global affiliations with like-minded organizations. Our affiliate in the United Kingdom is the
-Open Source Consortium. Both the OSSI and the OSC share a common objective to expand the use of open-source
+Open Source Consortium (OSC). Both the OSSI and the OSC share a common objective to expand the use of open source
 software in federal, state, and municipal government agencies; and in academic institutions. We represent
 businesses that provide professional support services that answer the needs of our target organizational
 information technology consumers in an effective and cost-efficient manner.
 </para>
 
 <para>
-Open source software has matured greatly over the past 5 years with the result that an increasing number of
-people who hold key decision-making positions want to know how the business model works. They
+Open source software has matured greatly over the past five years with the result that an increasing number of
+people who hold key decisionmaking positions want to know how the business model works. They
 want to understand how problems get resolved, how questions get answered, and how the development model
-is sustained. Information and Communications Technology directors in defense organizations, and in other
+is sustained. Information and communications technology directors in defense organizations, and in other
 government agencies that deal with sensitive information, want to become familiar with development road-maps
-and, in particular, seek to evaluate the track record of the main-stream open-source project teams.
+and, in particular, seek to evaluate the track record of the mainstream open source project teams.
 </para>
 
 <para>
 Wherever the OSSI gains entrance to new opportunities we find that Microsoft Windows technologies are the 
-benchmark against which open-source software solutions are measured. Two open-source software projects
+benchmark against which open source software solutions are measured. Two open source software projects
 are key to our ability to present a structured and convincing proposition that there are alternatives
 to the incumbent proprietary means of meeting information technology needs. They are the Apache Web Server
 and Samba.
@@ -44,7 +41,7 @@ and Samba.
 <para>
 Just as the Apache Web Server is the standard in web serving technology, Samba is the definitive standard
 for providing interoperability with UNIX systems and other non-Microsoft operating system platforms. Both
-open-source applications have a truly remarkable track record that extends well over a decade. Both have
+open source applications have a truly remarkable track record that extends for more than a decade. Both have
 demonstrated the unique capacity to innovate and maintain a level of development that has not only kept
 pace with demands, but, in many areas, each project has also proven to be an industry leader.
 </para>
@@ -58,8 +55,8 @@ it and keep it current might prove difficult.
 </para>
 
 <para>
-This second edition of the book, <quote>Samba-3 by Example</quote>, barely one year following the release
-of the first edition, has removed all concerns and is proof that open-source solutions are a compelling choice.
+This second edition of the book, <emphasis>Samba-3 by Example</emphasis>, barely one year following the release
+of the first edition, has removed all concerns and is proof that open source solutions are a compelling choice.
 The first edition was released shortly following the release of Samba version 3.0 itself, and has become
 the authoritative instrument for training and for guiding deployment.
 </para>
diff --git a/docs/Samba3-ByExample/SBE-inside-cover.xml b/docs/Samba3-ByExample/SBE-inside-cover.xml
index 492a581cf5..e982c8c832 100644
--- a/docs/Samba3-ByExample/SBE-inside-cover.xml
+++ b/docs/Samba3-ByExample/SBE-inside-cover.xml
@@ -10,7 +10,7 @@
 	and once lost, the cost of recovering liberty can be incredible. The last
 	edition cover featured Alfred the Great who liberated England from the
 	constant assault of Vikings and Norsemen. Events in England that
-	that finally liberated the common people came about in small steps, but
+	finally liberated the common people came about in small steps, but
 	the result should not be under-estimated. Today, as always, freedom and
 	liberty are seldom appreciated until they are lost. If we can not quantify
 	what is the value of freedom, we shall be little motivated to protect it.
diff --git a/docs/Samba3-ByExample/SBE-preface.xml b/docs/Samba3-ByExample/SBE-preface.xml
index 0980cbec33..787e6ece20 100644
--- a/docs/Samba3-ByExample/SBE-preface.xml
+++ b/docs/Samba3-ByExample/SBE-preface.xml
@@ -67,8 +67,8 @@
 	</para>
 
 	<para>
-	The Samba-HOWTO-Collection, as do <emphasis>The Official Samba-3 HOWTO and 
-	Reference Guide</emphasis>, document Samba features and functionality in
+	The Samba-HOWTO-Collection &smbmdash; as does <emphasis>The Official Samba-3 HOWTO and 
+	Reference Guide</emphasis> &smbmdash; documents Samba features and functionality in
 	a topical context.  This book takes a completely different approach. It
 	walks through Samba network configurations that are working within particular
 	environmental contexts, providing documented step-by-step implementations.
@@ -91,7 +91,7 @@
 	</para>
 
 	<para>
-	The changes shown in <link linkend="pref-new"/> are incorporated in this update:
+	The changes shown in <link linkend="pref-new"/> are incorporated in this update.
 	</para>
 
 	<table id="pref-new">
@@ -162,12 +162,12 @@
 				<row>
 					<entry>
 						<para>
-						UNIX extension handling
+						UNIX Extension Handling
 						</para>
 					</entry>
 					<entry>
 						<para>
-						Symbolicly linked files and directories on the UNIX host to absolute paths will
+						Symbolically linked files and directories on the UNIX host to absolute paths will
 						now be followed. This can be turned off using <quote>wide links = No</quote> in
 						the share stanza in the &smb.conf; file. Turning off <quote>wide links</quote>
 						support will degrade server performance because each path must be checked.
@@ -283,7 +283,7 @@
 
 	<variablelist>
 		<varlistentry>
-		<term>Chapter 1 &smbmdash; No Frills Samba Servers</term><listitem>
+		<term>Chapter 1 &smbmdash; No Frills Samba Servers.</term><listitem>
 		<para>
 		Here you design a solution for three different business scenarios, each for a 
 		company called Abmas. There are two simple networking problems and one slightly 
@@ -326,7 +326,7 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>Chapter 2 &smbmdash; Small Office Networking</term><listitem>
+		<term>Chapter 2 &smbmdash; Small Office Networking.</term><listitem>
 		<para>
 		Abmas is a successful company now. They have 50 network users
 		and want a little more varoom from the network. This is a typical
@@ -346,7 +346,7 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>Chapter 3 &smbmdash; Secure Office Networking</term><listitem>
+		<term>Chapter 3 &smbmdash; Secure Office Networking.</term><listitem>
 		<para>
 		Abmas is growing rapidly now. Money is a little tight, but with 130
 		network users, security has become a concern. They have many new machines
@@ -367,7 +367,7 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>Chapter 4 &smbmdash; The 500 User Office</term><listitem>
+		<term>Chapter 4 &smbmdash; The 500 User Office.</term><listitem>
 		<para>
 		The two-year projections were met. Congratulations, you are a star.
 		Now Abmas needs to replace the network. Into the existing user base, they
@@ -390,7 +390,7 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>Chapter 5 &smbmdash; Making Happy Users</term><listitem>
+		<term>Chapter 5 &smbmdash; Making Happy Users.</term><listitem>
 		<para>
 		Congratulations again. Abmas is happy with your services and you have been given another raise.
 		Your users are becoming much more capable and are complaining about little
@@ -414,7 +414,7 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>Chapter 6 &smbmdash; A Distributed 2000 User Network</term><listitem>
+		<term>Chapter 6 &smbmdash; A Distributed 2000 User Network.</term><listitem>
 		<para>
 		Only eight months have passed, and Abmas has acquired another company. You now need to expand
 		the network further. You have to deal with a network that spans several countries.
@@ -433,7 +433,7 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>Chapter 7 &smbmdash; Adding UNIX/Linux Servers and Clients</term><listitem>
+		<term>Chapter 7 &smbmdash; Adding UNIX/Linux Servers and Clients.</term><listitem>
 		<para>
 		Well done, Bob, your team has achieved much. Now help Abmas integrate the entire network.
 		You want central control and central support and you need to cut costs. How can you reduce administrative
@@ -455,7 +455,7 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>Chapter 8 &smbmdash; Updating Samba-3</term><listitem>
+		<term>Chapter 8 &smbmdash; Updating Samba-3.</term><listitem>
 		<para>
 		This chapter is the result of repeated requests for better documentation of the steps
 		that must be followed when updating or upgrading a Samba server. It attempts to cover
@@ -465,14 +465,14 @@
 
 		<para><emphasis>TechInfo</emphasis> &smbmdash; Samba stores a lot of essential network
 		information in a large and growing collection of files. This chapter documents the
-		essentials of where those files may be located and how to find them. It also provide
+		essentials of where those files may be located and how to find them. It also provides
 		an insight into inter-related matters that affect a Samba installation.
 		</para>
 		</listitem>
 		</varlistentry>
 
 		<varlistentry>
-		<term>Chapter 9 &smbmdash; Migrating NT4 Domain to Samba-3</term><listitem>
+		<term>Chapter 9 &smbmdash; Migrating NT4 Domain to Samba-3.</term><listitem>
 		<para>
 		Another six months have passed. Abmas has acquired yet another company. You will find a
 		way to migrate all users off the old network onto the existing network without loss
@@ -488,7 +488,7 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>Chapter 10 &smbmdash; Migrating NetWare 4.11 Server to Samba</term><listitem>
+		<term>Chapter 10 &smbmdash; Migrating NetWare 4.11 Server to Samba.</term><listitem>
 		<para>
 		Misty Stanley-Jones has contributed information that summarizes her experience at migration
 		from a NetWare server to Samba-3.
@@ -502,7 +502,7 @@
 		</varlistentry>
 
 		<varlistentry>
-		<term>Chapter 11 &smbmdash; Active Directory, Kerberos and Security</term><listitem>
+		<term>Chapter 11 &smbmdash; Active Directory, Kerberos and Security.</term><listitem>
 		<para>
 		Abmas has acquired another company that has just migrated to running Windows Server 2003 and 
 		Active Directory. One of your staff makes offhand comments that land you in hot water.
@@ -520,7 +520,7 @@
 		</varlistentry>
 
 		<varlistentry>
-                <term>Chapter 12 &smbmdash; Integrating Additional Services</term><listitem>
+                <term>Chapter 12 &smbmdash; Integrating Additional Services.</term><listitem>
                 <para>
 		The battle is almost over, Samba-3 has won the day. Your team are delighted and now you
 		find yourself at yet another cross-roads. Abmas have acquired a snack food business, you
@@ -539,7 +539,7 @@
                 </varlistentry>
 
 		<varlistentry>
-		<term>Chapter 13 &smbmdash; Performance, Reliability and Availability</term><listitem>
+		<term>Chapter 13 &smbmdash; Performance, Reliability and Availability.</term><listitem>
 		<para>
 		Bob, are you sure the new Samba server is up to the load? Your network is serving many
 		users who risk becoming unproductive. What can you do to keep ahead of demand? Can you
@@ -551,13 +551,13 @@
 		avoid Samba configuration options that will weigh the server down. MS distributed file
 		services to make your network fly and much more. This chapter contains a good deal of 
 		<quote>Did I tell you about this...?</quote> type of hints to help keep your name on the top
-		performers list.
+		performers list. (John, should there be entries for Chapter 14 and Apps A & C ???????)
 		</para>
 		</listitem>
 		</varlistentry>
 
 		<varlistentry>
-		<term>Appendix B &smbmdash; Windows Networking Primer</term><listitem>
+		<term>Appendix B &smbmdash; Windows Networking Primer.</term><listitem>
 		<para>
 		Here we cover practical exercises to help us to understand how MS Windows
 		network protocols function. A network protocol analyzer helps you to
diff --git a/docs/Samba3-ByExample/conventions.xml b/docs/Samba3-ByExample/conventions.xml
index d4bbde8f85..069f8abbe0 100644
--- a/docs/Samba3-ByExample/conventions.xml
+++ b/docs/Samba3-ByExample/conventions.xml
@@ -11,9 +11,9 @@
     <itemizedlist>
       <listitem>
 	<para>
-	TOSHARG is used as an abbreviation for the book, <quote>The Official Samba-3
-	HOWTO and Reference Guide,</quote> Editors: John H. Terpstra and Jelmer R. Vernooij,
-	Publisher: Prentice Hall, ISBN: 0131453556.
+	TOSHARG is used as an abbreviation for the book, <emphasis>The Official Samba-3
+	HOWTO and Reference Guide,</emphasis> Editors: John H. Terpstra and Jelmer R. Vernooij,
+	Publisher: Prentice Hall PTR, www.phptr.com/perens.
 	</para>
       </listitem>
 
diff --git a/docs/Samba3-HOWTO/TOSHARG-Passdb.xml b/docs/Samba3-HOWTO/TOSHARG-Passdb.xml
index 5fe8e52ff8..5d2607f885 100644
--- a/docs/Samba3-HOWTO/TOSHARG-Passdb.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Passdb.xml
@@ -881,8 +881,13 @@ Samba provides two tools for management of user and machine accounts:
 </para>
 
 <para>
+<indexterm><primary>pdbedit</primary></indexterm>
+<indexterm><primary>password aging</primary></indexterm>
+<indexterm><primary>failed logins</primary></indexterm>
 The <command>pdbedit</command> can be used to manage account policies in addition to
-Samba user account information.
+Samba user account information. The policy management capability is used to administer
+domain default settings for password aging and management controls to handle failed login
+attempts.
 </para>
 
 <para>
@@ -897,7 +902,7 @@ is being added to the <command>net</command> toolset (see <link linkend="NetComm
 </para>
 
 	<sect2>
-	<title>The <command>smbpasswd</command> Command</title>
+	<title>The <command>smbpasswd</command> Utility</title>
 	
 		<para>
 <indexterm><primary>smbpasswd</primary></indexterm>
@@ -998,7 +1003,7 @@ is being added to the <command>net</command> toolset (see <link linkend="NetComm
 	</sect2>
 
 	<sect2 id="pdbeditthing">
-	<title>The <command>pdbedit</command> Command</title>
+	<title>The <command>pdbedit</command> Utility</title>
 
 		<para>
 		<indexterm><primary>pdbedit</primary></indexterm>
@@ -1015,6 +1020,21 @@ is being added to the <command>net</command> toolset (see <link linkend="NetComm
 		</itemizedlist>
 
 		<para>
+		Domain global policy controls available include:
+		</para>
+
+		<itemizedlist>
+			<listitem><para>Maximum Password Age</para></listitem>
+			<listitem><para>Minimum Password Age</para></listitem>
+			<listitem><para>Mimimum Password Length</para></listitem>
+			<listitem><para>Password Uniqueness (remembers number of prior passwords)</para></listitem>
+			<listitem><para>Account Lockout</para></listitem>
+			<listitem><para>Bad Logon Attempts</para></listitem>
+			<listitem><para>Lockout Reset Delay</para></listitem>
+			<listitem><para>Lockout Duration</para></listitem>
+		</itemizedlist>
+
+		<para>
 		<indexterm><primary>pdbedit</primary></indexterm>
 <indexterm><primary>policy settings</primary></indexterm>
 <indexterm><primary>account security</primary></indexterm>