Stage 1 of PHPTR Edits.

(This used to be commit 64a9e3e8619bf33dcf6b0ff8171b47a3e2581239)

1 files changed, 74 insertions, 79 deletions

diff --git a/docs/Samba3-HOWTO/TOSHARG-Integrating-with-Windows.xml b/docs/Samba3-HOWTO/TOSHARG-Integrating-with-Windows.xml
index 0fa90c9cb2..0aa798e3e4 100644
--- a/docs/Samba3-HOWTO/TOSHARG-Integrating-with-Windows.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-Integrating-with-Windows.xml
@@ -11,18 +11,18 @@
  
 <para>
 <indexterm><primary>NetBIOS</primary></indexterm>
-This section deals with NetBIOS over TCP/IP name to IP address resolution. If
+This chapter deals with NetBIOS over TCP/IP name to IP address resolution. If
 your MS Windows clients are not configured to use NetBIOS over TCP/IP, then this
 section does not apply to your installation. If your installation
 involves the use of
-NetBIOS over TCP/IP then this section may help you to resolve networking problems.
+NetBIOS over TCP/IP, then this chapter may help you to resolve networking problems.
 </para>
 
 <note>
 <para>
 NetBIOS over TCP/IP has nothing to do with NetBEUI. NetBEUI is NetBIOS
 over Logical Link Control (LLC). On modern networks it is highly advised
-to not run NetBEUI at all. Note also there is no such thing as
+to not run NetBEUI at all. Note also that there is no such thing as
 NetBEUI over TCP/IP &smbmdash; the existence of such a protocol is a complete
 and utter misapprehension.
 </para>
@@ -35,7 +35,7 @@ and utter misapprehension.
 Many MS Windows network administrators have never been exposed to basic TCP/IP
 networking as it is implemented in a UNIX/Linux operating system. Likewise, many UNIX and
 Linux administrators have not been exposed to the intricacies of MS Windows TCP/IP-based
-networking (and may have no desire to be either).
+networking (and may have no desire to be, either).
 </para>
 
 <para>
@@ -52,15 +52,15 @@ its IP address for each operating system environment.
 Since the introduction of MS Windows 2000, it is possible to run MS Windows networking
 without the use of NetBIOS over TCP/IP. NetBIOS over TCP/IP uses UDP port 137 for NetBIOS
 name resolution and uses TCP port 139 for NetBIOS session services. When NetBIOS over
-TCP/IP is disabled on MS Windows 2000 and later clients, then only the TCP port 445 will be
-used and the UDP port 137 and TCP port 139 will not.
+TCP/IP is disabled on MS Windows 2000 and later clients, then only the TCP port 445 is
+used, and the UDP port 137 and TCP port 139 are not.
 </para>
 
 <note>
 <para>
 When using Windows 2000 or later clients, if NetBIOS over TCP/IP is not disabled, then
 the client will use UDP port 137 (NetBIOS Name Service, also known as the Windows Internet
-Name Service or WINS), TCP port 139 and TCP port 445 (for actual file and print traffic).
+Name Service, or WINS), TCP port 139, and TCP port 445 (for actual file and print traffic).
 </para>
 </note>
 
