From aedfe429cfeb43192670a7a4e4134239c686ee6f Mon Sep 17 00:00:00 2001 From: paulgear Date: Thu, 15 Jun 2006 05:32:14 +0000 Subject: [PATCH] Normalise SUSE nomenclature; spelling corrections git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4104 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall/shorewall.conf | 2 +- docs/Documentation.xml | 4 ++-- docs/FAQ.xml | 4 ++-- docs/IPSEC-2.6.xml | 4 ++-- docs/Install.xml | 31 ++++++++++++++++--------------- docs/OPENVPN.xml | 4 ++-- docs/Xen.xml | 4 ++-- docs/XenMyWay.xml | 18 +++++++++--------- docs/bridge.xml | 8 ++++---- docs/myfiles.xml | 14 +++++++------- docs/upgrade_issues.xml | 4 ++-- web/download.htm | 2 +- web/oldnews.html | 2 +- 13 files changed, 51 insertions(+), 50 deletions(-) diff --git a/Shorewall/shorewall.conf b/Shorewall/shorewall.conf index 2f5d7aa0f..7f728e75d 100644 --- a/Shorewall/shorewall.conf +++ b/Shorewall/shorewall.conf @@ -688,7 +688,7 @@ MODULE_SUFFIX= # # DISABLE IPV6 # -# Distributions (notably SuSE) are beginning to ship with IPV6 +# Distributions (notably SUSE) are beginning to ship with IPV6 # enabled. If you are not using IPV6, you are at risk of being # exploited by users who do. Setting DISABLE_IPV6=Yes will cause # Shorewall to disable IPV6 traffic to/from and through your diff --git a/docs/Documentation.xml b/docs/Documentation.xml index a3bcadc8d..bbc9a6146 100644 --- a/docs/Documentation.xml +++ b/docs/Documentation.xml @@ -383,7 +383,7 @@ file in /etc/shorewall that is used to define the iptables/kernel capabilities of a remote system. The file allows - firewall scripts compiled on one system to be taylored for a remote + firewall scripts compiled on one system to be tailored for a remote system where the script will ultimately run under Shorewall Lite. @@ -4085,4 +4085,4 @@ eth1 - This file is described in the Traffic Accounting Documentation. - \ No newline at end of file + diff --git a/docs/FAQ.xml b/docs/FAQ.xml index 20a04c266..df9ee202a 100644 --- a/docs/FAQ.xml +++ b/docs/FAQ.xml @@ -1491,7 +1491,7 @@ Creating input Chains... The current configuration is compiled to produce a shell - program taylored for your configuration. + program tailored for your configuration. @@ -2050,4 +2050,4 @@ loc $FW ACCEPT policies. - \ No newline at end of file + diff --git a/docs/IPSEC-2.6.xml b/docs/IPSEC-2.6.xml index 7c3a93388..5840a5493 100644 --- a/docs/IPSEC-2.6.xml +++ b/docs/IPSEC-2.6.xml @@ -100,7 +100,7 @@ - The ipsec-tools 0.5 rpm from SUSE 9.3. + The ipsec-tools 0.5 rpm from SUSE 9.3. @@ -854,4 +854,4 @@ all all REJECT info ipsec-tools source tree. It has a wide variety of sample racoon configuration files. - \ No newline at end of file + diff --git a/docs/Install.xml b/docs/Install.xml index 5ead29e7e..7e1b2d8d6 100644 --- a/docs/Install.xml +++ b/docs/Install.xml @@ -82,7 +82,7 @@ role="bold">Power PPC, Trustix and TurboLinux. There is - also an RPM package provided by Simon Matter that is taylored for + also an RPM package provided by Simon Matter that is tailored for RedHat/Fedora and another package from Jack Coates that is customized for Mandriva. All of these @@ -110,10 +110,10 @@ - Some SUSE users have encountered a problem whereby rpm reports - a conflict with kernel <= 2.2 even though a 2.4 kernel is - installed. If this happens, simply use the --nodeps option to - rpm. + Some SUSE users have encountered + a problem whereby rpm reports a conflict with kernel <= 2.2 + even though a 2.4 kernel is installed. If this happens, simply + use the --nodeps option to rpm. rpm -ivh --nodeps <shorewall rpm> @@ -297,11 +297,12 @@ package! The standard RPM package from shorewall.net and the mirrors is - known to work with Suse, Power PPC, Trustix and TurboLinux. There is - also an RPM package provided by Simon Matter that is taylored for - RedHat/Fedora and another package from Jack Coates that is customized - for Mandriva. If you try to upgrade using the wrong package, it - probably won't work. + known to work with SUSE, Power PPC, + Trustix and TurboLinux. There is also an RPM package provided by + Simon Matter that is tailored for RedHat/Fedora and another + package from Jack Coates that is customized for Mandriva. If you + try to upgrade using the wrong package, it probably won't + work. @@ -310,10 +311,10 @@ rpm -Uvh <shorewall rpm file> - Some SUSE users have encountered a problem whereby rpm reports - a conflict with kernel <= 2.2 even though a 2.4 kernel is - installed. If this happens, simply use the --nodeps option to - rpm. + Some SUSE users have encountered + a problem whereby rpm reports a conflict with kernel <= 2.2 + even though a 2.4 kernel is installed. If this happens, simply + use the --nodeps option to rpm. rpm -Uvh --nodeps <shorewall rpm> @@ -545,4 +546,4 @@ tar -xzvf /mnt/package2.lrp See Fallback and Uninstall. - \ No newline at end of file + diff --git a/docs/OPENVPN.xml b/docs/OPENVPN.xml index e5c37bb3c..6a4c83b47 100644 --- a/docs/OPENVPN.xml +++ b/docs/OPENVPN.xml @@ -618,7 +618,7 @@ verb 3
- Eastepnc6000 (SUSE10.0) Configuration + Eastepnc6000 (SUSE 10.0) Configuration The configuration was the same as shown above only with "/Program Files/OpenVPN" replaced with "/etc/openvpn" (I love @@ -718,4 +718,4 @@ all all REJECT info
- \ No newline at end of file + diff --git a/docs/Xen.xml b/docs/Xen.xml index fb3f95b41..ef25de94d 100644 --- a/docs/Xen.xml +++ b/docs/Xen.xml @@ -49,7 +49,7 @@ paravirtualization tool that allows you to run multiple virtual machines on one physical machine. It is available on a wide number of platforms and is included in recent - SuSE distributions. + SUSE distributions. Xen refers to the virtual machines as Domains. Domains are numbered with the first domain @@ -254,4 +254,4 @@ Ping/ACCEPT dmz ursa article. - \ No newline at end of file + diff --git a/docs/XenMyWay.xml b/docs/XenMyWay.xml index 9fc23433c..ced244ceb 100644 --- a/docs/XenMyWay.xml +++ b/docs/XenMyWay.xml @@ -99,7 +99,7 @@ - Most of the Linux systems run SuSE 10.0 or SuSE 10.1; my personal + Most of the Linux systems run SUSE 10.0 or SUSE 10.1; my personal Linux desktop system runs Ubuntu "Dapper Drake". If you are unfamiliar with Xen networking, I recommend that you read @@ -317,7 +317,7 @@ disk = [ 'phy:hdb4,hdb4,w' ] delegation PCI delegation was a feature of Xen 2.0 but that capability was dropped in 3.0. It has been restored in Xen 3.0.2 and once I - upgrade this system to SuSE 10.1 (which includes Xen 3.0.2), I + upgrade this system to SUSE 10.1 (which includes Xen 3.0.2), I intend to implement PCI delegation and remove three of the four bridges. I will probably combine the wireless and firewall domains at that time as well. @@ -442,7 +442,7 @@ SECTION NEW attached wirelessly, the IP address is assigned by OpenVPN. The Shorewall configuration files are shown below. All routing and - secondary IP addresses are handled in the SuSE network + secondary IP addresses are handled in the SUSE network configuration.
@@ -630,7 +630,7 @@ ACCEPT loc fw tcp ACCEPT loc fw tcp time,631,8080 ACCEPT loc fw udp 161,ntp,631 ACCEPT loc:192.168.1.5 fw udp 111 -DROP loc fw tcp 3185 #SuSE Meta pppd +DROP loc fw tcp 3185 #SUSE Meta pppd Ping/ACCEPT loc fw REDIRECT loc 3128 tcp 80 - !206.124.146.177 ############################################################################################################################################################################### @@ -814,7 +814,7 @@ $EXT_IF 30 6*full/10 6*full/10 3 The 'tap0' device used by OpenVPN is bridged to eth2 using this - SuSE-specific startup script (see the Shorewall + SUSE-specific startup script (see the Shorewall Bridge Documentation for scripts that work on other distributions): @@ -925,7 +925,7 @@ get_interfaces() { INTERFACES="$interfaces" } ################################################################################ -# Configure the Bridge -- IP configuration is left to the SuSE network scripts +# Configure the Bridge -- IP configuration is left to the SUSE network scripts ################################################################################ do_start() { @@ -991,7 +991,7 @@ case "$command" in esac As mentioned in the comments in the above script, IP - configuration of the bridge is done through the normal SuSE network + configuration of the bridge is done through the normal SUSE network scripts. Here's the config file: BOOTPROTO='static' @@ -1069,7 +1069,7 @@ default via 192.168.1.254 dev br0
The route to 169.254.0.0/16 is automatically generated by the - SuSE network scripts so I include that network in the + SUSE network scripts so I include that network in the /etc/shorewall/maclist file for completeness. @@ -1172,4 +1172,4 @@ verb 3 - \ No newline at end of file + diff --git a/docs/bridge.xml b/docs/bridge.xml index 430b654de..c68ac7776 100644 --- a/docs/bridge.xml +++ b/docs/bridge.xml @@ -239,10 +239,10 @@ BOOTPROTO=dhcp ONBOOT=yes - On both the SUSE and Mandriva systems, a separate script is required - to configure the bridge itself. + On both the SUSE and Mandriva systems, + a separate script is required to configure the bridge itself. - Here are scripts that I used on a Suse 9.1 + Here are scripts that I used on a SUSE 9.1 system.
@@ -607,4 +607,4 @@ dmz br0:eth2 - \ No newline at end of file + diff --git a/docs/myfiles.xml b/docs/myfiles.xml index 00f69ff75..114544145 100644 --- a/docs/myfiles.xml +++ b/docs/myfiles.xml @@ -66,20 +66,20 @@ I use one-to-one NAT for "Ursa" (my - personal system that run SuSE 10.0) - Internal address 192.168.1.5 and + personal system that run SUSE 10.0) - Internal address 192.168.1.5 and external address 206.124.146.178. I use one-to-one NAT for "lists" (My server - system that runs SuSE 10.0 in a Xen virtual system on + system that runs SUSE 10.0 in a Xen virtual system on ursa) - Internal address 192.168.1.7 and external address 206.124.146.177. I use one-to-one NAT for "Eastepnc6000" (My - work system -- Windows XP SP1/SuSE 10.0). Internal address 192.168.1.6 + work system -- Windows XP SP1/SUSE 10.0). Internal address 192.168.1.6 and external address 206.124.146.180. @@ -93,7 +93,7 @@ - The firewall runs on a Celeron 1.4Ghz under SuSE 10.0. + The firewall runs on a Celeron 1.4Ghz under SUSE 10.0. Ursa runs Samba for file sharing with the Windows systems and is configured as a Wins server. @@ -122,7 +122,7 @@ of the laptops. The server also has a desktop environment installed but it is never started. For the most part, X tunneled through SSH is used for server administration and the server runs at run level 3 (multi-user - console mode on SuSE). + console mode on SUSE). In addition to the OpenVPN bridge, the firewall hosts an OpenVPN Tunnel server for VPN access from our second home in - \ No newline at end of file + diff --git a/docs/upgrade_issues.xml b/docs/upgrade_issues.xml index f4c8f62b3..8135780f2 100644 --- a/docs/upgrade_issues.xml +++ b/docs/upgrade_issues.xml @@ -753,7 +753,7 @@ DNAT loc loc:192.168.1.12 tcp 80 - 130.252.100.69

