diff --git a/Shorewall-docs/Shorewall_index_frame.htm b/Shorewall-docs/Shorewall_index_frame.htm
index c821c3bc0..cfdbee1d4 100644
--- a/Shorewall-docs/Shorewall_index_frame.htm
+++ b/Shorewall-docs/Shorewall_index_frame.htm
@@ -1,66 +1,46 @@
-
+
+
-
-
-
-
-
- Shorewall Index
-
-
-
-
-
-Copyright © 2001-2003 Thomas M. Eastep.
-
-
+
+
+
+
+
+ Shorewall Index
+
+
+
+
+
+
+
+
+ Copyright ©
+ 2001-2003 Thomas M. Eastep.
diff --git a/Shorewall-docs/configuration_file_basics.htm b/Shorewall-docs/configuration_file_basics.htm
index 948ed6281..0afd22229 100644
--- a/Shorewall-docs/configuration_file_basics.htm
+++ b/Shorewall-docs/configuration_file_basics.htm
@@ -69,7 +69,7 @@ define your own actions for rules in /etc/shorewall/rules (shorewall
1.4.9 and later).
-Comments
+Comments
You may place comments in configuration files by making the first
non-whitespace character a pound sign ("#"). You may also place
comments at the end of any line, again by delimiting the comment from
diff --git a/Shorewall-docs/shorewall_quickstart_guide.htm b/Shorewall-docs/shorewall_quickstart_guide.htm
deleted file mode 100644
index 328653784..000000000
--- a/Shorewall-docs/shorewall_quickstart_guide.htm
+++ /dev/null
@@ -1,283 +0,0 @@
-
-
-
-
-
-
-
- Shorewall QuickStart Guide
-
-
-
-Shorewall QuickStart Guides (HOWTOs)
-
-With thanks to Richard who reminded me once again
-that we must all first walk before we can run.
-The French Translations of the single-IP guides are courtesy of Patrice
-Vetsel
-The French Translation of the Shorewall Setup Guide is courtesy of
-Fabien Demassieux.
-
-The Guides
-These guides provide step-by-step instructions for configuring
-Shorewall in common firewall setups.
-If you have a single public IP
-address:
-
-
- The above guides are designed to get your first firewall up and
-running quickly in the three most common Shorewall configurations. If
-you want to learn more about Shorewall than is explained in the above
-simple guides, the Shorewall
-Setup
-Guide (See Index Below) is for you.
-
-If you have more than one public
-IP address:
-
-The Shorewall Setup
-Guide (See Index Below) outlines the steps necessary to set up a
-firewall where there are multiple public IP addresses involved or if
-you
-want to learn more about Shorewall than is explained in the
-single-address guides above (Version
-Française).
-
-Documentation Index
-The following documentation covers a variety of topics and supplements
-the QuickStart Guides
-described above. Please review the appropriate guide before trying
-to use this documentation directly.
-
-If you use one of these guides and have a suggestion for improvement
-please let me know.
-Last modified 12/08/2003 - Tom
-Eastep
-Copyright 2002, 2003 Thomas
-M. Eastep
-
-
-
-
diff --git a/Shorewall-docs/shorewall_quickstart_guide.xml b/Shorewall-docs/shorewall_quickstart_guide.xml
new file mode 100755
index 000000000..ffe071041
--- /dev/null
+++ b/Shorewall-docs/shorewall_quickstart_guide.xml
@@ -0,0 +1,424 @@
+
+
+
+
+ Shorewall QuickStart Guides (HOWTOs)
+
+
+
+ Tom
+
+ Eastep
+
+
+
+ 2003-12-08
+
+
+ 2001
+
+ 2002
+
+ 2003
+
+ Thomas M. Eastep
+
+
+
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU Free Documentation License, Version
+ 1.2 or any later version published by the Free Software Foundation; with
+ no Invariant Sections, with no Front-Cover, and with no Back-Cover
+ Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".
+
+
+
+ With thanks to Richard who reminded me once again that we must all
+ first walk before we can run.
+
+ The French Translations of the single-IP guides are courtesy of
+ Patrice Vetsel.
+
+ The French Translation of the Shorewall Setup Guide is courtesy of
+ Fabien Demassieux.
+
+
+ The Guides
+
+ These guides provide step-by-step instructions for configuring
+ Shorewall in common firewall setups.
+
+
+ If you have a single public IP address
+
+ These guides are designed to get your first firewall up and
+ running quickly in the three most common Shorewall configurations. If
+ you want to learn more about Shorewall than is explained in the above
+ simple guides, the Shorewall Setup Guide (See Index Below) is
+ for you.Standalone
+ Linux System (Version Française)Two-interface Linux System acting as a
+ firewall/router for a small local network (Version Française)Three-interface Linux System acting as
+ a firewall/router for a small local network and a DMZ. (Version Française)
+
+
+
+ If you have more than one public IP address
+
+ The Shorewall Setup Guide
+ (See Index Below) outlines the steps necessary to set up a firewall
+ where there are multiple public IP addresses involved or if you want to
+ learn more about Shorewall than is explained in the single-address
+ guides above (Version
+ Française).
+
+
+
+
+ Documentation Index
+
+ The following documentation covers a variety of topics and
+ supplements the QuickStart Guides described
+ above. Please review the appropriate guide before trying to use this
+ documentation directly.
+
+ If you use one of these guides and have a suggestion for improvement
+ please let me know.
+
+
+
+ Accounting
+
+
+
+ Aliased
+ (virtual) Interfaces (e.g., eth0:0)
+
+
+
+ Blacklisting
+
+
+
+ Static Blacklisting using /etc/shorewall/blacklist
+
+
+
+ Dynamic Blacklisting using /sbin/shorewall
+
+
+
+
+
+ Commands
+ (Description of all /sbin/shorewall commands)
+
+
+
+ Common configuration
+ file features Comments in configuration
+ filesLine ContinuationINCLUDE DirectivePort Numbers/Service Namesconfiguration_file_basics.htm#PortsPort RangesUsing Shell VariablesUsing DNS NamesComplementing an IP
+ address or SubnetShorewall Configurations
+ (making a test configuration)Using MAC Addresses in
+ Shorewall
+
+
+
+ Configuration File Reference
+ Manual paramszonesinterfaceshostspolicyrulescommonmasqproxyarpnattunnelstcrulesshorewall.confmodulestosblacklistrfc1918routestoppedaccountingusersets and usersmaclistactions and action.template
+
+
+
+ Corporate Network Example
+ (Contributed by a Graeme Boyle)
+
+
+
+ DHCP
+
+
+
+ ECN Disabling by host or subnet
+
+
+
+ Errata
+
+
+
+ Extension Scripts
+ (How to extend Shorewall without modifying Shorewall code through the
+ use of files in /etc/shorewall -- /etc/shorewall/start,
+ /etc/shorewall/stopped, etc.)
+
+
+
+ Fallback/Uninstall
+
+
+
+ FAQs
+
+
+
+ Features
+
+
+
+ Forwarding Traffic on the Same
+ Interface
+
+
+
+ FTP and Shorewall
+
+
+
+ Getting help or answers to questions
+
+
+
+ Greater Seattle Linux Users Group Presentation
+
+
+
+ HTML
+
+
+
+ PowerPoint
+
+
+
+
+
+ Installation/Upgrade
+
+
+
+ IPSEC
+
+
+
+ Kazaa Filtering
+
+
+
+ Kernel Configuration
+
+
+
+ Logging
+
+
+
+ MAC Verification
+
+
+
+ Mailing Lists
+
+
+
+ Multiple Zones Through One
+ Interface
+
+
+
+ My Shorewall Configuration (How
+ I personally use Shorewall)
+
+
+
+ Netfilter Overview
+
+
+
+ One-to-one NAT (Formerly referred
+ to as Static NAT)
+
+
+
+ OpenVPN
+
+
+
+ Operating
+ Shorewall
+
+
+
+ 'Ping' Management
+
+
+
+ Port Information
+
+
+
+ Which applications use which ports
+
+
+
+ Ports used by Trojans
+
+
+
+
+
+ PPTP
+
+
+
+ Proxy ARP
+
+
+
+ Requirements
+
+
+
+ Samba
+
+
+
+ Shorewall Setup GuideIntroductionShorewall ConceptsNetwork InterfacesAddressing, Subnets and
+ RoutingIP AddressesSubnetsRoutingAddress Resolution Protocol (ARP)RFC 1918Setting up your NetworkRoutedNon-routedSNATDNATProxy ARPOne-to-one NATRulesOdds and EndsDNSStarting and Stopping the
+ Firewall
+
+
+
+ Starting/stopping
+ the FirewallDescription of all
+ /sbin/shorewall commandsHow to
+ safely test a Shorewall configuration change
+
+
+
+ Squid with Shorewall
+
+
+
+ Traffic Accounting
+
+
+
+ Traffic Shaping/QOS
+
+
+
+ Troubleshooting (Things to
+ try if it doesn't work)
+
+
+
+ User-defined Actions
+
+
+
+ UID/GID Based Rules
+
+
+
+ Upgrade Issues
+
+
+
+ VPN
+
+
+
+ IPSEC
+
+
+
+ GRE and IPIP
+
+
+
+ OpenVPN
+
+
+
+ PPTP
+
+
+
+ 6to4
+
+
+
+ IPSEC/PPTP passthrough from a system
+ behind your firewall to a remote network
+
+
+
+ Other VPN types
+
+
+
+
+
+ White List
+ Creation
+
+
+
+
\ No newline at end of file
diff --git a/Shorewall-docs/support.xml b/Shorewall-docs/support.xml
index 636ff9461..669bf3981 100755
--- a/Shorewall-docs/support.xml
+++ b/Shorewall-docs/support.xml
@@ -29,6 +29,18 @@
Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".
+
+
+
+ 1.1
+
+ 2003-12-19
+
+ TE
+
+ Corrected URL for Newbies List
+
+
@@ -266,7 +278,8 @@
If you are new to Shorewall and have a
question or need help with a problem, please post to the Shorewall Newbies mailing list.
+ url="mailto:shorewall-newbies@lists.shorewall.net">Shorewall Newbies
+ mailing list.
If you run Shorewall under MandrakeSoft Multi
Network Firewall (MNF) and you have not purchased an MNF license from
@@ -278,7 +291,7 @@
url="mailto:shorewall-users@lists.shorewall.net">Shorewall users mailing
list. IMPORTANT: If you are not
subscribed to the list, please say so -- otherwise, you will not be
- included in any replies.
+ included in any replies.
@@ -292,8 +305,7 @@
Subscribing to the Users Mailing List
To Subscribe to the mailing list go to https://lists.shorewall.net/mailman/listinfo/shorewall-users.
-
+ url="https://lists.shorewall.net/mailman/listinfo/shorewall-users">https://lists.shorewall.net/mailman/listinfo/shorewall-users.