From b501269b7ef2d597d48e02b2fe842be3995d78ab Mon Sep 17 00:00:00 2001
From: Vadim Kurland <vadim@netcitadel.com>
Date: Sun, 13 Jun 2010 00:38:11 +0000
Subject: [PATCH] fixed #1507 typos, spell checking, url corrections

---
 build_num                                     |  2 +-
 doc/ReleaseNotes_template.html                |  2 +-
 .../Tutorial/getting_started/html/page25.html |  2 +-
 .../Tutorial/getting_started/html/page29.html |  2 +-
 src/res/help/en_US/ipcopAdvancedDialog.html   |  8 +++----
 src/res/help/en_US/iptAdvancedDialog.html     | 24 +++++++++----------
 src/res/help/en_US/linux24AdvancedDialog.html |  2 +-
 src/res/help/en_US/pfAdvancedDialog.html      | 10 ++++----
 src/res/help/en_US/pf_rule_options.html       |  2 +-
 src/res/help/en_US/release_notes_4.0.0.html   | 22 ++++++++---------
 src/res/help/en_US/summary.html               | 16 ++++++-------
 11 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/build_num b/build_num
index c07c01607..326d8fa44 100644
--- a/build_num
+++ b/build_num
@@ -1 +1 @@
-#define BUILD_NUM 2978
+#define BUILD_NUM 2979
diff --git a/doc/ReleaseNotes_template.html b/doc/ReleaseNotes_template.html
index 991dd6c84..82fad234c 100644
--- a/doc/ReleaseNotes_template.html
+++ b/doc/ReleaseNotes_template.html
@@ -45,7 +45,7 @@ href="http://www.fwbuilder.org/archives/cat_installation.html">here</a></b>
   <br><br>
   </li>
 
-  <li>Improvements in policy compiler for ipfiler:
+  <li>Improvements in policy compiler for ipfilter:
   <p>
   <ul>
     <li>
diff --git a/src/gui/Tutorial/getting_started/html/page25.html b/src/gui/Tutorial/getting_started/html/page25.html
index 52bbe16d0..0807d61fb 100644
--- a/src/gui/Tutorial/getting_started/html/page25.html
+++ b/src/gui/Tutorial/getting_started/html/page25.html
@@ -12,7 +12,7 @@
 </div>
 
 <p>
-  Firewall Builder 4.0 allows you to compile single policy or nat rule
+  Firewall Builder 4.0 allows you to compile single policy or NAT rule
   and see generated firewall configuration right there in the GUI. To
   do this, select any object in the rule you want to process or
   highlight its leftmost element where rule number is shown, then
diff --git a/src/gui/Tutorial/getting_started/html/page29.html b/src/gui/Tutorial/getting_started/html/page29.html
index e35f9985d..5713b1e12 100644
--- a/src/gui/Tutorial/getting_started/html/page29.html
+++ b/src/gui/Tutorial/getting_started/html/page29.html
@@ -14,7 +14,7 @@
 <p>
   Now we can compile the policy of the firewall "guardian" and
   generate the iptables script. To do so, use toolbar button located
-  right above the panel that shows policy and nat rules. This button
+  right above the panel that shows policy and NAT rules. This button
   compiles rules of the firewall that is opened at the
   moment. Compiler processes Policy, NAT and Routing rules even though
   the panel shows only one kind of rules at a time. Another button
diff --git a/src/res/help/en_US/ipcopAdvancedDialog.html b/src/res/help/en_US/ipcopAdvancedDialog.html
index 91efbd1f8..2645463d0 100644
--- a/src/res/help/en_US/ipcopAdvancedDialog.html
+++ b/src/res/help/en_US/ipcopAdvancedDialog.html
@@ -154,11 +154,11 @@ online on the project web site at <a href="http://www.netfilter.org">http://www.
 <p>
   This adds a rule on top of the policy with iptables target TCPMSS
   and option --clamp-mss-to-pmtu which automatically clamps MSS value
-  to (path_MTU - 40). This iptables rule is added only if ip
-  forwarding is turned on in the host settings dialog. since ip
+  to (path_MTU - 40). This iptables rule is added only if IP
+  forwarding is turned on in the host settings dialog. since IP
   forwarding for ipv4 and ipv6 can be configured separately, rules
   with target TCPMSS for iptables and ip6tables are also added
