PHPTR Edit 2. More to come.

(This used to be commit bc4d2f60cefa126415b06440280761d19e8c0d21)

1 files changed, 65 insertions, 65 deletions

diff --git a/docs/Samba3-HOWTO/TOSHARG-SWAT.xml b/docs/Samba3-HOWTO/TOSHARG-SWAT.xml
index 1995778d33..1f05a3f25d 100644
--- a/docs/Samba3-HOWTO/TOSHARG-SWAT.xml
+++ b/docs/Samba3-HOWTO/TOSHARG-SWAT.xml
@@ -6,15 +6,15 @@
 	<pubdate>April 21, 2003</pubdate>
 </chapterinfo>
 
-<title>SWAT &smbmdash; The Samba Web Administration Tool</title>
+<title>SWAT: The Samba Web Administration Tool</title>
 
 <para>
 There are many and varied opinions regarding the usefulness of SWAT.
 No matter how hard one tries to produce the perfect configuration tool, it remains
-an object of personal taste. SWAT is a tool that will allow Web-based configuration
+an object of personal taste. SWAT is a tool that allows Web-based configuration
 of Samba. It has a wizard that may help to get Samba configured
 quickly, it has context-sensitive help on each &smb.conf; parameter, it provides for monitoring of current state
-of connection information, and it allows network-wide MS Windows network password
+of connection information, and it allows networkwide MS Windows network password
 management.
 </para>
 
@@ -23,22 +23,22 @@ management.
 
 <para>
 SWAT is a facility that is part of the Samba suite. The main executable is called
-<command>swat</command> and is invoked by the inter-networking super daemon.
+<command>swat</command> and is invoked by the internetworking super daemon.
 See <link linkend="xinetd">appropriate section</link> for details.
 </para>
 
 <para>
-SWAT uses integral samba components to locate parameters supported by the particular
+SWAT uses integral Samba components to locate parameters supported by the particular
 version of Samba. Unlike tools and utilities that are external to Samba, SWAT is always
 up to date as known Samba parameters change. SWAT provides context-sensitive help for each
 configuration parameter, directly from <command>man</command> page entries.
 </para>
 
 <para>
-There are network administrators who believe that it is a good idea to write systems
+Some network administrators believe that it is a good idea to write systems
 documentation inside configuration files, and for them SWAT will always be a nasty tool. SWAT
-does not store the configuration file in any intermediate form, rather, it stores only the
-parameter settings, so when SWAT writes the &smb.conf; file to disk, it will write only
+does not store the configuration file in any intermediate form; rather, it stores only the
+parameter settings, so when SWAT writes the &smb.conf; file to disk, it writes only
 those parameters that are at other than the default settings. The result is that all comments,
 as well as parameters that are no longer supported, will be lost from the &smb.conf; file.
 Additionally, the parameters will be written back in internal ordering.
@@ -46,8 +46,8 @@ Additionally, the parameters will be written back in internal ordering.
 
 <note><para>
 Before using SWAT, please be warned &smbmdash; SWAT will completely replace your &smb.conf; with
-a fully-optimized file that has been stripped of all comments you might have placed there
-and only non-default settings will be written to the file.
+a fully optimized file that has been stripped of all comments you might have placed there
+and only nondefault settings will be written to the file.
 </para></note>
 
 </sect1>
@@ -57,7 +57,7 @@ and only non-default settings will be written to the file.
 
 <para>
 This section aims to unlock the dark secrets behind how SWAT may be made to work,
-may be made more secure, and how to solve Internationalization support problems.
+how it can be made more secure, and how to solve internationalization support problems.
 </para>
 
 <sect2>
@@ -66,13 +66,13 @@ may be made more secure, and how to solve Internationalization support problems.
 <para>
 The very first step that should be taken before attempting to configure a host
 system for SWAT operation is to check that it is installed. This may seem a trivial
-point to some, however several Linux distributions do not install SWAT by default,
-even though they do ship an install-able binary support package containing SWAT
+point to some, but several Linux distributions do not install SWAT by default,
+even though they do ship an installable binary support package containing SWAT
 on the distribution media.
 </para>
 
 <para>
-When you have confirmed that SWAT is installed it is necessary to validate
+When you have confirmed that SWAT is installed, it is necessary to validate
 that the installation includes the binary <command>swat</command> file as well
 as all the supporting text and Web files. A number of operating system distributions
 in the past have failed to include the necessary support files, even though the
@@ -80,36 +80,36 @@ in the past have failed to include the necessary support files, even though the
 </para>
 
 <para>
-Finally, when you are sure that SWAT has been fully installed, please check the SWAT
-has been enabled in the control file for the inter-networking super-daemon (inetd or xinetd)
+Finally, when you are sure that SWAT has been fully installed, please check that SWAT
+is enabled in the control file for the internetworking super-daemon (inetd or xinetd)
 that is used on your operating system platform. 
 </para>
 
 <sect3>