If your kernel has IPV6 support (recent - SuSe for example), and you don't use IPV6 then + SUSE for example), and you don't use IPV6 then you will probably want to set DISABLE_IPV6=Yes in /etc/shorewall/shorewall.conf. You must have ipv6tables installed. @@ -1082,4 +1082,4 @@ error: failed dependencies:iproute is needed by shorewall-1.4.0-1 - \ No newline at end of file + diff --git a/web/download.htm b/web/download.htm index c8b36e0f1..6468c02c4 100644 --- a/web/download.htm +++ b/web/download.htm @@ -271,7 +271,7 @@ Marc Zonzon:
Use the sites below to download thetarball, the documentation -and the standard RPM for (Suse, Power PPC, +and the standard RPM for (SUSE, Power PPC, Trustix and TurboLinux).

Packages are GPG diff --git a/web/oldnews.html b/web/oldnews.html index 285ba7232..5bde96df1 100644 --- a/web/oldnews.html +++ b/web/oldnews.html @@ -2363,7 +2363,7 @@ loc Local Extended local zone available

Simon Matter has graciously volunteered to provide RPMs - taylored for Redhat and Fedora. You can download Simon's RPMs + tailored for Redhat and Fedora. You can download Simon's RPMs from http://www.invoca.ch/pub/packages/shorewall/