-  separately if corresponding ip forwarding setting is
+  separately if corresponding IP forwarding setting is
   enabled. Finally, this target is only available in ip6tables
   starting with version 1.3.8 and compiler will not add it to the
   generated script if version is set to less than "1.4.x" in the
@@ -258,7 +258,7 @@ online on the project web site at <a href="http://www.netfilter.org">http://www.
   here. Prolog section is added at the beginning of the script, before
   generated iptables commands. Note that generated iptables script is
   just a shell script, so commands you place in the Prolog and Epilog
-  sections should be valid bourne shell commands.
+  sections should be valid Bourne shell commands.
 
 
 
diff --git a/src/res/help/en_US/iptAdvancedDialog.html b/src/res/help/en_US/iptAdvancedDialog.html
index 1b1afe0f0..33d3aecb5 100644
--- a/src/res/help/en_US/iptAdvancedDialog.html
+++ b/src/res/help/en_US/iptAdvancedDialog.html
@@ -224,11 +224,11 @@ online on the project web site at <a href="http://www.netfilter.org">http://www.
 <p>
   This adds a rule on top of the policy with iptables target TCPMSS
   and option --clamp-mss-to-pmtu which automatically clamps MSS value
-  to (path_MTU - 40). This iptables rule is added only if ip
-  forwarding is turned on in the host settings dialog. since ip
+  to (path_MTU - 40). This iptables rule is added only if IP
+  forwarding is turned on in the host settings dialog. since IP
   forwarding for ipv4 and ipv6 can be configured separately, rules
   with target TCPMSS for iptables and ip6tables are also added
-  separately if corresponding ip forwarding setting is
+  separately if corresponding IP forwarding setting is
   enabled. Finally, this target is only available in ip6tables
   starting with version 1.3.8 and compiler will not add it to the
   generated script if version is set to less than "1.4.x" in the
@@ -269,7 +269,7 @@ online on the project web site at <a href="http://www.netfilter.org">http://www.
   established.
 </p>
 
-<h3>Install the rule for ssh access from the manageemnt workstation
+<h3>Install the rule for ssh access from the management workstation
   when the firewall is stopped</h3>
 
 <p>
@@ -352,7 +352,7 @@ online on the project web site at <a href="http://www.netfilter.org">http://www.
   here. Prolog section is added at the beginning of the script, before
   generated iptables commands. Note that generated iptables script is
   just a shell script, so commands you place in the Prolog and Epilog
-  sections should be valid bourne shell commands.
+  sections should be valid Bourne shell commands.
 </p>
 
 <h3>Insert prolog script ... </h3>
@@ -525,7 +525,7 @@ online on the project web site at <a href="http://www.netfilter.org">http://www.
 
 <h3>Configure interfaces of the firewall machine</h3>
 <p>
-  This option makes compiler add commands to configure ip addresses of
+  This option makes compiler add commands to configure IP addresses of
   the interfaces of the firewall according to the "Address" objects
   added to interfaces in the Firewall Builder GUI.
 </p>
@@ -536,23 +536,23 @@ online on the project web site at <a href="http://www.netfilter.org">http://www.
   past it purged all addresses and then added those defined in
   fwbuilder back. Script created by fwbuilder v4.0 does not purge
   addresses, instead it manages them incrementally.  First, it obtains
-  the list of ip addresses of each interface and compares it with
+  the list of IP addresses of each interface and compares it with
   addresses defined in fwbuilder.  Then, it adds missing addresses to
   the interface and deletes addresses that are not configured in
   fwbuilder.
 </p>
 
-<h3>Clear ip addresses and bring down interfaces not configured in fwbuilder</h3>
+<h3>Clear IP addresses and bring down interfaces not configured in fwbuilder</h3>
 <p>
-  If this option is on, generated script will clear ip addresses and
+  If this option is on, generated script will clear IP addresses and
   bring down interfaces of the firewall that have not been configured
   in the fwbuilder GUI. This can be used to ensure that the
   configuration of the firewall machine is perfectly synchronized with
   objects defined in fwbuilder. This function does nothing to
   interfaces configured in fwbuilder, regardless of their type