-<title>Locating the <command>swat</command> File</title>
+<title>Locating the <command>SWAT</command> File</title>
 
 <para>
 To validate that SWAT is installed, first locate the <command>swat</command> binary
-file on the system. It may be found under the following directories:
-<simplelist>
-	<member><filename>/usr/local/samba/bin</filename> &smbmdash; the default Samba location.</member>
-	<member><filename>/usr/sbin</filename> &smbmdash; the default location on most Linux systems.</member>
+file on the system. It may be found under the following directories:</para>
+<para><simplelist>
+	<member><filename>/usr/local/samba/bin</filename> &smbmdash; the default Samba location</member>
+	<member><filename>/usr/sbin</filename> &smbmdash; the default location on most Linux systems</member>
 	<member><filename>/opt/samba/bin</filename></member>
 </simplelist>
 </para>
 
 <para>
-The actual location is much dependant on the choice of the operating system vendor, or as determined
+The actual location is much dependent on the choice of the operating system vendor or as determined
 by the administrator who compiled and installed Samba.
 </para>
 
 <para>
-There are a number methods that may be used to locate the <command>swat</command> binary file.
-The following methods may be helpful:
+There are a number of methods that may be used to locate the <command>swat</command> binary file.
+The following methods may be helpful.
 </para>
 
 <para>
-If <command>swat</command> is in your current operating system search path it will be easy to 
+If <command>swat</command> is in your current operating system search path, it will be easy to 
 find it. You can ask what are the command-line options for <command>swat</command> as shown here:
 <screen>
 frodo:~ # swat -?
@@ -212,7 +212,7 @@ jht@frodo:/>
 </para>
 
 <para>
-If the files needed are not available it will be necessary to obtain and install them
+If the files needed are not available, it is necessary to obtain and install them
 before SWAT can be used.
 </para>
 
@@ -232,7 +232,7 @@ your UNIX/Linux system has, you will have either an <command>inetd</command>- or
 The nature and location of the network super-daemon varies with the operating system
 implementation. The control file (or files) can be located in the file 
 <filename>/etc/inetd.conf</filename> or in the directory <filename>/etc/[x]inet[d].d</filename>
-or similar.
+or in a similar location.
 </para>
 
 <para>
@@ -274,7 +274,7 @@ as shown.
 </para>
 
 <para>
-Both of the above examples assume that the <command>swat</command> binary has been
+Both of the previous examples assume that the <command>swat</command> binary has been
 located in the <filename>/usr/sbin</filename> directory. In addition to the above,
 SWAT will use a directory access point from which it will load its Help files
 as well as other control information. The default location for this on most Linux
@@ -286,16 +286,16 @@ location using Samba defaults will be <filename>/usr/local/samba/swat</filename>
 Access to SWAT will prompt for a logon. If you log onto SWAT as any non-root user,
 the only permission allowed is to view certain aspects of configuration as well as
 access to the password change facility. The buttons that will be exposed to the non-root
-user are: <guibutton>HOME</guibutton>, <guibutton>STATUS</guibutton>, <guibutton>VIEW</guibutton>, 
+user are <guibutton>HOME</guibutton>, <guibutton>STATUS</guibutton>, <guibutton>VIEW</guibutton>, and 
 <guibutton>PASSWORD</guibutton>. The only page that allows
 change capability in this case is <guibutton>PASSWORD</guibutton>.
 </para>
 
 <para>
 As long as you log onto SWAT as the user <emphasis>root</emphasis>, you should obtain
-full change and commit ability. The buttons that will be exposed include:
+full change and commit ability. The buttons that will be exposed include
 <guibutton>HOME</guibutton>, <guibutton>GLOBALS</guibutton>, <guibutton>SHARES</guibutton>, <guibutton>PRINTERS</guibutton>, 
-<guibutton>WIZARD</guibutton>, <guibutton>STATUS</guibutton>, <guibutton>VIEW</guibutton>, <guibutton>PASSWORD</guibutton>.
+<guibutton>WIZARD</guibutton>, <guibutton>STATUS</guibutton>, <guibutton>VIEW</guibutton>, and <guibutton>PASSWORD</guibutton>.
 </para>
 
 </sect2>
@@ -306,7 +306,7 @@ full change and commit ability. The buttons that will be exposed include:
 
 <para>
 <indexterm><primary>swat</primary><secondary>security</secondary></indexterm>
-Many people have asked about how to setup SWAT with SSL to allow for secure remote
+Many people have asked about how to set up SWAT with SSL to allow for secure remote
 administration of Samba. Here is a method that works, courtesy of Markus Krieger.
 </para>
 
@@ -329,7 +329,7 @@ Modifications to the SWAT setup are as follows:
 </screen></para></step>
 
 	<step><para>
