From 2dd94ce1d9698c13d8a6f481be48afcffab2a907 Mon Sep 17 00:00:00 2001 From: judas_iscariote Date: Sat, 17 Sep 2005 06:26:55 +0000 Subject: [PATCH] fix typos and other sutff.. git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@2698 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-docs2/Documentation.xml | 5 +++-- Shorewall-docs2/Macros.xml | 8 ++++---- Shorewall-docs2/configuration_file_basics.xml | 18 ++++++++---------- Shorewall-docs2/fallback.xml | 19 ++++++++++--------- Shorewall-docs2/samba.xml | 8 ++------ .../starting_and_stopping_shorewall.xml | 9 +++++---- Shorewall-docs2/useful_links.xml | 12 +++--------- 7 files changed, 35 insertions(+), 44 deletions(-) diff --git a/Shorewall-docs2/Documentation.xml b/Shorewall-docs2/Documentation.xml index 607ae897c..2c8648a23 100644 --- a/Shorewall-docs2/Documentation.xml +++ b/Shorewall-docs2/Documentation.xml @@ -823,7 +823,8 @@ NET_OPTIONS=blacklist,norfc1918 source-routed packets will not be accepted from that interface (sets /proc/sys/net/ipv4/conf/<interface> - to 1). + to 1).Only set this option if you know + what are you doing. @@ -4083,4 +4084,4 @@ eth1 - - + \ No newline at end of file diff --git a/Shorewall-docs2/Macros.xml b/Shorewall-docs2/Macros.xml index c155cda1b..448cca07b 100644 --- a/Shorewall-docs2/Macros.xml +++ b/Shorewall-docs2/Macros.xml @@ -1,7 +1,7 @@ -
+
@@ -170,7 +170,7 @@ PARAM - - tcp 135,139,445 REDIRECT - Redirect the request to a local port on the firewall. - REDIRECT- - Advanced users only. Like REDIRET but only + REDIRECT- - Advanced users only. Like REDIRECT but only generates the REDIRECT iptables rule and not the companion ACCEPT rule. @@ -204,7 +204,7 @@ PARAM - - tcp 135,139,445 example, eth1 specifies a client that communicates with the firewall system through eth1. This may be optionally followed by another colon (:) and an IP/MAC/subnet address as described above - (e.g., eth1:192.168.1.5). + (e.g. eth1:192.168.1.5). @@ -370,7 +370,7 @@ bar:info #ACTION SOURCE DEST PROTO DEST PORT(S) foo:debug $FW net - Logging in the invokeD 'foo' macro will be as if foo had been + Logging in the invoked 'foo' macro will be as if foo had been defined as: #ACTION SOURCE DEST PROTO DEST PORT(S) diff --git a/Shorewall-docs2/configuration_file_basics.xml b/Shorewall-docs2/configuration_file_basics.xml index b41e5016b..7d61e0e2b 100644 --- a/Shorewall-docs2/configuration_file_basics.xml +++ b/Shorewall-docs2/configuration_file_basics.xml @@ -111,9 +111,8 @@ - /etc/shorewall/routestopped (Shorewall - 1.3.4 and later) - defines hosts accessible when Shorewall is - stopped. + /etc/shorewall/routestopped - defines + hosts accessible when Shorewall is stopped. @@ -252,13 +251,12 @@ smtp,www,pop3,imap #Services running on the firewall
INCLUDE Directive - Beginning with Shorewall version 1.4.2, any file may contain INCLUDE - directives. An INCLUDE directive consists of the word INCLUDE followed by - a path name and causes the contents of the named file to be logically - included into the file containing the INCLUDE. Relative path names given - in an INCLUDE directive are assumed to reside in /etc/shorewall or in an - alternate configuration directory if one has been specified for the - command. + Any file may contain INCLUDE directives. An INCLUDE directive + consists of the word INCLUDE followed by a path name and causes the + contents of the named file to be logically included into the file + containing the INCLUDE. Relative path names given in an INCLUDE directive + are assumed to reside in /etc/shorewall or in an alternate configuration + directory if one has been specified for the command. INCLUDE's may be nested to a level of 3 -- further nested INCLUDE directives are ignored with a warning message. diff --git a/Shorewall-docs2/fallback.xml b/Shorewall-docs2/fallback.xml index f206ee36a..bdfa29642 100644 --- a/Shorewall-docs2/fallback.xml +++ b/Shorewall-docs2/fallback.xml @@ -15,10 +15,10 @@ - 2001-03-26 + 2005-09-16 - 2001 + 2001-2005 Thomas M. Eastep @@ -29,7 +29,8 @@ 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. + GNU Free Documentation + License. @@ -37,8 +38,8 @@ Falling Back to the Previous Version of Shorewall using the Fallback Script - If you install Shorewall and discover that it doesn't work for - you, you can fall back to your previously installed version. To do that: + If you install Shorewall and discover that it doesn't work for you, + you can fall back to your previously installed version. To do that: @@ -65,10 +66,10 @@ Falling Back to the Previous Version of Shorewall using rpm If your previous version of Shorewall was installed using RPM, you - may fall back to that version by typing rpm -Uvh --force <old - rpm> at a root shell prompt (Example: rpm -Uvh --force - /downloads/shorewall-3.1=0noarch.rpm would fall back to the 3.1-0 - version of Shorewall). + may fall back to that version by typing rpm -Uvh --force <old + rpm> at a root shell prompt (Example: rpm -Uvh --force + /downloads/shorewall-3.1.1-0.noarch.rpm would fall back to the + 3.1.1-0 version of Shorewall).
diff --git a/Shorewall-docs2/samba.xml b/Shorewall-docs2/samba.xml index bbc15f8ce..6bf9fce1d 100644 --- a/Shorewall-docs2/samba.xml +++ b/Shorewall-docs2/samba.xml @@ -15,14 +15,10 @@ - 2005-09-12 + 2005-09-16 - 2002 - - - - - 2005 + 2002-2005 Thomas M. Eastep diff --git a/Shorewall-docs2/starting_and_stopping_shorewall.xml b/Shorewall-docs2/starting_and_stopping_shorewall.xml index 4c0087591..06eca7e4d 100644 --- a/Shorewall-docs2/starting_and_stopping_shorewall.xml +++ b/Shorewall-docs2/starting_and_stopping_shorewall.xml @@ -15,7 +15,7 @@ - 2005-08-30 + 2005-09-11 2004 @@ -37,9 +37,10 @@ - This article applies to Shorewall 3.0 and later. If you are running - a version of Shorewall earlier than Shorewall 3.0.0 then please see the - documentation for that release. + This article applies to Shorewall 3.0 and + later. If you are running a version of Shorewall earlier than Shorewall + 3.0.0 then please see the documentation for that + release.
diff --git a/Shorewall-docs2/useful_links.xml b/Shorewall-docs2/useful_links.xml index 7148e5116..007083ec2 100644 --- a/Shorewall-docs2/useful_links.xml +++ b/Shorewall-docs2/useful_links.xml @@ -13,7 +13,7 @@ Eastep - 2005-06-01 + 2005-09-16 2003-2005 @@ -58,18 +58,12 @@ Bering LEAF Distribution: http://leaf.sourceforge.net/devel/jnilo - - - - Debian apt-get sources for Shorewall: http://idea.sec.dico.unimi.it/~lorenzo/index.html#Debian + url="http://leaf.sourceforge.net/doc/guide/">http://leaf.sourceforge.net/doc/guide/ Iptables Tutorial: http://iptables-tutorial.frozentux.net/ - + url="http://iptables-tutorial.frozentux.net/">http://iptables-tutorial.frozentux.net/