-  ("regular", "dynamic" or "unnumbered"). Be caureful using this
+  ("regular", "dynamic" or "unnumbered"). Be careful using this
   option, especially in the early stages of building fwbuilder objects
-  for the new firewall. If you forget to add an inetrface that is
+  for the new firewall. If you forget to add an interface that is
   supposed to pass traffic to fwbuilder configuration, generated
   script will shut it down when this option is turned on. However when
   configuration has been debugged and is known to be correct, it may
@@ -563,7 +563,7 @@ online on the project web site at <a href="http://www.netfilter.org">http://www.
 <h3>Configure VLAN interfaces</h3>
 <p>
   When this option is on, generated script will use vconfig commands
-  to configure vlan inetrfaces defined in the fwbuilder GUI. The
+  to configure vlan interfaces defined in the fwbuilder GUI. The
   script tries to do this incrementally, that is, it compares
   requested set of vlans with existing vlan interfaces on the machine,
   then it creates those that are missing and deletes those that are not
diff --git a/src/res/help/en_US/linux24AdvancedDialog.html b/src/res/help/en_US/linux24AdvancedDialog.html
index 3644c93e0..219a631b0 100644
--- a/src/res/help/en_US/linux24AdvancedDialog.html
+++ b/src/res/help/en_US/linux24AdvancedDialog.html
@@ -163,7 +163,7 @@ IPv6 related kernel settings are documented here:
 <p>
   syncookies seriously violate TCP protocol, do not allow
   to use TCP extensions, can result in serious degradation
-  of some services (f.e. SMTP relaying), visible not by you,
+  of some services (e.g. SMTP relaying), visible not by you,
   but your clients and relays, contacting you. While you see
   synflood warnings in logs not being really flooded, your server
   is seriously misconfigured.
diff --git a/src/res/help/en_US/pfAdvancedDialog.html b/src/res/help/en_US/pfAdvancedDialog.html
index 1db9e6196..abf041ca0 100644
--- a/src/res/help/en_US/pfAdvancedDialog.html
+++ b/src/res/help/en_US/pfAdvancedDialog.html
@@ -111,7 +111,7 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf">http://www
 <p>
   For PF 4.x this option adds "flags any" parameters to rules that
   match TCP services. PF 4.x by default behaves as if "flags S/SA"
-  parameter was added to all rules matching tcp services. Adding
+  parameter was added to all rules matching TCP services. Adding
   "flags any" makes rule match not only TCP packets with SYN flag set
   and ACK flag cleared, which is the packet that initiates the
   session, but also packets with any other combination of flags,
@@ -121,14 +121,14 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf">http://www
 <p>
   for PF 3.x the behavior of the policy compiler is opposite: when
   this option is not set, it adds "flags S/SA" to all rules that match
-  any tcp services; if this option is set, "flags" parameter is not
+  any TCP services; if this option is set, "flags" parameter is not
   added to these rules at all, which makes them match TCP packets with
   any combination of flags.
 
 
   <h3>Modulate state for all stateful rules</h3>
 <p>
-  This adds "modulate state" parameter to rules that match any tcp
+  This adds "modulate state" parameter to rules that match any TCP
   services. Quoting man pf.conf(5), section <b>STATE MODULATION</b>:
   <blockquote>
     Much of the security derived from TCP is attributable to how well
@@ -576,7 +576,7 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf">http://www
   here. Prolog section is added at the beginning of the script, before
   generated iptables commands. Note that generated iptables script is
   just a shell script, so commands you place in the Prolog and Epilog
-  sections should be valid bourne shell commands.
+  sections should be valid Bourne shell commands.
 
 
 
@@ -625,7 +625,7 @@ online <a href="http://www.openbsd.org/cgi-bin/man.cgi?query=pf.conf">http://www
 
   <h3>Configure interfaces of the firewall machine</h3>
 <p>
-  This option makes compiler add commands to configure ip addresses of
+  This option makes compiler add commands to configure IP addresses of
   the interfaces of the firewall according to the "Address" objects
   added to interfaces in the Firewall Builder GUI.
 