-	Remove swat-entry from [x]inetd.
+	Remove SWAT entry from [x]inetd.
 	</para></step>
 
 	<step><para>
@@ -342,7 +342,7 @@ Modifications to the SWAT setup are as follows:
 </procedure>
 
 <para>
-Afterward, simply connect to swat by using the URL <ulink noescape="1" url="https://myhost:901">https://myhost:901</ulink>, accept the certificate
+Afterward, simply connect to SWAT by using the URL <ulink noescape="1" url="https://myhost:901">https://myhost:901</ulink>, accept the certificate,
 and the SSL connection is up.
 </para>
 
@@ -373,8 +373,8 @@ To enable this feature:
 </itemizedlist>
 
 <para>
-The name of msg file is same as the language ID sent by the browser. For
-example en means "English", ja means "Japanese", fr means "French.
+The name of the <command>msg</command> file is the same as the language ID sent by the browser. For
+example, <emphasis>en</emphasis> means English, <emphasis>ja</emphasis> means Japanese, <emphasis>fr</emphasis> means French.
 </para>
 
 <para>
@@ -388,12 +388,12 @@ msgid "Set Default"
 msgstr "Imposta Default"
 </screen>
 and so on. If you find a mistake or create a new <command>msg</command> file, please email it
-to us so we will include this in the next release of Samba. The <command>msg</command> file should be encoded in UTF-8.
+to us so we will consider it in the next release of Samba. The <command>msg</command> file should be encoded in UTF-8.
 </para>
 
 <para>
 Note that if you enable this feature and the <smbconfoption name="display charset"/> is not
-matched to your browsers setting, the SWAT display may be corrupted.  In a future version of
+matched to your browser's setting, the SWAT display may be corrupted.  In a future version of
 Samba, SWAT will always display messages with UTF-8 encoding. You will then not need to set
 this &smb.conf; file parameter.
 </para>
@@ -406,8 +406,8 @@ this &smb.conf; file parameter.
 <title>Overview and Quick Tour</title>
 
 <para>
-SWAT is a tools that many be used to configure Samba, or just to obtain useful links
-to important reference materials such as the contents of this book, as well as other
+SWAT is a tool that may be used to configure Samba or just to obtain useful links
+to important reference materials such as the contents of this book as well as other
 documents that have been found useful for solving Windows networking problems.
 </para>
 
@@ -423,15 +423,15 @@ document) as well as the O'Reilly book <quote>Using Samba.</quote>
 <para>
 Administrators who wish to validate their Samba configuration may obtain useful information
 from the man pages for the diagnostic utilities. These are available from the SWAT home page
-also. One diagnostic tool that is not mentioned on this page, but that is particularly
-useful is <ulink url="http://www.ethereal.com/"><command>ethereal</command>.</ulink>
+also. One diagnostic tool that is not mentioned on this page but that is particularly
+useful is <ulink url="http://www.ethereal.com/"><command>ethereal</command></ulink>.
 </para>
 
 <warning><para>
 SWAT can be configured to run in <emphasis>demo</emphasis> mode. This is not recommended
-as it runs SWAT without authentication and with full administrative ability. Allows
+because it runs SWAT without authentication and with full administrative ability. It allows
 changes to &smb.conf; as well as general operation with root privileges. The option that
-creates this ability is the <option>-a</option> flag to swat. <emphasis>Do not use this in a
+creates this ability is the <option>-a</option> flag to SWAT. <emphasis>Do not use this in a
 production environment.</emphasis>
 </para></warning>
 
@@ -441,7 +441,7 @@ production environment.</emphasis>
 <title>Global Settings</title>
 
 <para>
-The <guibutton>GLOBALS</guibutton> button will expose a page that allows configuration of the global parameters
+The <guibutton>GLOBALS</guibutton> button exposes a page that allows configuration of the global parameters
 in &smb.conf;. There are two levels of exposure of the parameters:
 </para>
 
@@ -464,7 +464,7 @@ You may also do this by clicking on the radio button, then click on the <guibutt
 <para>
 After making any changes to configuration parameters, make sure that
 you click on the 
-<guibutton>Commit Changes</guibutton> button before moving to another area, otherwise
+<guibutton>Commit Changes</guibutton> button before moving to another area; otherwise,
 your changes will be lost.
 </para>
 
@@ -480,16 +480,16 @@ for, simply click on the
 <title>Share Settings</title>
 
 <para>
-To effect a currently configured share, simply click on the pull down button between the
-<guibutton>Choose Share</guibutton> and the <guibutton>Delete Share</guibutton> buttons,
-select the share you wish to operate on, then to edit the settings
+To affect a currently configured share, simply click on the pull-down button between the
+<guibutton>Choose Share</guibutton> and the <guibutton>Delete Share</guibutton> buttons and
+select the share you wish to operate on. To edit the settings,
 click on the
 <guibutton>Choose Share</guibutton> button. To delete the share, simply press the
 <guibutton>Delete Share</guibutton> button.
 </para>
 
 <para>