@@ -68,7 +68,7 @@ Name Service or WINS), TCP port 139 and TCP port 445 (for actual file and print
 When NetBIOS over TCP/IP is disabled, the use of DNS is essential. Most installations that
 disable NetBIOS over TCP/IP today use MS Active Directory Service (ADS). ADS requires
 <indexterm><primary>DNS</primary><secondary>Dynamic</secondary></indexterm>
-Dynamic DNS with Service Resource Records (SRV RR) and with Incremental Zone Transfers (IXFR).
+dynamic DNS with Service Resource Records (SRV RR) and with Incremental Zone Transfers (IXFR).
 <indexterm><primary>DHCP</primary></indexterm>
 Use of DHCP with ADS is recommended as a further means of maintaining central control
 over the client workstation network configuration.
@@ -111,13 +111,13 @@ IP addresses.
 Network packets that are sent over the physical network transport 
 layer communicate not via IP addresses but rather using the Media 
 Access Control address, or MAC address. IP addresses are currently 
-32 bits in length and are typically presented as four (4) decimal 
-numbers that are separated by a dot (or period). For example, 168.192.1.1.
+32 bits in length and are typically presented as four decimal 
+numbers that are separated by a dot (or period) &smbmdash; for example, 168.192.1.1.
 </para>
 
 <para>
 <indexterm><primary>MAC Addresses</primary></indexterm>
-MAC Addresses use 48 bits (or 6 bytes) and are typically represented 
+MAC addresses use 48 bits (or 6 bytes) and are typically represented 
 as two-digit hexadecimal numbers separated by colons: 40:8e:0a:12:34:56.
 </para>
 
@@ -132,7 +132,7 @@ any particular interface, the assignment of an IP address makes sense
 from a network management perspective. More than one IP address can 
 be assigned per MAC address. One address must be the primary IP
 address &smbmdash; 
-this is the address that will be returned in the ARP reply.
+this is the address that will be returned in the Address Resolution Protocol (ARP) reply.
 </para>
 
 <para>
@@ -146,8 +146,8 @@ by the TCP/IP configuration control files. The file
 <para>
 When the IP address of the destination interface has been 
 determined, a protocol called ARP/RARP is used to identify 
-the MAC address of the target interface. ARP stands for Address 
-Resolution Protocol and is a broadcast-oriented method that 
+the MAC address of the target interface. ARP 
+is a broadcast-oriented method that 
 uses User Datagram Protocol (UDP) to send a request to all 
 interfaces on the local network segment using the all 1s MAC 
 address. Network interfaces are programmed to respond to two 
@@ -188,8 +188,8 @@ This file tells the name resolution libraries:
 	host names to their IP address.
 	</para></listitem>
 	
-	<listitem><para>The name or IP address of available Domain 
-	Name Servers that may be asked to perform name-to-address 
+	<listitem><para>The name or IP address of available domain 
+	name servers that may be asked to perform name-to-address 
 	translation lookups.
 	</para></listitem>
 </itemizedlist>
@@ -207,15 +207,12 @@ This file tells the name resolution libraries:
 which the setting in <filename>/etc/resolv.conf</filename> may be effected. It is a 
 critical configuration file. This file controls the order by 
 which name resolution may proceed. The typical structure is:
-</para>
-
-<para><programlisting>
+<programlisting>
 order hosts,bind
 multi on
 </programlisting></para>
 
-<para>
-then both addresses should be returned. Please refer to the 
+<para>Both addresses should be returned. Please refer to the 
 man page for <filename>host.conf</filename> for further details.
 </para>
 
@@ -232,10 +229,7 @@ man page for <filename>host.conf</filename> for further details.
 <indexterm><primary>/etc/nsswitch.conf</primary></indexterm>
 This file controls the actual name resolution targets. The 
 file typically has resolver object specifications as follows:
-</para>
-
-
-<para><programlisting>
+<programlisting>
 # /etc/nsswitch.conf
 #
 # Name Service Switch configuration file.
@@ -275,10 +269,10 @@ principal of speaking only when necessary.
 Starting with version 2.2.0, Samba has Linux support for extensions to 
 the name service switch infrastructure so Linux clients will 
 be able to obtain resolution of MS Windows NetBIOS names to IP 
-Addresses. To gain this functionality, Samba needs to be compiled 
+addresses. To gain this functionality, Samba needs to be compiled 
 with appropriate arguments to the make command (i.e., <userinput>make 
 nsswitch/libnss_wins.so</userinput>). The resulting library should 
-then be installed in the <filename>/lib</filename> directory and 
+then be installed in the <filename>/lib</filename> directory, and 
 the <parameter>wins</parameter> parameter needs to be added to the <quote>hosts:</quote> line in 
 the <filename>/etc/nsswitch.conf</filename> file. At this point, it 
 will be possible to ping any MS Windows machine by its NetBIOS 
@@ -294,22 +288,22 @@ which both the Samba machine and the MS Windows machine belong.
 <title>Name Resolution as Used within MS Windows Networking</title>
 
 <para>
-MS Windows networking is predicated about the name each machine 
+MS Windows networking is predicated on the name each machine 
 is given. This name is known variously (and inconsistently) as 
-the <quote>computer name,</quote> <quote>machine name,</quote> <quote>networking name,</quote> <quote>netbios name,</quote> 
+the <quote>computer name,</quote> <quote>machine name,</quote> <quote>networking name,</quote> <quote>NetBIOS name,</quote> 
 or <quote>SMB name.</quote> All terms mean the same thing with the exception of 
-<quote>netbios name</quote> that can also apply to the name of the workgroup or the 
+<quote>NetBIOS name,</quote> which can also apply to the name of the workgroup or the 
 domain name. The terms <quote>workgroup</quote> and <quote>domain</quote> are really just a 
 simple name with which the machine is associated. All NetBIOS names 
 are exactly 16 characters in length. The 16<superscript>th</superscript> character is reserved. 
-It is used to store a one-byte value that indicates service level 
+It is used to store a 1-byte value that indicates service level 
 information for the NetBIOS name that is registered. A NetBIOS machine 
-name is, therefore, registered for each service type that is provided by 
+name is therefore registered for each service type that is provided by 
 the client/server.
 </para>
 
 <para>
-<link linkend="uniqnetbiosnames">Unique NetBIOS Names</link> and <link linkend="netbiosnamesgrp">Group Names</link> tables 
+<link linkend="uniqnetbiosnames">Unique NetBIOS names</link> and <link linkend="netbiosnamesgrp">group names</link> tables 
 list typical NetBIOS name/service type registrations.
 </para>
 
@@ -320,9 +314,9 @@ list typical NetBIOS name/service type registrations.
 <colspec align="justify"/>
 <tbody>
 <row><entry>MACHINENAME&lt;00&gt;</entry><entry>Server Service is running on MACHINENAME</entry></row>
-<row><entry>MACHINENAME&lt;03&gt;</entry><entry>Generic Machine Name (NetBIOS name)</entry></row>
-<row><entry>MACHINENAME&lt;20&gt;</entry><entry>LanMan Server service is running on MACHINENAME</entry></row>
-<row><entry>WORKGROUP&lt;1b&gt;</entry><entry>Domain Master Browser</entry></row>
+<row><entry>MACHINENAME&lt;03&gt;</entry><entry>Generic machine name (NetBIOS name)</entry></row>
+<row><entry>MACHINENAME&lt;20&gt;</entry><entry>LanMan server service is running on MACHINENAME</entry></row>
+<row><entry>WORKGROUP&lt;1b&gt;</entry><entry>Domain master browser</entry></row>
 </tbody>
 </tgroup>
 </table>
@@ -333,10 +327,10 @@ list typical NetBIOS name/service type registrations.
 <colspec align="left"/>
 <colspec align="justify"/>
 <tbody>
-<row><entry>WORKGROUP&lt;03&gt;</entry><entry>Generic Name registered by all members of WORKGROUP</entry></row>
-<row><entry>WORKGROUP&lt;1c&gt;</entry><entry>Domain Controllers / Netlogon Servers</entry></row>
-<row><entry>WORKGROUP&lt;1d&gt;</entry><entry>Local Master Browsers</entry></row>
-<row><entry>WORKGROUP&lt;1e&gt;</entry><entry>Browser Election Service</entry></row>
+<row><entry>WORKGROUP&lt;03&gt;</entry><entry>Generic name registered by all members of WORKGROUP</entry></row>
+<row><entry>WORKGROUP&lt;1c&gt;</entry><entry>Domain cntrollers/netlogon servers</entry></row>
+<row><entry>WORKGROUP&lt;1d&gt;</entry><entry>Local master browsers</entry></row>
+<row><entry>WORKGROUP&lt;1e&gt;</entry><entry>Browser election service</entry></row>
 </tbody>
 </tgroup>
 </table>
@@ -344,16 +338,17 @@ list typical NetBIOS name/service type registrations.
 <para>
 <indexterm><primary>NetBIOS</primary></indexterm>
 It should be noted that all NetBIOS machines register their own 
-names as per the above. This is in vast contrast to TCP/IP 
-installations where traditionally the system administrator will 
-determine in the <filename>/etc/hosts</filename> or in the DNS database what names 
+names as per <link linkend="uniqnetbiosnames">Unique NetBIOS names</link> and <link
+linkend="netbiosnamesgrp">group names</link>. This is in vast contrast to TCP/IP 
+installations where the system administrator traditionally 
+determines in the <filename>/etc/hosts</filename> or in the DNS database what names 
 are associated with each IP address.
 </para>
 
 <para>
 <indexterm><primary>NetBIOS</primary></indexterm>
 One further point of clarification should be noted. The <filename>/etc/hosts</filename> 
-file and the DNS records do not provide the NetBIOS name type information 
+file and the DNS records do not provide the NetBIOS name information 
 that MS Windows clients depend on to locate the type of service that may 
 be needed. An example of this is what happens when an MS Windows client 
 wants to locate a domain logon server. It finds this service and the IP 
@@ -365,27 +360,27 @@ Whichever machine first replies, it then ends up providing the logon services.
 </para>
 
 <para>
-The name <quote>workgroup</quote> or <quote>domain</quote> really can be confusing since these 
+The name <quote>workgroup</quote> or <quote>domain</quote> really can be confusing, since these 
 have the added significance of indicating what is the security 
 architecture of the MS Windows network. The term <quote>workgroup</quote> indicates 
 that the primary nature of the network environment is that of a 
-peer-to-peer design. In a WORKGROUP, all machines are responsible for 
+peer-to-peer design. In a workgroup, all machines are responsible for 
 their own security, and generally such security is limited to the use of 
-just a password (known as Share Level security). In most situations 
+just a password (known as share-level security). In most situations 
 with peer-to-peer networking, the users who control their own machines 
 will simply opt to have no security at all. It is possible to have 
-User Level Security in a WORKGROUP environment, thus requiring the use 
-of a user name and a matching password.
+user-level security in a workgroup environment, thus requiring the use 
+of a username and a matching password.
 </para>
 
 <para>
 MS Windows networking is thus predetermined to use machine names 
 for all local and remote machine message passing. The protocol used is 
-called Server Message Block (SMB) and this is implemented using 
-the NetBIOS protocol (Network Basic Input Output System). NetBIOS can 
+called Server Message Block (SMB), and this is implemented using 
+the NetBIOS protocol (Network Basic Input/Output System). NetBIOS can 
 be encapsulated using LLC (Logical Link Control) protocol &smbmdash; in which case 
 the resulting protocol is called NetBEUI (Network Basic Extended User 
-Interface). NetBIOS can also be run over IPX (Inter-networking Packet 
+Interface). NetBIOS can also be run over IPX (Internetworking Packet 
 Exchange) protocol as used by Novell NetWare, and it can be run 
 over TCP/IP protocols &smbmdash; in which case the resulting protocol is called 
 NBT or NetBT, the NetBIOS over TCP/IP.
@@ -404,16 +399,16 @@ limited to this area.
 All MS Windows machines employ an in-memory buffer in which is 
 stored the NetBIOS names and IP addresses for all external 
 machines that machine has communicated with over the 
-past 10-15 minutes. It is more efficient to obtain an IP address 
+past 10 to 15 minutes. It is more efficient to obtain an IP address 
 for a machine from the local cache than it is to go through all the 
 configured name resolution mechanisms.
 </para>
 
 <para>
-If a machine whose name is in the local name cache has been shut 
-down before the name had been expired and flushed from the cache, then 
+If a machine whose name is in the local name cache is shut 
+down before the name is expired and flushed from the cache, then 
 an attempt to exchange a message with that machine will be subject 
-to time-out delays. Its name is in the cache, so a name resolution 
+to timeout delays. Its name is in the cache, so a name resolution 
 lookup will succeed, but the machine cannot respond. This can be 
 frustrating for users but is a characteristic of the protocol.
 </para>
@@ -422,7 +417,7 @@ frustrating for users but is a characteristic of the protocol.
 <indexterm><primary>nbtstat</primary></indexterm>
 <indexterm><primary>nmblookup</primary></indexterm>
 The MS Windows utility that allows examination of the NetBIOS 
-name cache is called <quote>nbtstat</quote>. The Samba equivalent of this 
+name cache is called <quote>nbtstat.</quote> The Samba equivalent
 is called <command>nmblookup</command>.
 </para>
 
@@ -434,7 +429,7 @@ is called <command>nmblookup</command>.
 <para>
 <indexterm><primary>LMHOSTS</primary></indexterm>
 This file is usually located in MS Windows NT 4.0 or Windows 200x/XP in the directory
-<filename>%SystemRoot%\SYSTEM32\DRIVERS\ETC</filename> and contains the IP Address
+<filename>%SystemRoot%\SYSTEM32\DRIVERS\ETC</filename> and contains the IP address
 and the machine name in matched pairs. The <filename>LMHOSTS</filename> file
 performs NetBIOS name to IP address mapping.
 </para>
@@ -468,8 +463,8 @@ It typically looks like this:
 #      \0xnn (non-printing character support)
 #
 # Following any entry in the file with the characters "#PRE" will cause
-# the entry to be pre-loaded into the name cache. By default, entries are
-# not pre-loaded, but are parsed only after dynamic name resolution fails.
+# the entry to be preloaded into the name cache. By default, entries are
+# not preloaded, but are parsed only after dynamic name resolution fails.
 #
 # Following an entry with the "#DOM:&lt;domain&gt;" tag will associate the
 # entry with the domain specified by &lt;domain&gt;. This effects how the
@@ -531,7 +526,7 @@ It typically looks like this:
 <para>
 This file is usually located in MS Windows NT 4.0 or Windows 200x/XP in 
 the directory <filename>%SystemRoot%\SYSTEM32\DRIVERS\ETC</filename> and contains 
-the IP Address and the IP hostname in matched pairs. It can be 
+the IP address and the IP hostname in matched pairs. It can be 
 used by the name resolution infrastructure in MS Windows, depending 
 on how the TCP/IP environment is configured. This file is in 
 every way the equivalent of the UNIX/Linux <filename>/etc/hosts</filename> file.
@@ -547,13 +542,13 @@ every way the equivalent of the UNIX/Linux <filename>/etc/hosts</filename> file.
 <indexterm><primary>DNS</primary></indexterm>
 This capability is configured in the TCP/IP setup area in the network 
 configuration facility. If enabled, an elaborate name resolution sequence 
-is followed, the precise nature of which is dependant on how the NetBIOS 
+is followed, the precise nature of which is dependent on how the NetBIOS 
 Node Type parameter is configured. A Node Type of 0 means that
 NetBIOS broadcast (over UDP broadcast) is used if the name 
 that is the subject of a name lookup is not found in the NetBIOS name 
-cache. If that fails then DNS, HOSTS and LMHOSTS are checked. If set to 
+cache. If that fails, then DNS, HOSTS, and LMHOSTS are checked. If set to 
 Node Type 8, then a NetBIOS Unicast (over UDP Unicast) is sent to the 
-WINS Server to obtain a lookup before DNS, HOSTS, LMHOSTS, or broadcast 
+WINS server to obtain a lookup before DNS, HOSTS, LMHOSTS, or broadcast 
 lookup is used.
 </para>
 
@@ -568,7 +563,7 @@ lookup is used.
 A WINS (Windows Internet Name Server) service is the equivalent of the 
 rfc1001/1002 specified NBNS (NetBIOS Name Server). A WINS server stores 
 the names and IP addresses that are registered by a Windows client 
-if the TCP/IP setup has been given at least one WINS Server IP Address.
+if the TCP/IP setup has been given at least one WINS server IP address.
 </para>
 
 <para>
@@ -606,12 +601,12 @@ of the WINS server.
 
 <para>
 TCP/IP network configuration problems find every network administrator sooner or later.
-The cause can be anything from keyboard mishaps, forgetfulness, simple mistakes, and
+The cause can be anything from keyboard mishaps to forgetfulness to simple mistakes to
 carelessness. Of course, no one is ever deliberately careless!
 </para>
 
 	<sect2>
-		<title>Pinging Works Only in One Way</title>
+		<title>Pinging Works Only One Way</title>
 
 	<para>
 	<quote>I can ping my Samba server from Windows, but I cannot ping my Windows
@@ -619,8 +614,8 @@ carelessness. Of course, no one is ever deliberately careless!
 	</para>
 
 	<para>
-	<emphasis>Answer:</emphasis> The Windows machine was at IP Address 192.168.1.2 with netmask 255.255.255.0, the
-	Samba server (Linux) was at IP Address 192.168.1.130 with netmask 255.255.255.128.
+	The Windows machine was at IP address 192.168.1.2 with netmask 255.255.255.0, the
+	Samba server (Linux) was at IP address 192.168.1.130 with netmask 255.255.255.128.
 	The machines were on a local network with no external connections.
 	</para>
 
@@ -644,17 +639,17 @@ carelessness. Of course, no one is ever deliberately careless!
 		remote connection is down.</para></listitem>
 		<listitem><para>Client is configured to use a WINS server, but there is no WINS server.</para></listitem>
 		<listitem><para>Client is not configured to use a WINS server, but there is a WINS server.</para></listitem>
-		<listitem><para>Firewall is filtering our DNS or WINS traffic.</para></listitem>
+		<listitem><para>Firewall is filtering out DNS or WINS traffic.</para></listitem>
 	</itemizedlist>
 
 	</sect2>
 
 	<sect2>
-	<title>Samba Server Name Change Problem</title>
+	<title>Samba Server Name-Change Problem</title>
 
 	<para>
-	<quote>The name of the Samba server was changed, Samba was restarted, Samba server cannot be
-	ping-ed by new name from MS Windows NT4 Workstation, but it does still respond to ping using
+	<quote>The name of the Samba server was changed, Samba was restarted, and now the Samba server cannot be
+	pinged by its new name from an MS Windows NT4 workstation, but it does still respond to pinging using
 	the old name. Why?</quote>
 	</para>
 
@@ -663,9 +658,9 @@ carelessness. Of course, no one is ever deliberately careless!
 	</para>
 
 	<itemizedlist>
-		<listitem><para>WINS is not in use, only broadcast-based name resolution is used.</para></listitem>
-		<listitem><para>The Samba server was renamed and restarted within the last 10-15 minutes.</para></listitem>
-		<listitem><para>The old Samba server name is still in the NetBIOS name cache on the MS Windows NT4 Workstation.</para></listitem>
+		<listitem><para>WINS is not in use; only broadcast-based name resolution is used.</para></listitem>
+		<listitem><para>The Samba server was renamed and restarted within the last 10 or 15 minutes.</para></listitem>
+		<listitem><para>The old Samba server name is still in the NetBIOS name cache on the MS Windows NT4 workstation.</para></listitem>
 	</itemizedlist>
 
 	<para>
@@ -702,9 +697,9 @@ SARDON           &lt;00&gt;  GROUP       Registered
 	</para>
 
 	<para>
-	In the above example, &example.server.samba; is the Samba server and &example.workstation.windows; is the MS Windows NT4 Workstation.
-	The first listing shows the contents of the Local Name Table (i.e., Identity information on
-	the MS Windows workstation) and the second shows the NetBIOS name in the NetBIOS name cache.
+	In this example, &example.server.samba; is the Samba server and &example.workstation.windows; is the MS Windows NT4 workstation.
+	The first listing shows the contents of the Local Name Table (i.e., identity information on
+	the MS Windows workstation), and the second shows the NetBIOS name in the NetBIOS name cache.
 	The name cache contains the remote machines known to this workstation.
 	</para>