diff --git a/src/res/help/en_US/pf_rule_options.html b/src/res/help/en_US/pf_rule_options.html
index a8b96f08b..b09db4276 100644
--- a/src/res/help/en_US/pf_rule_options.html
+++ b/src/res/help/en_US/pf_rule_options.html
@@ -20,7 +20,7 @@
 
 <p>
 In PF 4.x, "flags S/SA keep state" is the default. Compiler will omit
-these flags while generating code for stateful rules matching tcp
+these flags while generating code for stateful rules matching TCP
 services. However, according to the PF FAQ, care should be taken while
 dealing with states and interface enc0. To avoid leaking unencrypted
 traffic out, the FAQ recommends setting 'keep state' explicitly in all
diff --git a/src/res/help/en_US/release_notes_4.0.0.html b/src/res/help/en_US/release_notes_4.0.0.html
index 1a2ebd4f4..f771aa679 100644
--- a/src/res/help/en_US/release_notes_4.0.0.html
+++ b/src/res/help/en_US/release_notes_4.0.0.html
@@ -108,7 +108,7 @@
 </p>
 
 <p>
-  Now you can <b>change ip addresses of interfaces of the new firewall
+  Now you can <b>change IP addresses of interfaces of the new firewall
   created from a template</b>. Templates come preconfigured with some
   IP addresses which probably do not match addresses used on your
   networks. When you create new firewall object from a template, the
@@ -296,7 +296,7 @@
   or Policy rule set. Top rule set is used to generate iptables rules
   in the built-in chains INPUT/OUTPUT/FORWARD or the rules in the main
   PF configuration file (not anchors).  If the firewall object has
-  other not-top Poluicy and NAT rule sets but no top rule set, packets
+  other not-top Policy and NAT rule sets but no top rule set, packets
   will never reach any rules.  However there are legitimate cases when
   administrator may want to use fwbuilder to only generate iptables
   commands for a custom chain or configuration for a custom PF anchor,
@@ -673,7 +673,7 @@ rule sets of this object rather than in the actual firewalls.
 
 <p>
   When an <b>interface with dynamic address</b> is used in a policy or
-  NAT rule, compiler generates shell script to read its ip addresses
+  NAT rule, compiler generates shell script to read its IP addresses
   at the time of execution, assigns them to temporary shell variables
   and uses them in rules. In previous versions (fwbuilder v2 and v3)
   only the first IPv4 address of an interface was used. V4 uses all
@@ -729,7 +729,7 @@ rule sets of this object rather than in the actual firewalls.
   loaded or there are no tables. This return code means the firewall
   is not running or not configured.  It also supports additional
   actions "interfaces" and "test_interfaces". Action "interfaces" only
-  runs commands that manage ip addresses of interfaces, as well as
+  runs commands that manage IP addresses of interfaces, as well as
   configure vlan, bridge and bonding interfaces. Action
   "test_interfaces" runs the same commands in the test mode when it
   prints commands that would be executed but does not actually execute
@@ -817,7 +817,7 @@ rule sets of this object rather than in the actual firewalls.
   /etc/init.d/fwbuilder.fw stop
 </pre>
   An option in the "Compiler" tab of the firewall object in fwbuilder
-  GUI alows you to make the firewall block all traffic when stopped
+  GUI allows you to make the firewall block all traffic when stopped
   but still permit ssh connections from preconfigured address of the
   management machine.
 </p>
@@ -839,8 +839,8 @@ rule sets of this object rather than in the actual firewalls.
 <p>
   This version of Firewall Builder introduces direct support for
   DD-WRT. There are two options: you can use nvram to install
-  generated firewall policy or you can use jffs (journaling flash file
-  system) on the device and store generated script there. Two host OS
+  generated firewall policy or you can use jffs (Journaling Flash File
+  System) on the device and store generated script there. Two host OS
   settings are provided: <strong>"DD-WRT (nvram)"</strong>
   and <strong>"DD-WRT (jffs)"</strong>.
 </p>
@@ -851,7 +851,7 @@ rule sets of this object rather than in the actual firewalls.
   In this mode generated script is somewhat shorter and does not
   support command line arguments "start", "stop", "status". The script
   does not try to load iptables modules on the firewall but configures
-  inetrface addresses, vlans, bridge ports and bonding
+  interface addresses, vlans, bridge ports and bonding
   interfaces. Built-in policy installer saves the script in nvram
   variable "fwb" and configures nvram variable "rc_firewall" to run
   this script.