-To create a new share, next to the button labeled <guibutton>Create Share</guibutton> enter
+To create a new share, next to the button labeled <guibutton>Create Share</guibutton>, enter
 into the text field the name of the share to be created, then click on the 
 <guibutton>Create Share</guibutton> button.
 </para>
@@ -500,16 +500,16 @@ into the text field the name of the share to be created, then click on the
 <title>Printers Settings</title>
 
 <para>
-To affect a currently configured printer, simply click on the pull down button between the
-<guibutton>Choose Printer</guibutton> and the <guibutton>Delete Printer</guibutton> buttons,
-select the printer you wish to operate on, then to edit the settings
+To affect a currently configured printer, simply click on the pull-down button between the
+<guibutton>Choose Printer</guibutton> and the <guibutton>Delete Printer</guibutton> buttons and
+select the printer you wish to operate on. To edit the settings,
 click on the
 <guibutton>Choose Printer</guibutton> button. To delete the share, simply press the
 <guibutton>Delete Printer</guibutton> button.
 </para>
 
 <para>
-To create a new printer, next to the button labeled <guibutton>Create Printer</guibutton> enter
+To create a new printer, next to the button labeled <guibutton>Create Printer</guibutton>, enter
 into the text field the name of the share to be created, then click on the 
 <guibutton>Create Printer</guibutton> button.
 </para>
@@ -520,14 +520,14 @@ into the text field the name of the share to be created, then click on the
 <title>The SWAT Wizard</title>
 
 <para>
-The purpose if the SWAT Wizard is to help the Microsoft-knowledgeable network administrator
+The purpose of the SWAT Wizard is to help the Microsoft-knowledgeable network administrator
 to configure Samba with a minimum of effort.
 </para>
 
 <para>
 The Wizard page provides a tool for rewriting the &smb.conf; file in fully optimized format.
 This will also happen if you press the <guibutton>Commit</guibutton> button. The two differ
-since the <guibutton>Rewrite</guibutton> button ignores any changes that may have been made,
+because the <guibutton>Rewrite</guibutton> button ignores any changes that may have been made,
 while the <guibutton>Commit</guibutton> button causes all changes to be affected.
 </para>
 
@@ -537,7 +537,7 @@ options that may be necessary to create a working Samba server.
 </para>
 
 <para>
-Finally, there are a limited set of options that will determine what type of server Samba
+Finally, there are a limited set of options that determine what type of server Samba
 will be configured for, whether it will be a WINS server, participate as a WINS client, or
 operate with no WINS support. By clicking one button, you can elect to expose (or not) user
 home directories.
@@ -550,18 +550,18 @@ home directories.
 
 <para>
 The status page serves a limited purpose. First, it allows control of the Samba daemons.
-The key daemons that create the Samba server environment are: &smbd;, &nmbd;, &winbindd;.
+The key daemons that create the Samba server environment are &smbd;, &nmbd;, and &winbindd;.
 </para>
 
 <para>
 The daemons may be controlled individually or as a total group. Additionally, you may set
 an automatic screen refresh timing. As MS Windows clients interact with Samba, new smbd processes
-will be continually spawned. The auto-refresh facility will allow you to track the changing
+are continually spawned. The auto-refresh facility allows you to track the changing
 conditions with minimal effort.
 </para>
 
 <para>
-Lastly, the Status page may be used to terminate specific smbd client connections in order to
+Finally, the status page may be used to terminate specific smbd client connections in order to
 free files that may be locked.
 </para>
 
@@ -571,8 +571,8 @@ free files that may be locked.
 <title>The View Page</title>
 
 <para>
-This page allows the administrator to view the optimized &smb.conf; file and, if you are
-particularly masochistic, will permit you also to see all possible global configuration
+The view page allows you to view the optimized &smb.conf; file and, if you are
+particularly masochistic, permits you also to see all possible global configuration
 parameters and their settings.
 </para>
 
@@ -582,13 +582,13 @@ parameters and their settings.
 <title>The Password Change Page</title>
 
 <para>
-The Password Change page is a popular tool that allows the creation, deletion, deactivation,
-and reactivation of MS Windows networking users on the local machine. Alternately, you can use
+The password change page is a popular tool that allows the creation, deletion, deactivation,
+and reactivation of MS Windows networking users on the local machine. You can also use
 this tool to change a local password for a user account.
 </para>
 
 <para>
-When logged in as a non-root account, the user will have to provide the old password as well as
+When logged in as a non-root account, the user must provide the old password as well as
 the new password (twice). When logged in as <emphasis>root</emphasis>, only the new password is
 required.
 </para>