@@ -927,7 +927,7 @@ rule sets of this object rather than in the actual firewalls.
   "nat-to" and "rdr-to" options in "pass" or "match" rules. Fwbuilder
   4.0 adds support for this. The list of recognized versions for PF
   has been extended with "4.7", choosing this version number makes
-  policy compiler generate nat and rdr rules using new syntax. Since
+  policy compiler generate NAT and rdr rules using new syntax. Since
   the "no" keyword has been removed as well, fwbuilder can no longer
   generate "no nat" rules for 4.7. Policy compiler recognizes this as
   a fatal error, administrator should use negation to implement
@@ -974,7 +974,7 @@ rule sets of this object rather than in the actual firewalls.
       like this: "scp file.fw router:nvram:file.fw"</li>
     <li>check that ssh and scp are enabled on the router (see commands above)</li>
     <li>check that user account has privilege 15</li>
-    <li>Use command "debug ip ssh" on the router to turn debugging
+    <li>Use command "debug IP ssh" on the router to turn debugging
       on. Diagnostic messages that it prints to the console and to log
       may help you identify the problem</li>
   </ul>
@@ -1037,7 +1037,7 @@ rule sets of this object rather than in the actual firewalls.
 
 <p>
   Added support for the <b>object-group</b> statement in generated IOS
-  configuration. This helps reduce size of the geenrated access lists
+  configuration. This helps reduce size of the generated access lists
   when the router should match long lists of IP addresses or
   ports. Both "network" and "service" object-groups are supported.
   This feature is controlled by a checkbox in the "Advanced" settings
diff --git a/src/res/help/en_US/summary.html b/src/res/help/en_US/summary.html
index faefb58e9..8d59fcc89 100644
--- a/src/res/help/en_US/summary.html
+++ b/src/res/help/en_US/summary.html
@@ -122,8 +122,8 @@
 
 <p>
   Firewall Builder can generate scripts that set
-  up <strong>interfaces</strong>, <strong>ip
-  addresses</strong>, <strong>snmp</strong>, <strong>ntp</strong>
+  up <strong>interfaces</strong>, <strong>IP
+  addresses</strong>, <strong>SNMP</strong>, <strong>NTP</strong>
   and <strong>logging</strong> parameters and other aspects of the
   general configuration of the firewall machine.
 </p>
@@ -166,20 +166,20 @@
   system. <span class="notranslate">Firewall Builder</span> is dual
   licensed, packages for Windows and Mac OS X are distributed under
   traditional EULA for reasonable
-  fee. <a href="http://www.fwbuilde.org/docs/firewall_builder_licensing.html">More...</a>
+  fee. <a href="http://www.fwbuilder.org/docs/firewall_builder_licensing.html">More...</a>
 </p>
 
 <p>
   We have lots of documentation online. Start with Firewall Builder
-  Users Guide (available in <a href="http://www.fwbuilde.org/UsersGuide3.pdf">pdf</a>
-  and <a href="http://www.fwbuilde.org/docs/users_guide/book1.htm">html</a> formats). Users
+  Users Guide (available in <a href="http://www.fwbuilder.org/UsersGuide4.pdf">pdf</a>
+  and <a href="http://www.fwbuilder.org/docs/users_guide/book1.htm">html</a> formats). Users
   Guide explains the program in details and includes large "CookBook"
   section that presents typical problems of firewall rules design and
   demonstrates how they can be solved with Firewall Builder. There is
-  also <a href="http://www.fwbuilde.org/docs/firewall_builder_faq.html">FAQ</a>,
-  <a href="http://www.fwbuilde.org/docs/firewall_builder_installation.html">Installation
+  also <a href="http://www.fwbuilder.org/docs/firewall_builder_faq.html">FAQ</a>,
+  <a href="http://www.fwbuilder.org/docs/firewall_builder_installation.html">Installation
     Guide</a> and
-  <a href="http://www.fwbuilde.org/docs/firewall_builder_release_notes.html">Release
+  <a href="http://www.fwbuilder.org/docs/firewall_builder_release_notes.html">Release
     Notes</a> for each version.
 </p>